diff --git a/typo3/sysext/dbal/Classes/Controller/ModuleController.php b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
index 1c420e2f73985e97595839dd9e4e61d91603c1f9..2069b5ebc5d3a0f87979bf5cb13aff11a14a5472 100644
--- a/typo3/sysext/dbal/Classes/Controller/ModuleController.php
+++ b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
@@ -42,7 +42,7 @@ class ModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 		$this->MCONF = array(
 			'name' => $this->moduleName,
 		);
-		$this->getLanguageService()->includeLLFile('EXT:dbal/mod1/locallang.xlf');
+		$this->getLanguageService()->includeLLFile('EXT:dbal/Resources/Private/Language/locallang.xlf');
 		parent::init();
 	}
 
diff --git a/typo3/sysext/dbal/mod1/index.php b/typo3/sysext/dbal/Modules/Dbal/index.php
similarity index 100%
rename from typo3/sysext/dbal/mod1/index.php
rename to typo3/sysext/dbal/Modules/Dbal/index.php
diff --git a/typo3/sysext/dbal/mod1/locallang.xlf b/typo3/sysext/dbal/Resources/Private/Language/locallang.xlf
similarity index 100%
rename from typo3/sysext/dbal/mod1/locallang.xlf
rename to typo3/sysext/dbal/Resources/Private/Language/locallang.xlf
diff --git a/typo3/sysext/dbal/mod1/locallang_mod.xlf b/typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf
similarity index 100%
rename from typo3/sysext/dbal/mod1/locallang_mod.xlf
rename to typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf
diff --git a/typo3/sysext/dbal/ext_tables.php b/typo3/sysext/dbal/ext_tables.php
index d4d5ce939b79bd48de97943765c6329dd9cc46a9..0144f9cf3d9c3551fd63cd36104b6ca2a221dda1 100644
--- a/typo3/sysext/dbal/ext_tables.php
+++ b/typo3/sysext/dbal/ext_tables.php
@@ -6,16 +6,16 @@ if (TYPO3_MODE === 'BE') {
 		'tools',
 		'txdbalM1',
 		'',
-		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/',
+		'EXT:dbal/Modules/Dbal/',
 		array(
 			'script' => '_DISPATCH',
 			'access' => 'admin',
 			'name' => 'tools_txdbalM1',
 			'labels' => array(
 				'tabs_images' => array(
-					'tab' => '../Resources/Public/Icons/module-dbal.svg',
+					'tab' => 'EXT:dbal/Resources/Public/Icons/module-dbal.svg',
 				),
-				'll_ref' => 'LLL:EXT:dbal/mod1/locallang_mod.xlf',
+				'll_ref' => 'LLL:EXT:dbal/Resources/Private/Language/locallang_mod.xlf',
 			),
 		)
 	);
diff --git a/typo3/sysext/dbal/mod1/clear.gif b/typo3/sysext/dbal/mod1/clear.gif
deleted file mode 100644
index e1d2d83216e249399411d7e5caf10b5ece31db3d..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/dbal/mod1/clear.gif and /dev/null differ