diff --git a/.phan/config.php b/.phan/config.php
index bc27aa691..03d3baea3 100644
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -5,11 +5,6 @@ $cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.
 $cfg['directory_list'] = array_merge(
 	$cfg['directory_list'],
 	[
-		'FancyCaptcha/',
-		'hCaptcha/',
-		'QuestyCaptcha/',
-		'ReCaptchaNoCaptcha/',
-		'SimpleCaptcha/',
 		'../../extensions/AbuseFilter',
 	]
 );
diff --git a/FancyCaptcha/extension.json b/FancyCaptcha/extension.json
index a3e87f60a..e83e652dd 100644
--- a/FancyCaptcha/extension.json
+++ b/FancyCaptcha/extension.json
@@ -18,11 +18,11 @@
 		]
 	},
 	"AutoloadClasses": {
-		"FancyCaptcha": "includes/FancyCaptcha.php",
-		"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\FancyCaptcha": "includes/FancyCaptcha.php"
+		"FancyCaptcha": "../includes/FancyCaptcha/FancyCaptcha.php",
+		"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\FancyCaptcha": "../includes/FancyCaptcha/FancyCaptcha.php"
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\": "includes/"
+		"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\": "../includes/FancyCaptcha/"
 	},
 	"ResourceModules": {
 		"ext.confirmEdit.fancyCaptcha.styles": {
@@ -38,7 +38,7 @@
 	},
 	"ResourceFileModulePaths": {
 		"localBasePath": "resources",
-		"remoteExtPath": "ConfirmEdit/FancyCaptcha/resources"
+		"remoteExtPath": "ConfirmEdit/resources"
 	},
 	"callback": "MediaWiki\\Extension\\ConfirmEdit\\Hooks::onFancyCaptchaSetup",
 	"config": {
diff --git a/QuestyCaptcha/extension.json b/QuestyCaptcha/extension.json
index 3303a2f0d..f1fc09a89 100644
--- a/QuestyCaptcha/extension.json
+++ b/QuestyCaptcha/extension.json
@@ -13,11 +13,11 @@
 		]
 	},
 	"AutoloadClasses": {
-		"QuestyCaptcha": "includes/QuestyCaptcha.php",
-		"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha": "includes/QuestyCaptcha.php"
+		"QuestyCaptcha": "../includes/QuestyCaptcha/QuestyCaptcha.php",
+		"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha": "../includes/QuestyCaptcha/QuestyCaptcha.php"
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\": "includes/"
+		"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\": "../includes/QuestyCaptcha/"
 	},
 	"config": {
 		"CaptchaClass": {
diff --git a/ReCaptchaNoCaptcha/extension.json b/ReCaptchaNoCaptcha/extension.json
index ec47ca1a4..c52f42c15 100644
--- a/ReCaptchaNoCaptcha/extension.json
+++ b/ReCaptchaNoCaptcha/extension.json
@@ -14,7 +14,7 @@
 		]
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\": "includes/"
+		"MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\": "../includes/ReCaptchaNoCaptcha/"
 	},
 	"config": {
 		"CaptchaClass": {
@@ -32,7 +32,7 @@
 	},
 	"ResourceFileModulePaths": {
 		"localBasePath": "resources",
-		"remoteExtPath": "ConfirmEdit/ReCaptchaNoCaptcha/resources"
+		"remoteExtPath": "ConfirmEdit/resources"
 	},
 	"ResourceModules": {
 		"ext.confirmEdit.reCaptchaNoCaptcha.visualEditor": {
diff --git a/Turnstile/extension.json b/Turnstile/extension.json
index 495fac33d..b8b0e79e7 100644
--- a/Turnstile/extension.json
+++ b/Turnstile/extension.json
@@ -15,7 +15,7 @@
 		]
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\ConfirmEdit\\Turnstile\\": "includes/"
+		"MediaWiki\\Extension\\ConfirmEdit\\Turnstile\\": "../includes/Turnstile/"
 	},
 	"config": {
 		"CaptchaClass": {
@@ -33,7 +33,7 @@
 	},
 	"ResourceFileModulePaths": {
 		"localBasePath": "resources",
-		"remoteExtPath": "ConfirmEdit/Turnstile/resources"
+		"remoteExtPath": "ConfirmEdit/resources"
 	},
 	"ResourceModules": {
 		"ext.confirmEdit.turnstile.visualEditor": {
diff --git a/extension.json b/extension.json
index e85c60820..62d5a1492 100644
--- a/extension.json
+++ b/extension.json
@@ -62,8 +62,7 @@
 		"MediaWiki\\Extension\\ConfirmEdit\\Store\\CaptchaCacheStore": "includes/Store/CaptchaCacheStore.php"
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\ConfirmEdit\\": "includes/",
-		"MediaWiki\\Extension\\ConfirmEdit\\SimpleCaptcha\\": "SimpleCaptcha/"
+		"MediaWiki\\Extension\\ConfirmEdit\\": "includes/"
 	},
 	"ResourceModules": {
 		"ext.confirmEdit.editPreview.ipwhitelist.styles": {
@@ -74,7 +73,7 @@
 			"dependencies": "ext.confirmEdit.CaptchaInputWidget"
 		},
 		"ext.confirmEdit.simpleCaptcha": {
-			"styles": "../SimpleCaptcha/resources/ext.confirmEdit.simpleCaptcha.css"
+			"styles": "ext.confirmEdit.simpleCaptcha.css"
 		}
 	},
 	"attributes": {
diff --git a/hCaptcha/extension.json b/hCaptcha/extension.json
index f7701b6eb..3c8b40f4f 100644
--- a/hCaptcha/extension.json
+++ b/hCaptcha/extension.json
@@ -14,7 +14,7 @@
 		]
 	},
 	"AutoloadNamespaces": {
-		"MediaWiki\\Extension\\ConfirmEdit\\hCaptcha\\": "includes/"
+		"MediaWiki\\Extension\\ConfirmEdit\\hCaptcha\\": "../includes/hCaptcha/"
 	},
 	"config": {
 		"CaptchaClass": {
@@ -42,7 +42,7 @@
 	},
 	"ResourceFileModulePaths": {
 		"localBasePath": "resources",
-		"remoteExtPath": "ConfirmEdit/hCaptcha/resources"
+		"remoteExtPath": "ConfirmEdit/resources/hCaptcha"
 	},
 	"ResourceModules": {
 		"ext.confirmEdit.hCaptcha.visualEditor": {
diff --git a/FancyCaptcha/includes/ApiFancyCaptchaReload.php b/includes/FancyCaptcha/ApiFancyCaptchaReload.php
similarity index 100%
rename from FancyCaptcha/includes/ApiFancyCaptchaReload.php
rename to includes/FancyCaptcha/ApiFancyCaptchaReload.php
diff --git a/FancyCaptcha/includes/FancyCaptcha.php b/includes/FancyCaptcha/FancyCaptcha.php
similarity index 100%
rename from FancyCaptcha/includes/FancyCaptcha.php
rename to includes/FancyCaptcha/FancyCaptcha.php
diff --git a/FancyCaptcha/includes/HTMLFancyCaptchaField.php b/includes/FancyCaptcha/HTMLFancyCaptchaField.php
similarity index 100%
rename from FancyCaptcha/includes/HTMLFancyCaptchaField.php
rename to includes/FancyCaptcha/HTMLFancyCaptchaField.php
diff --git a/QuestyCaptcha/includes/QuestyCaptcha.php b/includes/QuestyCaptcha/QuestyCaptcha.php
similarity index 100%
rename from QuestyCaptcha/includes/QuestyCaptcha.php
rename to includes/QuestyCaptcha/QuestyCaptcha.php
diff --git a/ReCaptchaNoCaptcha/includes/HTMLReCaptchaNoCaptchaField.php b/includes/ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php
similarity index 100%
rename from ReCaptchaNoCaptcha/includes/HTMLReCaptchaNoCaptchaField.php
rename to includes/ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php
diff --git a/ReCaptchaNoCaptcha/includes/Hooks.php b/includes/ReCaptchaNoCaptcha/Hooks.php
similarity index 100%
rename from ReCaptchaNoCaptcha/includes/Hooks.php
rename to includes/ReCaptchaNoCaptcha/Hooks.php
diff --git a/ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptcha.php b/includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptcha.php
similarity index 100%
rename from ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptcha.php
rename to includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptcha.php
diff --git a/ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptchaAuthenticationRequest.php b/includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptchaAuthenticationRequest.php
similarity index 100%
rename from ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptchaAuthenticationRequest.php
rename to includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptchaAuthenticationRequest.php
diff --git a/SimpleCaptcha/SimpleCaptcha.php b/includes/SimpleCaptcha/SimpleCaptcha.php
similarity index 100%
rename from SimpleCaptcha/SimpleCaptcha.php
rename to includes/SimpleCaptcha/SimpleCaptcha.php
diff --git a/Turnstile/includes/HTMLTurnstileField.php b/includes/Turnstile/HTMLTurnstileField.php
similarity index 100%
rename from Turnstile/includes/HTMLTurnstileField.php
rename to includes/Turnstile/HTMLTurnstileField.php
diff --git a/Turnstile/includes/Hooks.php b/includes/Turnstile/Hooks.php
similarity index 100%
rename from Turnstile/includes/Hooks.php
rename to includes/Turnstile/Hooks.php
diff --git a/Turnstile/includes/Turnstile.php b/includes/Turnstile/Turnstile.php
similarity index 100%
rename from Turnstile/includes/Turnstile.php
rename to includes/Turnstile/Turnstile.php
diff --git a/Turnstile/includes/TurnstileAuthenticationRequest.php b/includes/Turnstile/TurnstileAuthenticationRequest.php
similarity index 100%
rename from Turnstile/includes/TurnstileAuthenticationRequest.php
rename to includes/Turnstile/TurnstileAuthenticationRequest.php
diff --git a/hCaptcha/includes/HCaptcha.php b/includes/hCaptcha/HCaptcha.php
similarity index 100%
rename from hCaptcha/includes/HCaptcha.php
rename to includes/hCaptcha/HCaptcha.php
diff --git a/hCaptcha/includes/HCaptchaAuthenticationRequest.php b/includes/hCaptcha/HCaptchaAuthenticationRequest.php
similarity index 100%
rename from hCaptcha/includes/HCaptchaAuthenticationRequest.php
rename to includes/hCaptcha/HCaptchaAuthenticationRequest.php
diff --git a/hCaptcha/includes/HTMLHCaptchaField.php b/includes/hCaptcha/HTMLHCaptchaField.php
similarity index 100%
rename from hCaptcha/includes/HTMLHCaptchaField.php
rename to includes/hCaptcha/HTMLHCaptchaField.php
diff --git a/hCaptcha/includes/Hooks/ResourceLoaderHooks.php b/includes/hCaptcha/Hooks/ResourceLoaderHooks.php
similarity index 100%
rename from hCaptcha/includes/Hooks/ResourceLoaderHooks.php
rename to includes/hCaptcha/Hooks/ResourceLoaderHooks.php
diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js b/resources/ext.confirmEdit.fancyCaptcha.js
similarity index 100%
rename from FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
rename to resources/ext.confirmEdit.fancyCaptcha.js
diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.less b/resources/ext.confirmEdit.fancyCaptcha.less
similarity index 100%
rename from FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.less
rename to resources/ext.confirmEdit.fancyCaptcha.less
diff --git a/SimpleCaptcha/resources/ext.confirmEdit.simpleCaptcha.css b/resources/ext.confirmEdit.simpleCaptcha.css
similarity index 100%
rename from SimpleCaptcha/resources/ext.confirmEdit.simpleCaptcha.css
rename to resources/ext.confirmEdit.simpleCaptcha.css
diff --git a/FancyCaptcha/resources/images/ajax-loader-10x10.gif b/resources/images/ajax-loader-10x10.gif
similarity index 100%
rename from FancyCaptcha/resources/images/ajax-loader-10x10.gif
rename to resources/images/ajax-loader-10x10.gif
diff --git a/FancyCaptcha/resources/images/refresh.svg b/resources/images/refresh.svg
similarity index 100%
rename from FancyCaptcha/resources/images/refresh.svg
rename to resources/images/refresh.svg
diff --git a/ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/.eslintrc.json b/resources/ve-confirmedit-hCaptcha/.eslintrc.json
similarity index 100%
rename from ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/.eslintrc.json
rename to resources/ve-confirmedit-hCaptcha/.eslintrc.json
diff --git a/hCaptcha/resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js b/resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js
similarity index 100%
rename from hCaptcha/resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js
rename to resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js
diff --git a/Turnstile/resources/ve-confirmedit-turnstile/.eslintrc.json b/resources/ve-confirmedit-reCaptchaNoCaptcha/.eslintrc.json
similarity index 100%
rename from Turnstile/resources/ve-confirmedit-turnstile/.eslintrc.json
rename to resources/ve-confirmedit-reCaptchaNoCaptcha/.eslintrc.json
diff --git a/ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js b/resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js
similarity index 100%
rename from ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js
rename to resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js
diff --git a/hCaptcha/resources/ve-confirmedit-hCaptcha/.eslintrc.json b/resources/ve-confirmedit-turnstile/.eslintrc.json
similarity index 100%
rename from hCaptcha/resources/ve-confirmedit-hCaptcha/.eslintrc.json
rename to resources/ve-confirmedit-turnstile/.eslintrc.json
diff --git a/Turnstile/resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js b/resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js
similarity index 100%
rename from Turnstile/resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js
rename to resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js
diff --git a/tests/phpunit/HTMLFancyCaptchaFieldTest.php b/tests/phpunit/HTMLFancyCaptchaFieldTest.php
index ed546e323..45faf0a87 100644
--- a/tests/phpunit/HTMLFancyCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLFancyCaptchaFieldTest.php
@@ -21,7 +21,7 @@ class HTMLFancyCaptchaFieldTest extends MediaWikiIntegrationTestCase {
 			'wgAutoloadClasses',
 			[
 				'MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\HTMLFancyCaptchaField'
-					=> __DIR__ . '/../../FancyCaptcha/includes/HTMLFancyCaptchaField.php'
+					=> __DIR__ . '/../../includes/FancyCaptcha/HTMLFancyCaptchaField.php'
 			]
 		);
 	}
diff --git a/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php b/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
index 17f077f49..3860c350c 100644
--- a/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
+++ b/tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
@@ -19,7 +19,7 @@ class HTMLReCaptchaNoCaptchaFieldTest extends MediaWikiIntegrationTestCase {
 			'wgAutoloadClasses',
 			[
 				'MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\HTMLReCaptchaNoCaptchaField'
-					=> __DIR__ . '/../../ReCaptchaNoCaptcha/includes/HTMLReCaptchaNoCaptchaField.php'
+					=> __DIR__ . '/../../includes/ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php'
 			]
 		);
 	}
diff --git a/tests/phpunit/QuestyCaptchaTest.php b/tests/phpunit/QuestyCaptchaTest.php
index 4deb9009a..b8bdff3d3 100644
--- a/tests/phpunit/QuestyCaptchaTest.php
+++ b/tests/phpunit/QuestyCaptchaTest.php
@@ -13,7 +13,7 @@ class QuestyCaptchaTest extends MediaWikiIntegrationTestCase {
 		$this->mergeMwGlobalArrayValue(
 			'wgAutoloadClasses',
 			[ 'MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha'
-				=> __DIR__ . '/../../QuestyCaptcha/includes/QuestyCaptcha.php' ]
+				=> __DIR__ . '/../../includes/QuestyCaptcha/QuestyCaptcha.php' ]
 		);
 	}
 
diff --git a/tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php b/tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php
index 6e0dbfc1b..5df98d5b5 100644
--- a/tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php
+++ b/tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php
@@ -15,7 +15,7 @@ class ReCaptchaNoCaptchaAuthenticationRequestTest extends AuthenticationRequestT
 			'wgAutoloadClasses',
 			[
 				'MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\ReCaptchaNoCaptchaAuthenticationRequest'
-					=> __DIR__ . '/../../ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptchaAuthenticationRequest.php'
+					=> __DIR__ . '/../..//includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptchaAuthenticationRequest.php'
 			]
 		);
 	}