diff --git a/classes/modules/abstractModule.php b/classes/modules/AbstractModule.php
similarity index 99%
rename from classes/modules/abstractModule.php
rename to classes/modules/AbstractModule.php
index 9a59faca9eccc8e6abd9adb5df549361bf9f1db9..042111ee3e6bccd6edcf5279e27c700ee31f4d5e 100644
--- a/classes/modules/abstractModule.php
+++ b/classes/modules/AbstractModule.php
@@ -5,6 +5,5 @@ namespace uib\ub\loadspeakr\modules;
 abstract class AbstractModule
 {
     abstract protected function match($uri);
-
     abstract protected function execute($params);
 }
diff --git a/classes/modules/adminModule.php b/classes/modules/AdminModule.php
similarity index 99%
rename from classes/modules/adminModule.php
rename to classes/modules/AdminModule.php
index 132520a29c9a0ca4a6d04466683e3193007a9be7..981bc2ea8210e5a7315e9c378f6915a17c9081d3 100644
--- a/classes/modules/adminModule.php
+++ b/classes/modules/AdminModule.php
@@ -7,8 +7,6 @@ use uib\ub\loadspeakr\Endpoint;
 use uib\ub\loadspeakr\HTTPStatus;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class AdminModule extends abstractModule
 {
     //Service module
diff --git a/classes/modules/exportModule.php b/classes/modules/ExportModule.php
similarity index 99%
rename from classes/modules/exportModule.php
rename to classes/modules/ExportModule.php
index 74127f928909ed8de5454eebc956e82f6b206f89..48e9269defd3b64316d3d0fb402a586cccfa5fdf 100644
--- a/classes/modules/exportModule.php
+++ b/classes/modules/ExportModule.php
@@ -4,8 +4,6 @@ namespace uib\ub\loadspeakr\modules;
 
 use ARC2;
 
-require_once('abstractModule.php');
-
 class ExportModule extends abstractModule
 {
     private $serialization;
diff --git a/classes/modules/redirectModule.php b/classes/modules/RedirectModule.php
similarity index 95%
rename from classes/modules/redirectModule.php
rename to classes/modules/RedirectModule.php
index c0175dbb1c9613e7b385b601689fdd507dd5196c..6a3ebbf7768655c96db205bfcabaeef65ec06a31 100644
--- a/classes/modules/redirectModule.php
+++ b/classes/modules/RedirectModule.php
@@ -4,8 +4,6 @@ namespace uib\ub\loadspeakr\modules;
 
 use uib\ub\loadspeakr\MetaDb;
 
-require_once('abstractModule.php');
-
 class RedirectModule extends abstractModule
 {
     public function match($uri)
diff --git a/classes/modules/serviceModule.php b/classes/modules/ServiceModule.php
similarity index 99%
rename from classes/modules/serviceModule.php
rename to classes/modules/ServiceModule.php
index 11d222fc8e9fe2a16d86fc6a574fc508ca7b3386..67caf485c5213f143115f54d40862b373340d051 100644
--- a/classes/modules/serviceModule.php
+++ b/classes/modules/ServiceModule.php
@@ -8,8 +8,6 @@ use uib\ub\loadspeakr\HTTPStatus;
 use uib\ub\loadspeakr\Logging;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class ServiceModule extends abstractModule
 {
     public function match($uri)
diff --git a/classes/modules/sessionModule.php b/classes/modules/SessionModule.php
similarity index 98%
rename from classes/modules/sessionModule.php
rename to classes/modules/SessionModule.php
index f2552529d2cc1db7215ee47c107efe26d04e8f12..c029512cd24c568652b495e4a0519b6920b5e80d 100644
--- a/classes/modules/sessionModule.php
+++ b/classes/modules/SessionModule.php
@@ -4,8 +4,6 @@ namespace uib\ub\loadspeakr\modules;
 
 use uib\ub\loadspeakr\HTTPStatus;
 
-require_once('abstractModule.php');
-
 class SessionModule extends abstractModule
 {
     //Session module
diff --git a/classes/modules/sparqlFilterModule.php b/classes/modules/SparqlFilterModule.php
similarity index 98%
rename from classes/modules/sparqlFilterModule.php
rename to classes/modules/SparqlFilterModule.php
index 281188a7387dd6027a2ac5212cfb105deeece6e5..10a5ff87506f62dd7d0b0ded8d4562c0fc216120 100644
--- a/classes/modules/sparqlFilterModule.php
+++ b/classes/modules/SparqlFilterModule.php
@@ -10,9 +10,7 @@ use uib\ub\loadspeakr\MetaDb;
 use uib\ub\loadspeakr\Queries;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
-class sparqlFilterModule extends abstractModule
+class SparqlFilterModule extends abstractModule
 {
     public function match($uri)
     {
diff --git a/classes/modules/staticModule.php b/classes/modules/StaticModule.php
similarity index 99%
rename from classes/modules/staticModule.php
rename to classes/modules/StaticModule.php
index afced4760c5c355d73693f8d1a7919a6f8f2b1f5..92833e0d21b5161965ffc506c24e40e144ff3693 100644
--- a/classes/modules/staticModule.php
+++ b/classes/modules/StaticModule.php
@@ -6,8 +6,6 @@ use uib\ub\loadspeakr\HTTPStatus;
 use uib\ub\loadspeakr\Logging;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class StaticModule extends abstractModule
 {
     public function match($uri)
diff --git a/classes/modules/typeModule.php b/classes/modules/TypeModule.php
similarity index 99%
rename from classes/modules/typeModule.php
rename to classes/modules/TypeModule.php
index cc362a7143a1f44b68df38d8f5d2297ad12b6d9a..4b52cc333c0cbdfa8ba66acbd180162c68ee40b2 100644
--- a/classes/modules/typeModule.php
+++ b/classes/modules/TypeModule.php
@@ -9,8 +9,6 @@ use uib\ub\loadspeakr\MetaDb;
 use uib\ub\loadspeakr\Queries;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class TypeModule extends abstractModule
 {
     public function match($uri)
diff --git a/classes/modules/uriModule.php b/classes/modules/UriModule.php
similarity index 99%
rename from classes/modules/uriModule.php
rename to classes/modules/UriModule.php
index 2508d7d96c636ffd0d08277522eb3d2f7c0fb52a..b0c778e7b1a487cc1e848fb85c32efedb830b923 100644
--- a/classes/modules/uriModule.php
+++ b/classes/modules/UriModule.php
@@ -9,8 +9,6 @@ use uib\ub\loadspeakr\MetaDb;
 use uib\ub\loadspeakr\Queries;
 use uib\ub\loadspeakr\Utils;
 
-require_once('abstractModule.php');
-
 class UriModule extends abstractModule
 {
     public function match($uri)
diff --git a/index.php b/index.php
index 99d9d9cbdb8f39ef31581a995fd8d10c256894ec..7fafc57aecf48f0c2d52c82d938a2ab959d6a81c 100644
--- a/index.php
+++ b/index.php
@@ -68,16 +68,9 @@ $uri = Utils::getMirroredUri($localUri);
 
 // Load Loadspeakr modules.
 foreach ($conf['modules']['available'] as $i) {
-    $className = $i . 'Module';
+    $className = ucfirst($i) . 'Module';
     $currentModule = $conf['modules']['directory'] . $className . '.php';
-
-    if (!is_file($currentModule)) {
-        HTTPStatus::send500('<br/>Can\'t load or error in module <pre>' . $currentModule . '</pre>');
-        exit(1);
-    }
-
-    require_once($currentModule);
-    $namespacedClassName = 'uib\ub\loadspeakr\modules\\' . ucfirst($className);
+    $namespacedClassName = 'uib\ub\loadspeakr\modules\\' . $className;
     $module = new $namespacedClassName();
     $matching = $module->match($uri);