diff --git a/FancyCaptcha.i18n.php b/FancyCaptcha.i18n.php
deleted file mode 100644
index 57d54d644..000000000
--- a/FancyCaptcha.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimef89e87d420f1fe8' ) ) {
-	function wfJsonI18nShimef89e87d420f1fe8( $cache, $code, &$cachedData ) {
-		$codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] );
-		foreach ( $codeSequence as $csCode ) {
-			$fileName = dirname( __FILE__ ) . "/i18n/fancy/$csCode.json";
-			if ( is_readable( $fileName ) ) {
-				$data = FormatJson::decode( file_get_contents( $fileName ), true );
-				foreach ( array_keys( $data ) as $key ) {
-					if ( $key === '' || $key[0] === '@' ) {
-						unset( $data[$key] );
-					}
-				}
-				$cachedData['messages'] = array_merge( $data, $cachedData['messages'] );
-			}
-
-			$cachedData['deps'][] = new FileDependency( $fileName );
-		}
-		return true;
-	}
-
-	$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShimef89e87d420f1fe8';
-}
diff --git a/FancyCaptcha.php b/FancyCaptcha.php
index dd8185878..5d5da32d0 100644
--- a/FancyCaptcha.php
+++ b/FancyCaptcha.php
@@ -1,88 +1,2 @@
 <?php
