diff --git a/Admin/Activate.php b/Admin/Activate.php
index bb5ea41..6e625ca 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 759ec23..ce804cf 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 cd0313f..c34642f 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\Kanban
+ * @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 8506912..b1afccd 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;
 /**
  * Tasks install class.
  *
- * @category   Modules
- * @package    Modules\Tasks
+ * @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 855fd1e..ca49a33 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
@@ -21,8 +21,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 cc318f7..a559e28 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 655b5a3..4f6bb4a 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
@@ -26,8 +26,7 @@ use Modules\QA\Models\QABadgeMapper;
 /**
  * Task class.
  *
- * @category   Modules
- * @package    Modules\QA
+ * @package    Modules
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QAAnswer.php b/Models/QAAnswer.php
index 668531e..372937f 100644
--- a/Models/QAAnswer.php
+++ b/Models/QAAnswer.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\QA\Models;
 /**
  * Answer class.
  *
- * @category   QA
- * @package    Modules
+ * @package    QA
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QAAnswerMapper.php b/Models/QAAnswerMapper.php
index 67c2c0b..2b8460d 100644
--- a/Models/QAAnswerMapper.php
+++ b/Models/QAAnswerMapper.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\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @category   QA
- * @package    Modules
+ * @package    QA
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QAAnswerStatus.php b/Models/QAAnswerStatus.php
index 1b008b0..d8b49ed 100644
--- a/Models/QAAnswerStatus.php
+++ b/Models/QAAnswerStatus.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;
 /**
  * QA answer status enum.
  *
- * @category   QA
- * @package    Modules
+ * @package    QA
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QABadge.php b/Models/QABadge.php
index a6c9b88..86865a4 100644
--- a/Models/QABadge.php
+++ b/Models/QABadge.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\QA\Models;
 /**
  * Task class.
  *
- * @category   Kanban
- * @package    Modules
+ * @package    Kanban
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QABadgeMapper.php b/Models/QABadgeMapper.php
index 29e5704..9b2617a 100644
--- a/Models/QABadgeMapper.php
+++ b/Models/QABadgeMapper.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\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @category   QA
- * @package    Modules
+ * @package    QA
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QACategory.php b/Models/QACategory.php
index 6b92f92..5fad236 100644
--- a/Models/QACategory.php
+++ b/Models/QACategory.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\QA\Models;
 /**
  * Task class.
  *
- * @category   Kanban
- * @package    Modules
+ * @package    Kanban
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QACategoryMapper.php b/Models/QACategoryMapper.php
index 5cbdfe1..ce19b8f 100644
--- a/Models/QACategoryMapper.php
+++ b/Models/QACategoryMapper.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\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @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/QAQuestion.php b/Models/QAQuestion.php
index 4e8e325..c665217 100644
--- a/Models/QAQuestion.php
+++ b/Models/QAQuestion.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\QA\Models;
 /**
  * Task class.
  *
- * @category   Kanban
- * @package    Modules
+ * @package    Kanban
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php
index 734e8a0..e19ae94 100644
--- a/Models/QAQuestionMapper.php
+++ b/Models/QAQuestionMapper.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\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @category   QA
- * @package    Modules
+ * @package    QA
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/QAQuestionStatus.php b/Models/QAQuestionStatus.php
index 399d05c..5937861 100644
--- a/Models/QAQuestionStatus.php
+++ b/Models/QAQuestionStatus.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 status enum.
  *
- * @category   QA
- * @package    Modules
+ * @package    QA
  * @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 69689f7..de6aba4 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/en.lang.php b/Theme/Backend/Lang/en.lang.php
index c97a06f..c8afd7c 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/qa-tag-edit.tpl.php b/Theme/Backend/qa-tag-edit.tpl.php
index 32d66d8..6b7d306 100644
--- a/Theme/Backend/qa-tag-edit.tpl.php
+++ b/Theme/Backend/qa-tag-edit.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/qa-tag-list.tpl.php b/Theme/Backend/qa-tag-list.tpl.php
index 7ded8d7..3aaa921 100644
--- a/Theme/Backend/qa-tag-list.tpl.php
+++ b/Theme/Backend/qa-tag-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