diff --git a/Admin/Activate.php b/Admin/Activate.php
index 0a99cbe..005bdd5 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 f3abe05..c7fb44a 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 8426317..5147beb 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 4dd5b10..9b02f95 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;
 /**
  * Project Management install class.
  *
- * @category   Modules
- * @package    Modules\ProjectManagement
+ * @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 05de7a6..13b1dbf 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 e8770de..7c0077a 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 df48f01..d44c74b 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
@@ -28,8 +28,7 @@ use phpOMS\Asset\AssetType;
 /**
  * Event Management controller class.
  *
- * @category   Modules
- * @package    Modules\ProjectManagement
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/ProgressType.php b/Models/ProgressType.php
index 18b727f..8a79c79 100644
--- a/Models/ProgressType.php
+++ b/Models/ProgressType.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\Stdlib\Base\Enum;
 /**
  * Task type 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/Models/Project.php b/Models/Project.php
index 758c988..fe0f931 100644
--- a/Models/Project.php
+++ b/Models/Project.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\Localization\Money;
 /**
  * Project class.
  *
- * @category   ProjectManager
- * @package    Framework
+ * @package    ProjectManager
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 6b0b0f6..e779555 100644
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.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
@@ -24,8 +24,7 @@ use Modules\Media\Models\MediaMapper;
 /**
  * Mapper class.
  *
- * @category   Calendar
- * @package    Modules
+ * @package    Calendar
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/ProjectResponsibility.php b/Models/ProjectResponsibility.php
index a8df650..3a71c29 100644
--- a/Models/ProjectResponsibility.php
+++ b/Models/ProjectResponsibility.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\Stdlib\Base\Enum;
 /**
  * Task type 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/Models/ProjectStatus.php b/Models/ProjectStatus.php
index 37605ea..c2aae91 100644
--- a/Models/ProjectStatus.php
+++ b/Models/ProjectStatus.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\Stdlib\Base\Enum;
 /**
  * Task type 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 a62db86..d8fa55b 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 1201264..c545595 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 e0fcbf4..33c0114 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/projectmanagement-create.tpl.php b/Theme/Backend/projectmanagement-create.tpl.php
index e39a4a1..d4914ed 100644
--- a/Theme/Backend/projectmanagement-create.tpl.php
+++ b/Theme/Backend/projectmanagement-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/projectmanagement-list.tpl.php b/Theme/Backend/projectmanagement-list.tpl.php
index e78e7d3..ae35ff5 100644
--- a/Theme/Backend/projectmanagement-list.tpl.php
+++ b/Theme/Backend/projectmanagement-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/projectmanagement-profile.tpl.php b/Theme/Backend/projectmanagement-profile.tpl.php
index 899ab4a..c1260f3 100644
--- a/Theme/Backend/projectmanagement-profile.tpl.php
+++ b/Theme/Backend/projectmanagement-profile.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