diff --git a/contao/classes/MetafieldsHelper.php b/contao/classes/MetafieldsHelper.php
index 3664ef5..fc236d0 100644
--- a/contao/classes/MetafieldsHelper.php
+++ b/contao/classes/MetafieldsHelper.php
@@ -13,8 +13,6 @@
  * @filesource
  */
 
-namespace AdditionalMetafields;
-
 /**
  * Class MetafieldsHelper
  *
diff --git a/contao/config/autoload.php b/contao/config/autoload.php
index 39e5deb..9ac782c 100644
--- a/contao/config/autoload.php
+++ b/contao/config/autoload.php
@@ -13,12 +13,10 @@
  * @filesource
  */
 
-ClassLoader::addNamespace('AdditionalMetafields');
-
 ClassLoader::addClasses(array(
-    'AdditionalMetafields\MetafieldsHelper'          => 'system/modules/additional_metafields/classes/MetafieldsHelper.php',
-    'AdditionalMetafields\MetaWizardPlus'            => 'system/modules/additional_metafields/widgets/MetaWizardPlus.php',
-    'AdditionalMetafields\MetafieldsModel'           => 'system/modules/additional_metafields/models/MetafieldsModel.php',
+    'MetafieldsHelper'          => 'system/modules/additional_metafields/classes/MetafieldsHelper.php',
+    'MetaWizardPlus'            => 'system/modules/additional_metafields/widgets/MetaWizardPlus.php',
+    'MetafieldsModel'           => 'system/modules/additional_metafields/models/MetafieldsModel.php',
 ));
 
 
diff --git a/contao/config/config.php b/contao/config/config.php
index 355b475..1feef20 100644
--- a/contao/config/config.php
+++ b/contao/config/config.php
@@ -13,12 +13,10 @@
  * @filesource
  */
 
-$GLOBALS['TL_HOOKS']['getContentElement'][]         = array('AdditionalMetafields\MetafieldsHelper', 'injectMetaData');
-$GLOBALS['TL_HOOKS']['parseArticles'][]             = array('AdditionalMetafields\MetafieldsHelper', 'injectMetaDataArticleImage');
+$GLOBALS['TL_HOOKS']['getContentElement'][]         = array('MetafieldsHelper', 'injectMetaData');
+$GLOBALS['TL_HOOKS']['parseArticles'][]             = array('MetafieldsHelper', 'injectMetaDataArticleImage');
 
-$GLOBALS['BE_FFL']['metaWizardPlus']                = 'AdditionalMetafields\MetaWizardPlus';
-
-$GLOBALS['TL_MODELS']['tl_metafields']              = 'AdditionalMetafields\MetafieldsModel';
+$GLOBALS['BE_FFL']['metaWizardPlus']                = 'MetaWizardPlus';
 
 array_insert($GLOBALS['BE_MOD']['system'], 1, array(
     'metafields' => array
@@ -28,7 +26,6 @@
     )
 ));
 
-
 if (TL_MODE == 'BE') {
     $GLOBALS['TL_CSS'][] = "/system/modules/additional_metafields/assets/style.css";
 }
diff --git a/contao/config/runonce.php b/contao/config/runonce.php
index 629a9aa..048866e 100644
--- a/contao/config/runonce.php
+++ b/contao/config/runonce.php
@@ -13,8 +13,6 @@
  * @filesource
  */
 
