diff --git a/.phpcs.xml b/.phpcs.xml
index a31e00c6..e89d6ed0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,7 +4,6 @@
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
 		<exclude name="MediaWiki.Commenting.MissingCovers.MissingCovers" />
-		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
diff --git a/extension.json b/extension.json
index 1da908b4..c3662873 100644
--- a/extension.json
+++ b/extension.json
@@ -46,13 +46,13 @@
 		]
 	},
 	"AutoloadClasses": {
-		"TitleBlacklist": "TitleBlacklist.list.php",
-		"TitleBlacklistEntry": "TitleBlacklistEntry.php",
-		"TitleBlacklistHooks": "TitleBlacklist.hooks.php",
-		"TitleBlacklistAuthenticationRequest": "TitleBlacklistAuthenticationRequest.php",
-		"TitleBlacklistPreAuthenticationProvider": "TitleBlacklistPreAuthenticationProvider.php",
-		"Scribunto_LuaTitleBlacklistLibrary": "TitleBlacklist.library.php",
-		"ApiQueryTitleBlacklist": "api/ApiQueryTitleBlacklist.php"
+		"TitleBlacklist": "includes/TitleBlacklist.php",
+		"TitleBlacklistEntry": "includes/TitleBlacklistEntry.php",
+		"TitleBlacklistHooks": "includes/TitleBlacklistHooks.php",
+		"TitleBlacklistAuthenticationRequest": "includes/TitleBlacklistAuthenticationRequest.php",
+		"TitleBlacklistPreAuthenticationProvider": "includes/TitleBlacklistPreAuthenticationProvider.php",
+		"Scribunto_LuaTitleBlacklistLibrary": "includes/Scribunto_LuaTitleBlacklistLibrary.php",
+		"ApiQueryTitleBlacklist": "includes/api/ApiQueryTitleBlacklist.php"
 	},
 	"ResourceModules": {
 		"mediawiki.api.titleblacklist": {
diff --git a/TitleBlacklist.library.php b/includes/Scribunto_LuaTitleBlacklistLibrary.php
similarity index 100%
rename from TitleBlacklist.library.php
rename to includes/Scribunto_LuaTitleBlacklistLibrary.php
diff --git a/TitleBlacklist.list.php b/includes/TitleBlacklist.php
similarity index 100%
rename from TitleBlacklist.list.php
rename to includes/TitleBlacklist.php
diff --git a/TitleBlacklistAuthenticationRequest.php b/includes/TitleBlacklistAuthenticationRequest.php
similarity index 100%
rename from TitleBlacklistAuthenticationRequest.php
rename to includes/TitleBlacklistAuthenticationRequest.php
diff --git a/TitleBlacklistEntry.php b/includes/TitleBlacklistEntry.php
similarity index 100%
rename from TitleBlacklistEntry.php
rename to includes/TitleBlacklistEntry.php
diff --git a/TitleBlacklist.hooks.php b/includes/TitleBlacklistHooks.php
similarity index 100%
rename from TitleBlacklist.hooks.php
rename to includes/TitleBlacklistHooks.php
diff --git a/TitleBlacklistPreAuthenticationProvider.php b/includes/TitleBlacklistPreAuthenticationProvider.php
similarity index 100%
rename from TitleBlacklistPreAuthenticationProvider.php
rename to includes/TitleBlacklistPreAuthenticationProvider.php
diff --git a/api/ApiQueryTitleBlacklist.php b/includes/api/ApiQueryTitleBlacklist.php
similarity index 100%
rename from api/ApiQueryTitleBlacklist.php
rename to includes/api/ApiQueryTitleBlacklist.php
diff --git a/mw.ext.TitleBlacklist.lua b/includes/mw.ext.TitleBlacklist.lua
similarity index 100%
rename from mw.ext.TitleBlacklist.lua
rename to includes/mw.ext.TitleBlacklist.lua