diff --git a/main.php b/main.php
index a7d076982..ae38ff532 100644
--- a/main.php
+++ b/main.php
@@ -1,8 +1,8 @@
 <?php
 
+use SilverStripe\Control\HTTPApplication;
 use SilverStripe\Control\HTTPRequestBuilder;
 use SilverStripe\Core\CoreKernel;
-use SilverStripe\Core\HTTPApplication;
 use SilverStripe\Core\Startup\ErrorControlChainMiddleware;
 
 require __DIR__ . '/src/includes/autoload.php';
diff --git a/src/Core/HTTPApplication.php b/src/Control/HTTPApplication.php
similarity index 94%
rename from src/Core/HTTPApplication.php
rename to src/Control/HTTPApplication.php
index ba60fbeeb..f3610f113 100644
--- a/src/Core/HTTPApplication.php
+++ b/src/Control/HTTPApplication.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace SilverStripe\Core;
+namespace SilverStripe\Control;
 
-use SilverStripe\Control\Director;
-use SilverStripe\Control\HTTPRequest;
-use SilverStripe\Control\HTTPResponse;
-use SilverStripe\Control\HTTPResponse_Exception;
+use SilverStripe\Core\Application;
+use SilverStripe\Control\HTTPMiddleware;
+use SilverStripe\Core\Kernel;
 
 /**
  * Invokes the HTTP application within an ErrorControlChain
diff --git a/src/Core/HTTPMiddleware.php b/src/Control/HTTPMiddleware.php
similarity index 81%
rename from src/Core/HTTPMiddleware.php
rename to src/Control/HTTPMiddleware.php
index 8d5dc60da..a1be72d93 100644
--- a/src/Core/HTTPMiddleware.php
+++ b/src/Control/HTTPMiddleware.php
@@ -1,9 +1,6 @@
 <?php
 
-namespace SilverStripe\Core;
-
-use SilverStripe\Control\HTTPRequest;
-use SilverStripe\Control\HTTPResponse;
+namespace SilverStripe\Control;
 
 /**
  * HTTP Request middleware
diff --git a/src/Core/Config/ConfigLoader.php b/src/Core/Config/ConfigLoader.php
index b5ca19d12..500a62447 100644
--- a/src/Core/Config/ConfigLoader.php
+++ b/src/Core/Config/ConfigLoader.php
@@ -26,7 +26,7 @@ class ConfigLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new self();
+        return self::$instance ? self::$instance : self::$instance = new static();
     }
 
     /**
@@ -92,7 +92,7 @@ class ConfigLoader
         $manifest = clone $this->getManifest();
 
         // Create new blank loader with new stack (top level nesting)
-        $newLoader = new self;
+        $newLoader = new static;
         $newLoader->pushManifest($manifest);
 
         // Activate new loader
diff --git a/src/Core/Injector/InjectorLoader.php b/src/Core/Injector/InjectorLoader.php
index fbba4b37b..7bed66e90 100644
--- a/src/Core/Injector/InjectorLoader.php
+++ b/src/Core/Injector/InjectorLoader.php
@@ -25,7 +25,7 @@ class InjectorLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new self();
+        return self::$instance ? self::$instance : self::$instance = new static();
     }
 
     /**
@@ -91,7 +91,7 @@ class InjectorLoader
         $manifest = $this->getManifest()->nest();
 
         // Create new blank loader with new stack (top level nesting)
-        $newLoader = new self;
+        $newLoader = new static;
         $newLoader->pushManifest($manifest);
 
         // Activate new loader
diff --git a/src/Core/Manifest/ClassLoader.php b/src/Core/Manifest/ClassLoader.php
index e59fb2d2f..8b267464f 100644
--- a/src/Core/Manifest/ClassLoader.php
+++ b/src/Core/Manifest/ClassLoader.php
@@ -30,7 +30,7 @@ class ClassLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new self();
+        return self::$instance ? self::$instance : self::$instance = new static();
     }
 
     /**
diff --git a/src/Core/Manifest/ModuleLoader.php b/src/Core/Manifest/ModuleLoader.php
index be9a66718..20b294a74 100644
--- a/src/Core/Manifest/ModuleLoader.php
+++ b/src/Core/Manifest/ModuleLoader.php
@@ -22,7 +22,7 @@ class ModuleLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new self();
+        return self::$instance ? self::$instance : self::$instance = new static();
     }
 
     /**
diff --git a/src/Core/Startup/ErrorControlChainMiddleware.php b/src/Core/Startup/ErrorControlChainMiddleware.php
index f5a8d6cc8..d5a10ef2a 100644
--- a/src/Core/Startup/ErrorControlChainMiddleware.php
+++ b/src/Core/Startup/ErrorControlChainMiddleware.php
@@ -7,7 +7,7 @@ use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Application;
-use SilverStripe\Core\HTTPMiddleware;
+use SilverStripe\Control\HTTPMiddleware;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
 
diff --git a/src/Dev/Install/Installer.php b/src/Dev/Install/Installer.php
index 47e6871ca..89ef1b915 100644
--- a/src/Dev/Install/Installer.php
+++ b/src/Dev/Install/Installer.php
@@ -6,7 +6,7 @@ use Exception;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\Session;
 use SilverStripe\Core\CoreKernel;
-use SilverStripe\Core\HTTPApplication;
+use SilverStripe\Control\HTTPApplication;
 use SilverStripe\Core\Kernel;
 use SilverStripe\Core\Startup\ParameterConfirmationToken;
 use SilverStripe\ORM\DatabaseAdmin;
diff --git a/src/Dev/SapphireTest.php b/src/Dev/SapphireTest.php
index 9273944a2..345574158 100644
--- a/src/Dev/SapphireTest.php
+++ b/src/Dev/SapphireTest.php
@@ -14,7 +14,7 @@ use SilverStripe\Control\Email\Email;
 use SilverStripe\Control\Email\Mailer;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Core\HTTPApplication;
+use SilverStripe\Control\HTTPApplication;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Injector\InjectorLoader;
 use SilverStripe\Core\Manifest\ClassLoader;