diff --git a/src/Netzmacht/Contao/Leaflet/LeafletMapElement.php b/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
similarity index 94%
rename from src/Netzmacht/Contao/Leaflet/LeafletMapElement.php
rename to src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
index deaa61c..12672a4 100644
--- a/src/Netzmacht/Contao/Leaflet/LeafletMapElement.php
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
@@ -9,15 +9,16 @@
  *
  */
 
-namespace Netzmacht\Contao\Leaflet;
+namespace Netzmacht\Contao\Leaflet\Frontend;
 
-use Netzmacht\Contao\Leaflet\Mapper\MapMapper;
+use ContentElement;
+use Netzmacht\Contao\Leaflet\MapService;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
 
 /**
  * @property int leaflet_map
  */
-class LeafletMapElement extends \ContentElement
+class MapElement extends \ContentElement
 {
     /**
      * Template name.
diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php b/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php
new file mode 100644
index 0000000..8eca10b
--- /dev/null
+++ b/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @package    dev
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2015 netzmacht creative David Molineus
+ * @license    LGPL 3.0
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\Frontend;
+
+
+class MapModule
+{
+
+}