diff --git a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
index 42dff665630840174ea0be8ee5fff61880ed2190..fca4cb4f876aea9c2bde8bf61021906b8bdd8fac 100644
--- a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
+++ b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
@@ -69,7 +69,7 @@ class VersionClickMenu {
 	 * @return array Local lang array
 	 */
 	public function includeLL() {
-		return $GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xlf', FALSE);
+		return $GLOBALS['LANG']->includeLLFile('EXT:version/Resources/Private/Language/locallang.xlf', FALSE);
 	}
 
 }
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index ef4b4652f89a050624fb83b68c4bb142001d9973..359060507bcd793f99ca153009fc58c84e8739d2 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -107,7 +107,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 	 * Initialize language files
 	 */
 	public function __construct() {
-		$GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xlf');
+		$GLOBALS['LANG']->includeLLFile('EXT:version/Resources/Private/Language/locallang.xlf');
 	}
 
 	/**
diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index 1f65db7d651ff1fbf4b30fb493ec2b2475c2ffc1..5b26cd548a9d2d2ade41ccf3e39a445ca00629ed 100644
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -43,15 +43,15 @@ class VersionView {
 			$versions = \TYPO3\CMS\Backend\Utility\BackendUtility::selectVersionsOfRecord('pages', $onlineId, 'uid,pid,t3ver_label,t3ver_oid,t3ver_wsid,t3ver_id');
 			// If more than one was found...:
 			if (count($versions) > 1) {
-				$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:versionSelect.label', TRUE) . '</strong>';
+				$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:version/Resources/Private/Language/locallang.xlf:versionSelect.label', TRUE) . '</strong>';
 				// Create selector box entries:
 				$opt = array();
 				foreach ($versions as $vRow) {
 					if ($vRow['uid'] == $onlineId) {
 						// Live version
-						$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:versionSelect.live', TRUE) . ']';
+						$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:version/Resources/Private/Language/locallang.xlf:versionSelect.live', TRUE) . ']';
 					} else {
-						$label = $vRow['t3ver_label'] . ' (' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:versionId', TRUE) . ' ' . $vRow['t3ver_id'] . ($vRow['t3ver_wsid'] != 0 ? ' ' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xlf:workspaceId', TRUE) . ' ' . $vRow['t3ver_wsid'] : '') . ')';
+						$label = $vRow['t3ver_label'] . ' (' . $GLOBALS['LANG']->sL('LLL:EXT:version/Resources/Private/Language/locallang.xlf:versionId', TRUE) . ' ' . $vRow['t3ver_id'] . ($vRow['t3ver_wsid'] != 0 ? ' ' . $GLOBALS['LANG']->sL('LLL:EXT:version/Resources/Private/Language/locallang.xlf:workspaceId', TRUE) . ' ' . $vRow['t3ver_wsid'] : '') . ')';
 					}
 					$opt[] = '<option value="' . htmlspecialchars(GeneralUtility::linkThisScript(array('id' => $vRow['uid']))) . '"' . ($id == $vRow['uid'] ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
 				}
diff --git a/typo3/sysext/version/cm1/conf.php b/typo3/sysext/version/Modules/Version/conf.php
similarity index 63%
rename from typo3/sysext/version/cm1/conf.php
rename to typo3/sysext/version/Modules/Version/conf.php
index 3ab7f236413d68733b383268a1425b517f79a92a..7bcbe6573ccd4b0439c4c908eaf1669792e67672 100644
--- a/typo3/sysext/version/cm1/conf.php
+++ b/typo3/sysext/version/Modules/Version/conf.php
@@ -1,4 +1,3 @@
 <?php
-// DO NOT REMOVE OR CHANGE THESE 3 LINES:
 $MCONF['name'] = 'web_txversionM1';
 $MCONF['script'] = '_DISPATCH';
\ No newline at end of file
diff --git a/typo3/sysext/version/cm1/index.php b/typo3/sysext/version/Modules/Version/index.php
similarity index 100%
rename from typo3/sysext/version/cm1/index.php
rename to typo3/sysext/version/Modules/Version/index.php
diff --git a/typo3/sysext/version/locallang.xlf b/typo3/sysext/version/Resources/Private/Language/locallang.xlf
similarity index 100%
rename from typo3/sysext/version/locallang.xlf
rename to typo3/sysext/version/Resources/Private/Language/locallang.xlf
diff --git a/typo3/sysext/version/cm1/clear.gif b/typo3/sysext/version/cm1/clear.gif
deleted file mode 100644
index e1d2d83216e249399411d7e5caf10b5ece31db3d..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/version/cm1/clear.gif and /dev/null differ
diff --git a/typo3/sysext/version/ext_tables.php b/typo3/sysext/version/ext_tables.php
index b161a6ba7e9aaa310b020a185b633013280cda01..4a3ce93568eb817ce14ab3478f6d7435c82ed2c1 100644
--- a/typo3/sysext/version/ext_tables.php
+++ b/typo3/sysext/version/ext_tables.php
@@ -6,7 +6,7 @@ if (TYPO3_MODE == 'BE') {
 		// Register version_click_module
 		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModulePath(
 			'web_txversionM1',
-			\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'cm1/'
+			'EXT:version/Modules/Version/'
 		);
 
 		$GLOBALS['TBE_MODULES_EXT']['xMOD_alt_clickmenu']['extendCMclasses'][] = array(