diff --git a/extension.json b/extension.json
index ee52243f..2cc5c6e3 100644
--- a/extension.json
+++ b/extension.json
@@ -44,15 +44,15 @@
 		]
 	},
 	"AutoloadClasses": {
-		"ApiLanguageSearch": "api/ApiLanguageSearch.php",
-		"ApiULSLocalization": "api/ApiULSLocalization.php",
+		"ApiLanguageSearch": "includes/api/ApiLanguageSearch.php",
+		"ApiULSLocalization": "includes/api/ApiULSLocalization.php",
 		"FontRepoCompiler": "includes/FontRepoCompiler.php",
 		"LanguageNameSearch": "data/LanguageNameSearch.php",
 		"LanguageNameSearchData": "data/LanguageNameSearchData.php",
 		"ResourceLoaderULSJsonMessageModule": "includes/ResourceLoaderULSJsonMessageModule.php",
 		"ResourceLoaderULSModule": "includes/ResourceLoaderULSModule.php",
 		"ULSJsonMessageLoader": "includes/ULSJsonMessageLoader.php",
-		"UniversalLanguageSelectorHooks": "UniversalLanguageSelector.hooks.php"
+		"UniversalLanguageSelectorHooks": "includes/UniversalLanguageSelectorHooks.php"
 	},
 	"DefaultUserOptions": {
 		"uls-preferences": "",
diff --git a/UniversalLanguageSelector.hooks.php b/includes/UniversalLanguageSelectorHooks.php
similarity index 98%
rename from UniversalLanguageSelector.hooks.php
rename to includes/UniversalLanguageSelectorHooks.php
index 81fb2b70..3be6c2d7 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/includes/UniversalLanguageSelectorHooks.php
@@ -155,7 +155,7 @@ class UniversalLanguageSelectorHooks {
 		$testModules['qunit']['ext.uls.tests'] = [
 			'scripts' => [ 'tests/qunit/ext.uls.tests.js' ],
 			'dependencies' => [ 'jquery.uls', 'ext.uls.init', 'ext.uls.preferences' ],
-			'localBasePath' => __DIR__,
+			'localBasePath' => dirname( __DIR__ ),
 			'remoteExtPath' => 'UniversalLanguageSelector',
 		];
 	}
@@ -491,7 +491,7 @@ class UniversalLanguageSelectorHooks {
 				'mediawiki.ui.button',
 				'mediawiki.user'
 			],
-			'localBasePath' => __DIR__ . '/resources',
+			'localBasePath' => __DIR__ . '/../resources',
 			'remoteExtPath' => 'UniversalLanguageSelector/resources'
 		];
 		$modules['ext.uls.preferences'] = [
@@ -500,7 +500,7 @@ class UniversalLanguageSelectorHooks {
 				'mediawiki.user',
 				'mediawiki.api'
 			],
-			'localBasePath' => __DIR__ . '/resources',
+			'localBasePath' => __DIR__ . '/../resources',
 			'remoteExtPath' => 'UniversalLanguageSelector/resources'
 		];
 		if ( version_compare( $wgVersion, '1.32', '<' ) ) {
@@ -516,7 +516,7 @@ class UniversalLanguageSelectorHooks {
 					'mediawiki.user',
 					'ext.eventLogging',
 				],
-				'localBasePath' => __DIR__ . '/resources',
+				'localBasePath' => __DIR__ . '/../resources',
 				'remoteExtPath' => 'UniversalLanguageSelector/resources',
 			];
 			if ( version_compare( $wgVersion, '1.33', '<' ) ) {
diff --git a/api/ApiLanguageSearch.php b/includes/api/ApiLanguageSearch.php
similarity index 100%
rename from api/ApiLanguageSearch.php
rename to includes/api/ApiLanguageSearch.php
diff --git a/api/ApiULSLocalization.php b/includes/api/ApiULSLocalization.php
similarity index 100%
rename from api/ApiULSLocalization.php
rename to includes/api/ApiULSLocalization.php