diff --git a/Admin/Activate.php b/Admin/Activate.php
index 09fa26a..ce552ff 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,8 +20,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Navigation class.
  *
- * @category   Modules
- * @package    Modules\Admin
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 3668571..258065b 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,8 +20,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Navigation class.
  *
- * @category   Modules
- * @package    Modules\Admin
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 18b91fa..4ae3476 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,8 +17,7 @@ use phpOMS\DataStorage\Database\DatabasePool;
 /**
  * Navigation class.
  *
- * @category   Modules
- * @package    Modules\Admin
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 1563aa2..330ccbf 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,8 +21,7 @@ use phpOMS\Module\InstallerAbstract;
 /**
  * Editor install class.
  *
- * @category   Modules
- * @package    Modules\Editor
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index d0a8a1f..81a7696 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,8 +20,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Navigation class.
  *
- * @category   Modules
- * @package    Modules\Admin
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Update.php b/Admin/Update.php
index cabd1d2..0af77be 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,8 +22,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Navigation class.
  *
- * @category   Modules
- * @package    Modules\Admin
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Controller.php b/Controller.php
index 54cd70b..e79e41d 100644
--- a/Controller.php
+++ b/Controller.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -32,8 +32,7 @@ use phpOMS\Message\Http\RequestStatusCode;
 /**
  * Calendar controller class.
  *
- * @category   Modules
- * @package    Editor
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/EditorDoc.php b/Models/EditorDoc.php
index 83c4256..88ae8bd 100644
--- a/Models/EditorDoc.php
+++ b/Models/EditorDoc.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -18,8 +18,7 @@ use phpOMS\Contract\ArrayableInterface;
 /**
  * News article class.
  *
- * @category   Module
- * @package    Framework
+ * @package    Module
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/EditorDocMapper.php b/Models/EditorDocMapper.php
index 0c07c9f..d8f619f 100644
--- a/Models/EditorDocMapper.php
+++ b/Models/EditorDocMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index fe9cf52..e6b6ada 100644
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,8 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Permision state enum.
  *
- * @category   Tasks
- * @package    Modules
+ * @package    Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Theme/Backend/Components/Editor/BaseView.php b/Theme/Backend/Components/Editor/BaseView.php
index 83dffe7..cc143d2 100644
--- a/Theme/Backend/Components/Editor/BaseView.php
+++ b/Theme/Backend/Components/Editor/BaseView.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/Components/Editor/TextView.php b/Theme/Backend/Components/Editor/TextView.php
index 6b874a8..8987c2e 100644
--- a/Theme/Backend/Components/Editor/TextView.php
+++ b/Theme/Backend/Components/Editor/TextView.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 2afa375..99086d7 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index d1c102b..c64b032 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.en.lang.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index ae10f2e..342457f 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/editor-create.tpl.php b/Theme/Backend/editor-create.tpl.php
index 9f53b14..035d659 100644
--- a/Theme/Backend/editor-create.tpl.php
+++ b/Theme/Backend/editor-create.tpl.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/editor-list.tpl.php b/Theme/Backend/editor-list.tpl.php
index 01145b3..4e7c4fe 100644
--- a/Theme/Backend/editor-list.tpl.php
+++ b/Theme/Backend/editor-list.tpl.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @category   TBD
+ * @package    TBD
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0