-/**
- * Experimental image-based captcha plugin, using images generated by an
- * external tool.
- *
- * Copyright (C) 2005, 2006 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Extensions
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-	exit;
-}
-
-require_once __DIR__ . '/ConfirmEdit.php';
-$wgCaptchaClass = 'FancyCaptcha';
-
-/**
- * The name of a file backend ($wgFileBackends) to be used for storing files.
- * Defaults to FSFileBackend using $wgCaptchaDirectory as a base path.
- */
-$wgCaptchaFileBackend = '';
-
-global $wgCaptchaDirectory;
-$wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
-
-global $wgCaptchaDirectoryLevels;
-$wgCaptchaDirectoryLevels = 0; // To break into subdirectories
-
-global $wgCaptchaSecret;
-$wgCaptchaSecret = "CHANGE_THIS_SECRET!";
-
-/**
- * By default the FancyCaptcha rotates among all available captchas.
- * Setting $wgCaptchaDeleteOnSolve to true will delete the captcha
- * files when they are correctly solved. Thus the user will need
- * something like a cron creating new thumbnails to avoid drying up.
- */
-$wgCaptchaDeleteOnSolve = false;
-
-$wgMessagesDirs['FancyCaptcha'] = __DIR__ . '/FancyCaptcha/i18n';
-$wgExtensionMessagesFiles['FancyCaptcha'] = __DIR__ . '/FancyCaptcha.i18n.php';
-$wgAutoloadClasses['FancyCaptcha'] = __DIR__ . '/FancyCaptcha.class.php';
-
-$wgResourceModules['ext.confirmEdit.fancyCaptcha.styles'] = array(
-	'position' => 'top',
-	'localBasePath' => __DIR__ . '/resources',
-	'remoteExtPath' => 'ConfirmEdit/resources',
-	'targets' => array( 'mobile', 'desktop' ),
-	'styles' => 'ext.confirmEdit.fancyCaptcha.css',
-);
-
-$wgResourceModules['ext.confirmEdit.fancyCaptcha'] = array(
-	'localBasePath' => __DIR__ . '/resources',
-	'remoteExtPath' => 'ConfirmEdit/resources',
-	'scripts' => 'ext.confirmEdit.fancyCaptcha.js',
-	'dependencies' => 'mediawiki.api',
-);
-
-// FIXME: remove, add mobile target to ext.confirmEdit.fancyCaptcha and update
-// MobileFrontend accordingly when bug 57629 is resolved
-$wgResourceModules['ext.confirmEdit.fancyCaptchaMobile'] = array(
-	'localBasePath' => __DIR__ . '/resources',
-	'remoteExtPath' => 'ConfirmEdit/resources',
-	'scripts' => 'ext.confirmEdit.fancyCaptcha.js',
-	'targets' => array( 'mobile', 'desktop' ),
-	'dependencies' => 'mobile.startup',
-);
-
-$wgAutoloadClasses['ApiFancyCaptchaReload'] = __DIR__ . '/ApiFancyCaptchaReload.php';
-$wgAPIModules['fancycaptchareload'] = 'ApiFancyCaptchaReload';
+require_once __DIR__ . "/FancyCaptcha/FancyCaptcha.php";
diff --git a/FancyCaptcha.class.php b/FancyCaptcha/FancyCaptcha.class.php
similarity index 100%
rename from FancyCaptcha.class.php
rename to FancyCaptcha/FancyCaptcha.class.php
diff --git a/FancyCaptcha/FancyCaptcha.php b/FancyCaptcha/FancyCaptcha.php
new file mode 100644
index 000000000..403d23c7a
--- /dev/null
+++ b/FancyCaptcha/FancyCaptcha.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Experimental image-based captcha plugin, using images generated by an
+ * external tool.
+ *
+ * Copyright (C) 2005, 2006 Brion Vibber <brion@pobox.com>
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+
+require_once __DIR__ . '/../ConfirmEdit.php';
+$wgCaptchaClass = 'FancyCaptcha';
+
+/**
+ * The name of a file backend ($wgFileBackends) to be used for storing files.
+ * Defaults to FSFileBackend using $wgCaptchaDirectory as a base path.
+ */
+$wgCaptchaFileBackend = '';
+
+global $wgCaptchaDirectory;
+$wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
+
+global $wgCaptchaDirectoryLevels;
+$wgCaptchaDirectoryLevels = 0; // To break into subdirectories
+
+global $wgCaptchaSecret;
+$wgCaptchaSecret = "CHANGE_THIS_SECRET!";
+
+/**
+ * By default the FancyCaptcha rotates among all available captchas.
+ * Setting $wgCaptchaDeleteOnSolve to true will delete the captcha
+ * files when they are correctly solved. Thus the user will need
+ * something like a cron creating new thumbnails to avoid drying up.
+ */
+$wgCaptchaDeleteOnSolve = false;
+
+$wgMessagesDirs['FancyCaptcha'] = __DIR__ . '/i18n';
+$wgAutoloadClasses['FancyCaptcha'] = __DIR__ . '/FancyCaptcha.class.php';
+
+$wgResourceModules['ext.confirmEdit.fancyCaptcha.styles'] = array(
+	'position' => 'top',
+	'localBasePath' => __DIR__ . '/resources',
+	'remoteExtPath' => 'ConfirmEdit/FancyCaptcha/resources',
+	'targets' => array( 'mobile', 'desktop' ),
+	'styles' => 'ext.confirmEdit.fancyCaptcha.css',
+);
+
+$wgResourceModules['ext.confirmEdit.fancyCaptcha'] = array(
+	'localBasePath' => __DIR__ . '/resources',
+	'remoteExtPath' => 'ConfirmEdit/FancyCaptcha/resources',
+	'scripts' => 'ext.confirmEdit.fancyCaptcha.js',
+	'dependencies' => 'mediawiki.api',
+);
+
+// FIXME: remove, add mobile target to ext.confirmEdit.fancyCaptcha and update
+// MobileFrontend accordingly when bug 57629 is resolved
+$wgResourceModules['ext.confirmEdit.fancyCaptchaMobile'] = array(
+	'localBasePath' => __DIR__ . '/resources',
+	'remoteExtPath' => 'ConfirmEdit/FancyCaptcha/resources',
+	'scripts' => 'ext.confirmEdit.fancyCaptcha.js',
+	'targets' => array( 'mobile', 'desktop' ),
+	'dependencies' => 'mobile.startup',
+);
+
+$wgAutoloadClasses['ApiFancyCaptchaReload'] = __DIR__ . '/ApiFancyCaptchaReload.php';
+$wgAPIModules['fancycaptchareload'] = 'ApiFancyCaptchaReload';
diff --git a/resources/ext.confirmEdit.fancyCaptcha.css b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
similarity index 100%
rename from resources/ext.confirmEdit.fancyCaptcha.css
rename to FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.css
diff --git a/resources/ext.confirmEdit.fancyCaptcha.js b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
similarity index 100%
rename from resources/ext.confirmEdit.fancyCaptcha.js
rename to FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
diff --git a/resources/images/ajax-loader-10x10.gif b/FancyCaptcha/resources/images/ajax-loader-10x10.gif
similarity index 100%
rename from resources/images/ajax-loader-10x10.gif
rename to FancyCaptcha/resources/images/ajax-loader-10x10.gif
diff --git a/resources/images/fancycaptcha-reload-icon.png b/FancyCaptcha/resources/images/fancycaptcha-reload-icon.png
similarity index 100%
rename from resources/images/fancycaptcha-reload-icon.png
rename to FancyCaptcha/resources/images/fancycaptcha-reload-icon.png