-use \AdditionalMetafields\MetafieldsModel;
-
 class MetafieldsRunonceJob extends \Controller {
 
     public function __construct() {
diff --git a/contao/dca/tl_settings.php b/contao/dca/tl_settings.php
deleted file mode 100644
index b870323..0000000
--- a/contao/dca/tl_settings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Contao Open Source CMS
- * Copyright (C) 2005-2014 Leo Feyer
- *
- *
- * PHP version 5
- * @copyright  Martin Kozianka 2013-2014 <http://kozianka.de/>
- * @author     Martin Kozianka <http://kozianka.de/>
- * @package    additional_metafields
- * @license    LGPL
- * @filesource
- */
-
-$GLOBALS['TL_DCA']['tl_settings']['palettes']['default'] .= ';{additional_metafields_legend:hide},additional_metafields_exts';
-
-$GLOBALS['TL_DCA']['tl_settings']['fields']['additional_metafields_exts'] = array(
-    'label'             => &$GLOBALS['TL_LANG']['tl_settings']['additional_metafields_exts'],
-    'inputType'         => 'text'
-);
\ No newline at end of file
diff --git a/contao/languages/de/default.php b/contao/languages/de/default.php
index 31798f9..fc0a7e9 100644
--- a/contao/languages/de/default.php
+++ b/contao/languages/de/default.php
@@ -1,3 +1,4 @@
 <?php
 
-$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadaten', 'Metadaten-Attribute für Dateien und Ordner festlegen');
\ No newline at end of file
+$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadaten', 'Metadaten-Attribute für Dateien und Ordner festlegen');
+
diff --git a/contao/languages/de/tl_metafields.php b/contao/languages/de/tl_metafields.php
index 3d977c1..f9f6e61 100644
--- a/contao/languages/de/tl_metafields.php
+++ b/contao/languages/de/tl_metafields.php
@@ -9,4 +9,5 @@
 
 $GLOBALS['TL_LANG']['tl_metafields']['new']          = array('Neues Attribut', 'Neues Attribut anlegen');
 $GLOBALS['TL_LANG']['tl_metafields']['edit']         = array('Attribut editieren', 'Attribut editieren');
-$GLOBALS['TL_LANG']['tl_metafields']['delete']       = array('Attribut löschen', 'Attribut löschen');
\ No newline at end of file
+$GLOBALS['TL_LANG']['tl_metafields']['delete']       = array('Attribut löschen', 'Attribut löschen');
+
diff --git a/contao/languages/de/tl_settings.php b/contao/languages/de/tl_settings.php
deleted file mode 100644
index a586c1f..0000000
--- a/contao/languages/de/tl_settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$GLOBALS['TL_LANG']['tl_settings']['additional_metafields_legend']    = 'Datei-Meta-Informationen';
-$GLOBALS['TL_LANG']['tl_settings']['additional_metafields_exts']      = array('Dateitypen', 'Kommagetrennte Liste von Dateitypen bei denen die zusätzlichen Felder angezeigt werden sollen.');
-
diff --git a/contao/languages/en/default.php b/contao/languages/en/default.php
index 65b84b9..91d5c30 100644
--- a/contao/languages/en/default.php
+++ b/contao/languages/en/default.php
@@ -1,3 +1,4 @@
 <?php
 
-$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadata', 'Set metadata attributes for files and folders');
\ No newline at end of file
+$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadata', 'Set metadata attributes for files and folders');
+
diff --git a/contao/languages/en/tl_metafields.php b/contao/languages/en/tl_metafields.php
index 5998c15..ce14edf 100644
--- a/contao/languages/en/tl_metafields.php
+++ b/contao/languages/en/tl_metafields.php
@@ -5,3 +5,5 @@
 $GLOBALS['TL_LANG']['tl_metafields']['extensions']  = array('Extensions', 'Extensions');
 
 
+
+
diff --git a/contao/languages/en/tl_settings.php b/contao/languages/en/tl_settings.php
deleted file mode 100644
index ad577f6..0000000
--- a/contao/languages/en/tl_settings.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$GLOBALS['TL_LANG']['tl_settings']['additional_metafields_legend']    = 'File meta information';
-$GLOBALS['TL_LANG']['tl_settings']['additional_metafields_exts']      = array('File types', 'Comma separated list of file types that should show the extra fields.');
diff --git a/contao/models/MetafieldsModel.php b/contao/models/MetafieldsModel.php
index febca7b..d7fadba 100644
--- a/contao/models/MetafieldsModel.php
+++ b/contao/models/MetafieldsModel.php
@@ -14,11 +14,6 @@
  */
 
 
-/**
- * Run in a custom namespace, so the class can be replaced
- */
-namespace AdditionalMetafields;
-
 /**
  * Class MetafieldsModel
  *
diff --git a/contao/widgets/MetaWizardPlus.php b/contao/widgets/MetaWizardPlus.php
index 64ad3bb..154b2a3 100644
--- a/contao/widgets/MetaWizardPlus.php
+++ b/contao/widgets/MetaWizardPlus.php
@@ -13,8 +13,6 @@
  * @filesource
  */
 
-namespace AdditionalMetafields;
-
 /**
  * Class MetaWizardPlus
  *