diff --git a/Admin/Activate.php b/Admin/Activate.php
index b0d69d3..f4f631e 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 115c58d..09c57e0 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 d6714e3..48c3397 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/InstallType.php b/Admin/InstallType.php
index 81dc41c..f1fdc00 100644
--- a/Admin/InstallType.php
+++ b/Admin/InstallType.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;
 /**
  * Tag type enum.
  *
- * @category   Framework
- * @package    phpOMS\Html
+ * @package    Framework
  * @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 07b0c55..223573b 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;
 /**
  * Admin install 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/Uninstall.php b/Admin/Uninstall.php
index 6597fc4..f67d663 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 746275e..e3eb039 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 60c8313..1b31672 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
@@ -42,8 +42,7 @@ use Modules\Admin\Models\PermissionState;
  * 
  * This class is responsible for the basic admin activities such as managing accounts, groups, permissions and modules.
  *
- * @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/Models/Account.php b/Models/Account.php
index c136171..bff4a05 100644
--- a/Models/Account.php
+++ b/Models/Account.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
@@ -16,8 +16,7 @@ namespace Modules\Admin\Models;
 /**
  * Account 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/Models/AccountMapper.php b/Models/AccountMapper.php
index da77f2a..e41ce01 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.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/AccountPermission.php b/Models/AccountPermission.php
index df59141..1c520b1 100644
--- a/Models/AccountPermission.php
+++ b/Models/AccountPermission.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\Account\PermissionAbstract;
  *
  * Handling the info files for modules
  *
- * @category   Framework
- * @package    phpOMS\Module
+ * @package    Framework
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php
index af7be30..0215192 100644
--- a/Models/AccountPermissionMapper.php
+++ b/Models/AccountPermissionMapper.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/Group.php b/Models/Group.php
index 7caca04..f479114 100644
--- a/Models/Group.php
+++ b/Models/Group.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
@@ -16,8 +16,7 @@ namespace Modules\Admin\Models;
 /**
  * Account group class.
  *
- * @category   Framework
- * @package    phpOMS\Account
+ * @package    Framework
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php
index ba3f1e4..891ee40 100644
--- a/Models/GroupMapper.php
+++ b/Models/GroupMapper.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/GroupPermission.php b/Models/GroupPermission.php
index 1559cbb..91eef01 100644
--- a/Models/GroupPermission.php
+++ b/Models/GroupPermission.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\Account\PermissionAbstract;
  *
  * Handling the info files for modules
  *
- * @category   Framework
- * @package    phpOMS\Module
+ * @package    Framework
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php
index 88089d6..81e3c74 100644
--- a/Models/GroupPermissionMapper.php
+++ b/Models/GroupPermissionMapper.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/Module.php b/Models/Module.php
index 35939d8..dd6d408 100644
--- a/Models/Module.php
+++ b/Models/Module.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\Module\ModuleStatus;
 /**
  * Account group class.
  *
- * @category   Framework
- * @package    phpOMS\Account
+ * @package    Framework
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/ModuleMapper.php b/Models/ModuleMapper.php
index ace6ea1..58eba71 100644
--- a/Models/ModuleMapper.php
+++ b/Models/ModuleMapper.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/NullAccount.php b/Models/NullAccount.php
index 27aa29f..4f719b5 100644
--- a/Models/NullAccount.php
+++ b/Models/NullAccount.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/NullAccountPermission.php b/Models/NullAccountPermission.php
index 019f903..38926d4 100644
--- a/Models/NullAccountPermission.php
+++ b/Models/NullAccountPermission.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/NullGroup.php b/Models/NullGroup.php
index 81ea51f..dc07788 100644
--- a/Models/NullGroup.php
+++ b/Models/NullGroup.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/NullGroupPermission.php b/Models/NullGroupPermission.php
index fe770cc..24ccbe7 100644
--- a/Models/NullGroupPermission.php
+++ b/Models/NullGroupPermission.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 b717bd9..f4dc991 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/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 7a9bdc7..42e48db 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 04e1f34..ee0196d 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 4253f7a..a29005a 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/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index be2df29..a9c613d 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-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/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index d9851fe..befd9c0 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-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
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index cc3533d..24161f1 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.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/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 1c8e95b..bca2d6d 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-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/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index 45469bb..cd156eb 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-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
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index 5b0f0d8..2f4a85e 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.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/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 6ca8267..f615a07 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-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
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index 0442ff4..38517f7 100644
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.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/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index c361bcd..eb74935 100644
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.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