diff --git a/Classes/Configuration/VidiModulesAspect.php b/Classes/Configuration/VidiModulesAspect.php
index 81712b4..425ea18 100644
--- a/Classes/Configuration/VidiModulesAspect.php
+++ b/Classes/Configuration/VidiModulesAspect.php
@@ -37,8 +37,8 @@ class VidiModulesAspect implements TableConfigurationPostProcessingHookInterface
 	 */
 	public function processData() {
 
-		/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
-		$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
+		$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 
 		// Each data data can be displayed in a Vidi module
 		foreach ($GLOBALS['TCA'] as $dataType => $configuration) {
diff --git a/Classes/ContentRepositoryFactory.php b/Classes/ContentRepositoryFactory.php
index 7c7448f..f1b00c0 100644
--- a/Classes/ContentRepositoryFactory.php
+++ b/Classes/ContentRepositoryFactory.php
@@ -45,11 +45,11 @@ class ContentRepositoryFactory implements SingletonInterface {
 	 */
 	static public function getInstance($dataType = NULL) {
 
-		/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
+		/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
 		if (is_null($dataType)) {
 
 			// Try to get the data type from the module loader.
-			$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+			$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 			$dataType = $moduleLoader->getDataType();
 		}
 
diff --git a/Classes/Controller/Backend/ContentController.php b/Classes/Controller/Backend/ContentController.php
index 5dc185a..0ddffd9 100644
--- a/Classes/Controller/Backend/ContentController.php
+++ b/Classes/Controller/Backend/ContentController.php
@@ -269,9 +269,9 @@ public function deleteAction(array $matches) {
 	/**
 	 * Get the Vidi Module Loader.
 	 *
-	 * @return \TYPO3\CMS\Vidi\ModuleLoader
+	 * @return \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected function getModuleLoader() {
-		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 }
diff --git a/Classes/Grid/RelationEditRenderer.php b/Classes/Grid/RelationEditRenderer.php
index 4e14648..fe89128 100644
--- a/Classes/Grid/RelationEditRenderer.php
+++ b/Classes/Grid/RelationEditRenderer.php
@@ -61,9 +61,9 @@ public function render() {
 	/**
 	 * Get the Vidi Module Loader.
 	 *
-	 * @return \TYPO3\CMS\Vidi\ModuleLoader
+	 * @return \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected function getModuleLoader() {
-		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 }
diff --git a/Classes/Module/ModulePlugin.php b/Classes/Module/ModulePlugin.php
index 80b24e8..0898cd7 100644
--- a/Classes/Module/ModulePlugin.php
+++ b/Classes/Module/ModulePlugin.php
@@ -38,7 +38,7 @@
 class ModulePlugin implements SingletonInterface {
 
 	/**
-	 * @var \TYPO3\CMS\Vidi\ModuleLoader
+	 * @var \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 * @inject
 	 */
 	protected $moduleLoader;
diff --git a/Classes/Module/ModuleService.php b/Classes/Module/ModuleService.php
index 23e5175..84b0fda 100644
--- a/Classes/Module/ModuleService.php
+++ b/Classes/Module/ModuleService.php
@@ -122,9 +122,9 @@ protected function getDatabaseConnection() {
 	/**
 	 * Get the Vidi Module Loader.
 	 *
-	 * @return \TYPO3\CMS\Vidi\ModuleLoader
+	 * @return \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected function getModuleLoader() {
-		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 }
diff --git a/Classes/Persistence/MatcherObjectFactory.php b/Classes/Persistence/MatcherObjectFactory.php
index db176c2..8fddd9d 100644
--- a/Classes/Persistence/MatcherObjectFactory.php
+++ b/Classes/Persistence/MatcherObjectFactory.php
@@ -24,7 +24,7 @@
  ***************************************************************/
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Vidi\ModuleLoader;
+use TYPO3\CMS\Vidi\Module\ModuleLoader;
 use TYPO3\CMS\Vidi\Tca\TcaService;
 
 /**
@@ -152,7 +152,7 @@ protected function emitPostProcessMatcherObjectSignal(Matcher $matcher) {
 		if (strlen($matcher->getDataType()) <= 0) {
 
 			/** @var ModuleLoader $moduleLoader */
-			$moduleLoader = $this->getObjectManager()->get('TYPO3\CMS\Vidi\ModuleLoader');
+			$moduleLoader = $this->getObjectManager()->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
 			$matcher->setDataType($moduleLoader->getDataType());
 		}
 
diff --git a/Classes/Tca/TcaService.php b/Classes/Tca/TcaService.php
index 43b200f..2dfd943 100644
--- a/Classes/Tca/TcaService.php
+++ b/Classes/Tca/TcaService.php
@@ -102,8 +102,8 @@ class TcaService implements SingletonInterface, TcaServiceInterface {
 	static public function getService($tableName = '', $serviceType) {
 		if (TYPO3_MODE == 'BE' && empty($tableName)) {
 
-			/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
-			$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+			/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
+			$moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 			$tableName = $moduleLoader->getDataType();
 		}
 
diff --git a/Classes/View/Menu/DataTypeMenu.php b/Classes/View/Menu/DataTypeMenu.php
index b7318c3..1454f16 100644
--- a/Classes/View/Menu/DataTypeMenu.php
+++ b/Classes/View/Menu/DataTypeMenu.php
@@ -100,9 +100,9 @@ protected function assembleMenuOptions(array $moduleCodes) {
 	/**
 	 * Get the Vidi Module Loader.
 	 *
-	 * @return \TYPO3\CMS\Vidi\ModuleLoader
+	 * @return \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected function getModuleLoader() {
-		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 }
diff --git a/Classes/ViewHelpers/Be/AssetsViewHelper.php b/Classes/ViewHelpers/Be/AssetsViewHelper.php
index 43a2b90..d98d204 100644
--- a/Classes/ViewHelpers/Be/AssetsViewHelper.php
+++ b/Classes/ViewHelpers/Be/AssetsViewHelper.php
@@ -42,8 +42,8 @@ public function render() {
 		$doc = $this->getDocInstance();
 		$pageRenderer = $doc->getPageRenderer();
 
-		/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
-		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
+		/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
+		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
 
 		foreach ($moduleLoader->getAdditionalStyleSheetFiles() as $addCssFile) {
 			$fileNameAndPath = $this->resolvePath($addCssFile);
diff --git a/Classes/ViewHelpers/Component/CheckPidViewHelper.php b/Classes/ViewHelpers/Component/CheckPidViewHelper.php
index 31cb6d9..37f35ea 100644
--- a/Classes/ViewHelpers/Component/CheckPidViewHelper.php
+++ b/Classes/ViewHelpers/Component/CheckPidViewHelper.php
@@ -35,7 +35,7 @@
 class CheckPidViewHelper extends AbstractViewHelper {
 
 	/**
-	 * @var \TYPO3\CMS\Vidi\ModuleLoader
+	 * @var \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 * @inject
 	 */
 	protected $moduleLoader;
diff --git a/Classes/ViewHelpers/Component/CheckRelationsViewHelper.php b/Classes/ViewHelpers/Component/CheckRelationsViewHelper.php
index 539b94c..8355a44 100644
--- a/Classes/ViewHelpers/Component/CheckRelationsViewHelper.php
+++ b/Classes/ViewHelpers/Component/CheckRelationsViewHelper.php
@@ -31,7 +31,7 @@
 class CheckRelationsViewHelper extends AbstractViewHelper {
 
 	/**
-	 * @var \TYPO3\CMS\Vidi\ModuleLoader
+	 * @var \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 * @inject
 	 */
 	protected $moduleLoader;
diff --git a/Classes/ViewHelpers/Grid/SystemButtonsViewHelper.php b/Classes/ViewHelpers/Grid/SystemButtonsViewHelper.php
index 690a834..b2ea700 100644
--- a/Classes/ViewHelpers/Grid/SystemButtonsViewHelper.php
+++ b/Classes/ViewHelpers/Grid/SystemButtonsViewHelper.php
@@ -24,7 +24,7 @@
 ***************************************************************/
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3\CMS\Vidi\Domain\Model\Content;
-use TYPO3\CMS\Vidi\ModuleLoader;
+use TYPO3\CMS\Vidi\Module\ModuleLoader;
 
 /**
  * View helper for rendering buttons in the grids according to a Content object.
@@ -46,7 +46,7 @@ class SystemButtonsViewHelper extends AbstractViewHelper {
 	public function render(Content $object) {
 
 		/** @var ModuleLoader $moduleLoader */
-		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
+		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
 		$components = $moduleLoader->getGridButtonsComponents();
 
 		$result = '';
diff --git a/Classes/ViewHelpers/ModuleLoaderViewHelper.php b/Classes/ViewHelpers/ModuleLoaderViewHelper.php
index 23e61f4..a2fb760 100644
--- a/Classes/ViewHelpers/ModuleLoaderViewHelper.php
+++ b/Classes/ViewHelpers/ModuleLoaderViewHelper.php
@@ -38,8 +38,8 @@ class ModuleLoaderViewHelper extends AbstractViewHelper {
 	public function render($key) {
 		$getter = 'get' . ucfirst($key);
 
-		/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
-		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
+		/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
+		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
 		return $moduleLoader->$getter();
 	}
 
diff --git a/Classes/ViewHelpers/Render/ComponentsViewHelper.php b/Classes/ViewHelpers/Render/ComponentsViewHelper.php
index 5ccf643..8009f6f 100644
--- a/Classes/ViewHelpers/Render/ComponentsViewHelper.php
+++ b/Classes/ViewHelpers/Render/ComponentsViewHelper.php
@@ -23,7 +23,7 @@
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3\CMS\Vidi\ModuleLoader;
+use TYPO3\CMS\Vidi\Module\ModuleLoader;
 
 /**
  * View helper for rendering components
@@ -45,7 +45,7 @@ class ComponentsViewHelper extends AbstractViewHelper {
 	public function render($part) {
 
 		/** @var ModuleLoader $moduleLoader */
-		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\ModuleLoader');
+		$moduleLoader = $this->objectManager->get('TYPO3\CMS\Vidi\Module\ModuleLoader');
 
 		$getComponents = 'get' . ucfirst($part) . 'Components';
 		$components = $moduleLoader->$getComponents();
diff --git a/Classes/ViewHelpers/Uri/CreateViewHelper.php b/Classes/ViewHelpers/Uri/CreateViewHelper.php
index eeabf55..e5b9829 100644
--- a/Classes/ViewHelpers/Uri/CreateViewHelper.php
+++ b/Classes/ViewHelpers/Uri/CreateViewHelper.php
@@ -40,7 +40,7 @@ class CreateViewHelper extends AbstractViewHelper {
 	protected $backendUser;
 
 	/**
-	 * @var \TYPO3\CMS\Vidi\ModuleLoader
+	 * @var \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected $moduleLoader;
 
@@ -49,7 +49,7 @@ class CreateViewHelper extends AbstractViewHelper {
 	 */
 	public function initialize() {
 		$this->backendUser = $GLOBALS['BE_USER'];
-		$this->moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		$this->moduleLoader = GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 
 	/**
@@ -92,9 +92,9 @@ public function getPid() {
 	/**
 	 * Get the Vidi Module Loader.
 	 *
-	 * @return \TYPO3\CMS\Vidi\ModuleLoader
+	 * @return \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected function getModuleLoader() {
-		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 }
diff --git a/Classes/ViewHelpers/Uri/DeleteViewHelper.php b/Classes/ViewHelpers/Uri/DeleteViewHelper.php
index 810f9d8..828f409 100644
--- a/Classes/ViewHelpers/Uri/DeleteViewHelper.php
+++ b/Classes/ViewHelpers/Uri/DeleteViewHelper.php
@@ -32,7 +32,7 @@
 class DeleteViewHelper extends AbstractViewHelper {
 
 	/**
-	 * @var \TYPO3\CMS\Vidi\ModuleLoader
+	 * @var \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 * @inject
 	 */
 	protected $moduleLoader;
diff --git a/Classes/ViewHelpers/Uri/EditViewHelper.php b/Classes/ViewHelpers/Uri/EditViewHelper.php
index 62b3dc5..8d70e4a 100644
--- a/Classes/ViewHelpers/Uri/EditViewHelper.php
+++ b/Classes/ViewHelpers/Uri/EditViewHelper.php
@@ -51,10 +51,10 @@ public function render(Content $object) {
 	/**
 	 * Get the Vidi Module Loader.
 	 *
-	 * @return \TYPO3\CMS\Vidi\ModuleLoader
+	 * @return \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	protected function getModuleLoader() {
-		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		return GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 	}
 }
 
diff --git a/Tests/Unit/Grid/RelationRendererTest.php b/Tests/Unit/Grid/RelationRendererTest.php
index 82c3434..a2136f0 100644
--- a/Tests/Unit/Grid/RelationRendererTest.php
+++ b/Tests/Unit/Grid/RelationRendererTest.php
@@ -46,7 +46,7 @@ class RelationRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	private $moduleCode = 'user_VidiFeUsersM1';
 
 	public function setUp() {
-		$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
+		$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
 		$moduleLoader->register();
 		$GLOBALS['_GET']['M'] = $this->moduleCode;
 		$this->fixture = new \TYPO3\CMS\Vidi\Grid\RelationRenderer();
diff --git a/Tests/Unit/Module/ModuleLoaderTest.php b/Tests/Unit/Module/ModuleLoaderTest.php
index c765a0b..6d65dc9 100644
--- a/Tests/Unit/Module/ModuleLoaderTest.php
+++ b/Tests/Unit/Module/ModuleLoaderTest.php
@@ -26,12 +26,12 @@
  ***************************************************************/
 
 /**
- * Test case for class \TYPO3\CMS\Vidi\ModuleLoader.
+ * Test case for class \TYPO3\CMS\Vidi\Module\ModuleLoader.
  */
 class ModuleLoaderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
 	/**
-	 * @var \TYPO3\CMS\Vidi\ModuleLoader
+	 * @var \TYPO3\CMS\Vidi\Module\ModuleLoader
 	 */
 	private $fixture;
 
@@ -47,7 +47,7 @@ class ModuleLoaderTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
 
 	public function setUp() {
-		$this->fixture = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
+		$this->fixture = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
 		$this->fixture->register();
 	}
 
@@ -99,7 +99,7 @@ public function attributeProvider() {
 	 * @test
 	 */
 	public function getModuleConfigurationReturnsArrayWithSomeKeys() {
-		$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
+		$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
 		$moduleLoader->register();
 		$GLOBALS['_GET']['M'] = $this->moduleCode;
 
@@ -114,7 +114,7 @@ public function getModuleConfigurationReturnsArrayWithSomeKeys() {
 	 * @test
 	 */
 	public function getModuleConfigurationWithParameterDataTypeReturnsDataType() {
-		$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
+		$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
 		$moduleLoader->register();
 		$GLOBALS['_GET']['M'] = $this->moduleCode;
 		$this->assertEquals($this->dataType, $moduleLoader->getModuleConfiguration('dataType'));
diff --git a/Tests/Unit/Tca/FieldServiceTest.php b/Tests/Unit/Tca/FieldServiceTest.php
index 88146fa..4ae27ca 100644
--- a/Tests/Unit/Tca/FieldServiceTest.php
+++ b/Tests/Unit/Tca/FieldServiceTest.php
@@ -47,7 +47,7 @@ class FieldServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	public function setUp() {
 
-		$moduleLoader = new \TYPO3\CMS\Vidi\ModuleLoader($this->dataType);
+		$moduleLoader = new \TYPO3\CMS\Vidi\Module\ModuleLoader($this->dataType);
 		$moduleLoader->register();
 		$GLOBALS['_GET']['M'] = $this->moduleCode;
 
diff --git a/ext_tables.php b/ext_tables.php
index 0cde2bc..7756491 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -6,7 +6,7 @@
 
 // Check from Vidi configuration what default module should be loaded.
 // Make sure the class exists to avoid a Runtime Error
-if (TYPO3_MODE == 'BE' && class_exists('TYPO3\CMS\Vidi\ModuleLoader')) {
+if (TYPO3_MODE == 'BE' && class_exists('TYPO3\CMS\Vidi\Module\ModuleLoader')) {
 
 	/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
 	$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
@@ -18,14 +18,14 @@
 	// Loop around the data types and register them to be displayed within a BE module.
 	if ($configuration['data_types']['value']) {
 
-		/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
-		$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader');
+		/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
+		$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader');
 
 		$dataTypes = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['data_types']['value']);
 		foreach ($dataTypes as $dataType) {
 
-			/** @var \TYPO3\CMS\Vidi\ModuleLoader $moduleLoader */
-			$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\ModuleLoader', $dataType);
+			/** @var \TYPO3\CMS\Vidi\Module\ModuleLoader $moduleLoader */
+			$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Vidi\Module\ModuleLoader', $dataType);
 			$moduleLoader->setIcon(sprintf('EXT:vidi/Resources/Public/Images/%s.png', $dataType))
 				->setModuleLanguageFile(sprintf('LLL:EXT:vidi/Resources/Private/Language/%s.xlf', $dataType))
 				->addJavaScriptFiles(array(sprintf('EXT:vidi/Resources/Public/JavaScript/%s.js', $dataType)))