diff --git a/typo3/sysext/lowlevel/config/index.php b/typo3/sysext/lowlevel/Modules/Configuration/index.php
similarity index 100%
rename from typo3/sysext/lowlevel/config/index.php
rename to typo3/sysext/lowlevel/Modules/Configuration/index.php
diff --git a/typo3/sysext/lowlevel/dbint/index.php b/typo3/sysext/lowlevel/Modules/DatabaseIntegrity/index.php
similarity index 100%
rename from typo3/sysext/lowlevel/dbint/index.php
rename to typo3/sysext/lowlevel/Modules/DatabaseIntegrity/index.php
diff --git a/typo3/sysext/lowlevel/admin_cli.php b/typo3/sysext/lowlevel/Resources/PHP/admin_cli.php
similarity index 100%
rename from typo3/sysext/lowlevel/admin_cli.php
rename to typo3/sysext/lowlevel/Resources/PHP/admin_cli.php
diff --git a/typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php b/typo3/sysext/lowlevel/Resources/PHP/cleaner_cli.php
similarity index 100%
rename from typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php
rename to typo3/sysext/lowlevel/Resources/PHP/cleaner_cli.php
diff --git a/typo3/sysext/lowlevel/dbint/cli/refindex_cli.php b/typo3/sysext/lowlevel/Resources/PHP/refindex_cli.php
similarity index 100%
rename from typo3/sysext/lowlevel/dbint/cli/refindex_cli.php
rename to typo3/sysext/lowlevel/Resources/PHP/refindex_cli.php
diff --git a/typo3/sysext/lowlevel/dbint/locallang_mod.xlf b/typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod.xlf
similarity index 100%
rename from typo3/sysext/lowlevel/dbint/locallang_mod.xlf
rename to typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod.xlf
diff --git a/typo3/sysext/lowlevel/config/locallang_mod.xlf b/typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf
similarity index 100%
rename from typo3/sysext/lowlevel/config/locallang_mod.xlf
rename to typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf
diff --git a/typo3/sysext/lowlevel/ext_localconf.php b/typo3/sysext/lowlevel/ext_localconf.php
index 01f7589143de665fd1977f38ccb4282aca742455..4d9e0f3db659ae356b496272008ae741b23b2e15 100644
--- a/typo3/sysext/lowlevel/ext_localconf.php
+++ b/typo3/sysext/lowlevel/ext_localconf.php
@@ -3,9 +3,9 @@ defined('TYPO3_MODE') or die();
 
 if (TYPO3_MODE === 'BE') {
 	// Setting up scripts that can be run from the cli_dispatch.phpsh script.
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_refindex'] = array('EXT:lowlevel/dbint/cli/refindex_cli.php', '_CLI_lowlevel');
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_cleaner'] = array('EXT:lowlevel/dbint/cli/cleaner_cli.php', '_CLI_lowlevel');
-	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_admin'] = array('EXT:lowlevel/admin_cli.php', '_CLI_lowlevel');
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_refindex'] = array('EXT:lowlevel/Resources/PHP/refindex_cli.php', '_CLI_lowlevel');
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_cleaner'] = array('EXT:lowlevel/Resources/PHP/cleaner_cli.php', '_CLI_lowlevel');
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_admin'] = array('EXT:lowlevel/Resources/PHP/admin_cli.php', '_CLI_lowlevel');
 	$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['lowlevel']['cleanerModules']['missing_files'] = array('TYPO3\\CMS\\Lowlevel\\MissingFilesCommand');
 	$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['lowlevel']['cleanerModules']['missing_relations'] = array('TYPO3\\CMS\\Lowlevel\\MissingRelationsCommand');
 	$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['lowlevel']['cleanerModules']['double_files'] = array('TYPO3\\CMS\\Lowlevel\\DoubleFilesCommand');
diff --git a/typo3/sysext/lowlevel/ext_tables.php b/typo3/sysext/lowlevel/ext_tables.php
index 83a7046be3d0eaddfd578a80daa4323a66dc8620..a4251685159beb28e67f9541349deb0bb7676271 100644
--- a/typo3/sysext/lowlevel/ext_tables.php
+++ b/typo3/sysext/lowlevel/ext_tables.php
@@ -6,7 +6,7 @@ if (TYPO3_MODE === 'BE') {
 		'system',
 		'dbint',
 		'',
-		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'dbint/',
+		'EXT:lowlevel/Modules/DatabaseIntegrity/',
 		array(
 			'script' => '_DISPATCH',
 			'access' => 'admin',
@@ -14,9 +14,9 @@ if (TYPO3_MODE === 'BE') {
 			'workspaces' => 'online',
 			'labels' => array(
 				'tabs_images' => array(
-					'tab' => '../Resources/Public/Icons/module-dbint.svg',
+					'tab' => 'EXT:lowlevel/Resources/Public/Icons/module-dbint.svg',
 				),
-				'll_ref' => 'LLL:EXT:lowlevel/dbint/locallang_mod.xlf',
+				'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod.xlf',
 			),
 		)
 	);
@@ -24,7 +24,7 @@ if (TYPO3_MODE === 'BE') {
 		'system',
 		'config',
 		'',
-		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'config/',
+		'EXT:lowlevel/Modules/Configuration/',
 		array(
 			'script' => '_DISPATCH',
 			'access' => 'admin',
@@ -32,9 +32,9 @@ if (TYPO3_MODE === 'BE') {
 			'workspaces' => 'online',
 			'labels' => array(
 				'tabs_images' => array(
-					'tab' => '../Resources/Public/Icons/module-config.svg',
+					'tab' => 'EXT:lowlevel/Resources/Public/Icons/module-config.svg',
 				),
-				'll_ref' => 'LLL:EXT:lowlevel/config/locallang_mod.xlf',
+				'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf',
 			),
 		)
 	);