diff --git a/ReCaptcha.i18n.php b/ReCaptcha.i18n.php
deleted file mode 100644
index 82ad11d25..000000000
--- a/ReCaptcha.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( 'wfJsonI18nShim74b2af1eb76d9704' ) ) {
-	function wfJsonI18nShim74b2af1eb76d9704( $cache, $code, &$cachedData ) {
-		$codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] );
-		foreach ( $codeSequence as $csCode ) {
-			$fileName = dirname( __FILE__ ) . "/i18n/re/$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'][] = 'wfJsonI18nShim74b2af1eb76d9704';
-}
diff --git a/ReCaptcha.php b/ReCaptcha.php
index 533704e56..0ecabd253 100644
--- a/ReCaptcha.php
+++ b/ReCaptcha.php
@@ -1,64 +1,2 @@
 <?php
-
-/**
- * Captcha class using the reCAPTCHA widget.
- * Stop Spam. Read Books.
- *
- * @addtogroup Extensions
- * @author Mike Crawford <mike.crawford@gmail.com>
- * @copyright Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * @licence MIT/X11
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-	exit;
-}
-
-require_once __DIR__ . '/ConfirmEdit.php';
-$wgCaptchaClass = 'ReCaptcha';
-
-$wgMessagesDirs['ReCaptcha'] = __DIR__ . '/ReCaptcha/i18n';
-$wgExtensionMessagesFiles['ReCaptcha'] = __DIR__ . '/ReCaptcha.i18n.php';
-
-$wgAutoloadClasses['ReCaptcha'] = __DIR__ . '/ReCaptcha.class.php';
-
-require_once( 'recaptchalib.php' );
-
-// Set these in LocalSettings.php
-$wgReCaptchaPublicKey = '';
-$wgReCaptchaPrivateKey = '';
-// For backwards compatibility
-$recaptcha_public_key = '';
-$recaptcha_private_key = '';
-
-/**
- * Sets the theme for ReCaptcha
- *
- * See http://code.google.com/apis/recaptcha/docs/customization.html
- */
-$wgReCaptchaTheme = 'red';
-
-$wgExtensionFunctions[] = 'efReCaptcha';
-
-/**
- * Make sure the keys are defined.
- */
-function efReCaptcha() {
-	global $wgReCaptchaPublicKey, $wgReCaptchaPrivateKey;
-	global $recaptcha_public_key, $recaptcha_private_key;
-	global $wgServerName;
-
-	// Backwards compatibility
-	if ( $wgReCaptchaPublicKey == '' ) {
-		$wgReCaptchaPublicKey = $recaptcha_public_key;
-	}
-	if ( $wgReCaptchaPrivateKey == '' ) {
-		$wgReCaptchaPrivateKey = $recaptcha_private_key;
-	}
-
-	if ( $wgReCaptchaPublicKey == '' || $wgReCaptchaPrivateKey == '' ) {
-		die ( 'You need to set $wgReCaptchaPrivateKey and $wgReCaptchaPublicKey in LocalSettings.php to ' .
-				"use the reCAPTCHA plugin. You can sign up for a key <a href='" .
-				htmlentities( recaptcha_get_signup_url ( $wgServerName, "mediawiki" ) ) . "'>here</a>." );
-	}
-}
+require_once __DIR__ . "/ReCaptcha/ReCaptcha.php";
diff --git a/ReCaptcha.class.php b/ReCaptcha/ReCaptcha.class.php
similarity index 100%
rename from ReCaptcha.class.php
rename to ReCaptcha/ReCaptcha.class.php
diff --git a/ReCaptcha/ReCaptcha.php b/ReCaptcha/ReCaptcha.php
new file mode 100644
index 000000000..fa854c755
--- /dev/null
+++ b/ReCaptcha/ReCaptcha.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Captcha class using the reCAPTCHA widget.
+ * Stop Spam. Read Books.
+ *
+ * @addtogroup Extensions
+ * @author Mike Crawford <mike.crawford@gmail.com>
+ * @copyright Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * @licence MIT/X11
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+
+require_once dirname( __DIR__ ) . '/ConfirmEdit.php';
+$wgCaptchaClass = 'ReCaptcha';
+
+$wgMessagesDirs['ReCaptcha'] = __DIR__ . '/i18n';
+
+$wgAutoloadClasses['ReCaptcha'] = __DIR__ . '/ReCaptcha.class.php';
+
+require_once( 'recaptchalib.php' );
+
+// Set these in LocalSettings.php
+$wgReCaptchaPublicKey = '';
+$wgReCaptchaPrivateKey = '';
+// For backwards compatibility
+$recaptcha_public_key = '';
+$recaptcha_private_key = '';
+
+/**
+ * Sets the theme for ReCaptcha
+ *
+ * See http://code.google.com/apis/recaptcha/docs/customization.html
+ */
+$wgReCaptchaTheme = 'red';
+
+$wgExtensionFunctions[] = 'efReCaptcha';
+
+/**
+ * Make sure the keys are defined.
+ */
+function efReCaptcha() {
+	global $wgReCaptchaPublicKey, $wgReCaptchaPrivateKey;
+	global $recaptcha_public_key, $recaptcha_private_key;
+	global $wgServerName;
+
+	// Backwards compatibility
+	if ( $wgReCaptchaPublicKey == '' ) {
+		$wgReCaptchaPublicKey = $recaptcha_public_key;
+	}
+	if ( $wgReCaptchaPrivateKey == '' ) {
+		$wgReCaptchaPrivateKey = $recaptcha_private_key;
+	}
+
+	if ( $wgReCaptchaPublicKey == '' || $wgReCaptchaPrivateKey == '' ) {
+		die ( 'You need to set $wgReCaptchaPrivateKey and $wgReCaptchaPublicKey in LocalSettings.php to ' .
+				"use the reCAPTCHA plugin. You can sign up for a key <a href='" .
+				htmlentities( recaptcha_get_signup_url ( $wgServerName, "mediawiki" ) ) . "'>here</a>." );
+	}
+}
diff --git a/recaptchalib.php b/ReCaptcha/recaptchalib.php
similarity index 100%
rename from recaptchalib.php
rename to ReCaptcha/recaptchalib.php