diff --git a/VectorHooks.php b/includes/Hooks.php
similarity index 88%
rename from VectorHooks.php
rename to includes/Hooks.php
index 90630baea..cdebeae46 100644
--- a/VectorHooks.php
+++ b/includes/Hooks.php
@@ -1,7 +1,10 @@
 <?php
-/**
- * VectorHooks.php
- */
+
+namespace Vector;
+
+use OutputPage;
+use SkinTemplate;
+use SkinVector;
 
 /**
  * Hook handlers for Vector skin.
@@ -9,8 +12,7 @@
  * Hook handler method names should be in the form of:
  *	on<HookName>()
  */
-
-class VectorHooks {
+class Hooks {
 	/**
 	 * BeforePageDisplayMobile hook handler
 	 *
diff --git a/ResourceLoaderLessModule.php b/includes/ResourceLoaderLessModule.php
similarity index 100%
rename from ResourceLoaderLessModule.php
rename to includes/ResourceLoaderLessModule.php
diff --git a/SkinVector.php b/includes/SkinVector.php
similarity index 100%
rename from SkinVector.php
rename to includes/SkinVector.php
diff --git a/VectorTemplate.php b/includes/VectorTemplate.php
similarity index 100%
rename from VectorTemplate.php
rename to includes/VectorTemplate.php
diff --git a/skin.json b/skin.json
index c66417b2a..cabbaccf1 100644
--- a/skin.json
+++ b/skin.json
@@ -25,14 +25,14 @@
 		]
 	},
 	"AutoloadClasses": {
-		"VectorHooks": "VectorHooks.php",
-		"SkinVector": "SkinVector.php",
-		"VectorTemplate": "VectorTemplate.php",
-		"Vector\\ResourceLoaderLessModule": "ResourceLoaderLessModule.php"
+		"Vector\\Hooks": "includes/Hooks.php",
+		"SkinVector": "includes/SkinVector.php",
+		"VectorTemplate": "includes/VectorTemplate.php",
+		"Vector\\ResourceLoaderLessModule": "includes/ResourceLoaderLessModule.php"
 	},
 	"Hooks": {
 		"BeforePageDisplayMobile": [
-			"VectorHooks::onBeforePageDisplayMobile"
+			"Vector\\Hooks::onBeforePageDisplayMobile"
 		]
 	},
 	"@note": "When modifying skins.vector.styles definition, make sure the installer still works",