diff --git a/application/src/DBAL/Types/LanguageType.php b/application/src/DBAL/Types/LanguageType.php
new file mode 100644
index 0000000..5350ae2
--- /dev/null
+++ b/application/src/DBAL/Types/LanguageType.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\DBAL\Types;
+
+use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
+
+/**
+ * Containes all activated languages.
+ *
+ * @author kevinfrantz
+ */
+final class LanguageType extends AbstractEnumType
+{
+    public const GERMAN = 'de';
+
+    public const ENGLISH = 'en';
+
+    public const DUTCH = 'nl';
+
+    public const SPANISH = 'es';
+
+    public const ESPERANTO = 'eo';
+
+    protected static $choices = [
+        self::GERMAN => 'German',
+        self::ENGLISH => 'English',
+        self::SPANISH => 'Spanish',
+        self::ESPERANTO => 'Esperanto',
+        self::DUTCH => 'Dutch',
+    ];
+}
diff --git a/application/src/DBAL/Types/MenuEventType.php b/application/src/DBAL/Types/MenuEventType.php
index eec69b1..86b633a 100644
--- a/application/src/DBAL/Types/MenuEventType.php
+++ b/application/src/DBAL/Types/MenuEventType.php
@@ -8,6 +8,8 @@ use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
  * Not integrated in the db. Just used for mapping.
  * May it will be helpfull for tracking ;).
  *
+ * @deprecated this class doesn't make sense here. Find an other place for it
+ *
  * @author kevinfrantz
  */
 final class MenuEventType extends AbstractEnumType
diff --git a/application/src/DBAL/Types/Meta/Right/CRUDType.php b/application/src/DBAL/Types/Meta/Right/CRUDType.php
new file mode 100644
index 0000000..a76acd2
--- /dev/null
+++ b/application/src/DBAL/Types/Meta/Right/CRUDType.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\DBAL\Types\Meta\Right;
+
+use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
+
+/**
+ * @author kevinfrantz
+ */
+final class CRUDType extends AbstractEnumType
+{
+    public const CREATE = 'create';
+
+    public const READ = 'read';
+
+    public const UPDATE = 'update';
+
+    public const DELETE = 'delete';
+
+    protected static $choices = [
+        self::CREATE => 'create',
+        self::READ => 'read',
+        self::UPDATE => 'update',
+        self::DELETE => 'delete',
+    ];
+}
diff --git a/application/src/DBAL/Types/LayerType.php b/application/src/DBAL/Types/Meta/Right/LayerType.php
similarity index 85%
rename from application/src/DBAL/Types/LayerType.php
rename to application/src/DBAL/Types/Meta/Right/LayerType.php
index 4ccc7da..911f859 100644
--- a/application/src/DBAL/Types/LayerType.php
+++ b/application/src/DBAL/Types/Meta/Right/LayerType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\DBAL\Types;
+namespace App\DBAL\Types\Meta;
 
 use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
 
@@ -15,6 +15,8 @@ final class LayerType extends AbstractEnumType
 
     public const LAW = 'law';
 
+    public const MEMBER = 'member';
+
     protected static $choices = [
         self::RELATION => 'relation',
         self::LAW => 'law',
diff --git a/application/src/DBAL/Types/TemplateType.php b/application/src/DBAL/Types/RESTResponseType.php
similarity index 76%
rename from application/src/DBAL/Types/TemplateType.php
rename to application/src/DBAL/Types/RESTResponseType.php
index d089b51..cd1c12b 100644
--- a/application/src/DBAL/Types/TemplateType.php
+++ b/application/src/DBAL/Types/RESTResponseType.php
@@ -9,14 +9,17 @@ use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
  *
  * @author kevinfrantz
  */
-final class TemplateType extends AbstractEnumType
+final class RESTResponseType extends AbstractEnumType
 {
     public const JSON = 'json';
 
     public const HTML = 'html';
 
+    public const XML = 'xml';
+
     protected static $choices = [
         self::JSON => 'json',
         self::HTML => 'html',
+        self::XML => 'xml',
     ];
 }
diff --git a/application/src/DBAL/Types/RightType.php b/application/src/DBAL/Types/RightType.php
deleted file mode 100644
index 01fd0c3..0000000
--- a/application/src/DBAL/Types/RightType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\DBAL\Types;
-
-use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
-
-/**
- * @author kevinfrantz
- */
-final class RightType extends AbstractEnumType
-{
-    public const READ = 'read';
-
-    public const WRITE = 'write';
-
-    protected static $choices = [
-        self::READ => 'read',
-        self::WRITE => 'write',
-    ];
-}
diff --git a/application/src/DBAL/Types/SystemSlugType.php b/application/src/DBAL/Types/SystemSlugType.php
index 58c45fb..a10aa89 100644
--- a/application/src/DBAL/Types/SystemSlugType.php
+++ b/application/src/DBAL/Types/SystemSlugType.php
@@ -8,6 +8,10 @@ use Fresh\DoctrineEnumBundle\DBAL\Types\AbstractEnumType;
  * Containes the system slugs.
  *
  * @author kevinfrantz
+ *
+ * @todo Organize this somehow on an other way
+ *
+ * @deprecated
  */
 final class SystemSlugType extends AbstractEnumType
 {
diff --git a/application/tests/Integration/UrlIntegrationTest.php b/application/tests/Integration/Controller/UrlIntegrationTest.php
similarity index 100%
rename from application/tests/Integration/UrlIntegrationTest.php
rename to application/tests/Integration/Controller/UrlIntegrationTest.php