diff --git a/Controller.php b/Controller.php
index f9aad35..a2ab2f9 100644
--- a/Controller.php
+++ b/Controller.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace Modules\Tasks;
 
 use Model\Message\FormValidation;
+
 use Modules\Tasks\Models\Task;
 use Modules\Tasks\Models\TaskElement;
 use Modules\Tasks\Models\TaskElementMapper;
@@ -21,6 +22,7 @@ use Modules\Tasks\Models\TaskMapper;
 use Modules\Tasks\Models\TaskStatus;
 use Modules\Tasks\Models\TaskType;
 use Modules\Tasks\Models\PermissionState;
+
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
@@ -34,7 +36,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Task class.
  *
- * @package    Modules
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/NullTask.php b/Models/NullTask.php
index aa2d606..2e64dd3 100644
--- a/Models/NullTask.php
+++ b/Models/NullTask.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -13,12 +13,10 @@
 declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
-
-
 /**
- * Task class.
+ * Null model
  *
- * @package    Modules
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/NullTaskElement.php b/Models/NullTaskElement.php
index 5a93b7e..6275bf6 100644
--- a/Models/NullTaskElement.php
+++ b/Models/NullTaskElement.php
@@ -13,12 +13,10 @@
 declare(strict_types = 1);
 namespace Modules\Tasks\Models;
 
-
-
 /**
- * Task class.
+ * Null model
  *
- * @package    Modules
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index 11893e5..3397e4f 100644
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -16,9 +16,9 @@ namespace Modules\Tasks\Models;
 use phpOMS\Stdlib\Base\Enum;
 
 /**
- * Task priority enum.
+ * Permision state enum.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/Stats.php b/Models/Stats.php
deleted file mode 100644
index e69de29..0000000
diff --git a/Models/Task.php b/Models/Task.php
index 9d9b039..08aaf60 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -12,13 +12,14 @@
  */
 declare(strict_types = 1);
 namespace Modules\Tasks\Models;
+
 use Modules\Calendar\Models\Schedule;
 use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 
 /**
  * Task class.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index 7c3b133..cfab366 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 /**
  * Task class.
  *
- * @package    Modules
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index 7c93e65..65dcc96 100644
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index 7b575f3..d47e68f 100644
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskPriority.php b/Models/TaskPriority.php
index 90725e4..f4fa3ec 100644
--- a/Models/TaskPriority.php
+++ b/Models/TaskPriority.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -18,7 +18,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Task priority enum.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskStatus.php b/Models/TaskStatus.php
index b5156a3..493c2ec 100644
--- a/Models/TaskStatus.php
+++ b/Models/TaskStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -18,7 +18,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Task status enum.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
@@ -26,12 +26,8 @@ use phpOMS\Stdlib\Base\Enum;
 abstract class TaskStatus extends Enum
 {
     /* public */ const OPEN = 1;
-
     /* public */ const WORKING = 2;
-
     /* public */ const SUSPENDED = 3;
-
     /* public */ const CANCELED = 4;
-
     /* public */ const DONE = 5;
 }
diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php
index 76fdbc6..85d4572 100644
--- a/Models/TaskTemplate.php
+++ b/Models/TaskTemplate.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -16,7 +16,7 @@ namespace Modules\Tasks\Models;
 /**
  * Task class.
  *
- * @package    Modules
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskType.php b/Models/TaskType.php
index 962db29..72ddd33 100644
--- a/Models/TaskType.php
+++ b/Models/TaskType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -18,7 +18,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Task type enum.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/TaskVisibility.php b/Models/TaskVisibility.php
index f35a8ef..875f6a4 100644
--- a/Models/TaskVisibility.php
+++ b/Models/TaskVisibility.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    Modules\Tasks
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -16,9 +16,9 @@ namespace Modules\Tasks\Models;
 use phpOMS\Stdlib\Base\Enum;
 
 /**
- * Task status enum.
+ * Task visibility enum.
  *
- * @package    Tasks
+ * @package    Modules\Tasks
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0