diff --git a/Models/Account.php b/Models/Account.php
index 1bc8ca3..42bfbe8 100644
--- a/Models/Account.php
+++ b/Models/Account.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
 /**
  * Account class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index 2075a82..732e86f 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Account mapper class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/AccountPermission.php b/Models/AccountPermission.php
index 00fac4d..079afb1 100644
--- a/Models/AccountPermission.php
+++ b/Models/AccountPermission.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -22,7 +22,7 @@ use phpOMS\Account\PermissionType;
  *
  * A single permission for an account consisting of read, create, modify, delete and permission flags.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php
index d255876..497b069 100644
--- a/Models/AccountPermissionMapper.php
+++ b/Models/AccountPermissionMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
 /**
  * Account permission mapper class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/Group.php b/Models/Group.php
index ad5d7ed..49359d8 100644
--- a/Models/Group.php
+++ b/Models/Group.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
 /**
  * Account group class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
@@ -27,10 +27,10 @@ class Group extends \phpOMS\Account\Group
     /**
      * Created at.
      *
-     * @var   null|\DateTime
+     * @var   \DateTime
      * @since 1.0.0
      */
-    protected ?\DateTime $createdAt = null;
+    protected \DateTime $createdAt;
 
     /**
      * Created by.
diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php
index 2e27bd3..49b2616 100644
--- a/Models/GroupMapper.php
+++ b/Models/GroupMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
 /**
  * Group mapper class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/GroupPermission.php b/Models/GroupPermission.php
index fbe6736..2e2d898 100644
--- a/Models/GroupPermission.php
+++ b/Models/GroupPermission.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -22,7 +22,7 @@ use phpOMS\Account\PermissionType;
  *
  * A single permission for a group consisting of read, create, modify, delete and permission flags.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php
index ae95410..6d54483 100644
--- a/Models/GroupPermissionMapper.php
+++ b/Models/GroupPermissionMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
 /**
  * Group permission mapper class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/Module.php b/Models/Module.php
index a2968bb..9c633cc 100644
--- a/Models/Module.php
+++ b/Models/Module.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Module\ModuleStatus;
 /**
  * Module class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
@@ -62,10 +62,10 @@ class Module
     /**
      * Created at.
      *
-     * @var   null|\DateTime
+     * @var   \DateTime
      * @since 1.0.0
      */
-    protected ?\DateTime $createdAt = null;
+    protected \DateTime $createdAt;
 
     /**
      * Constructor.
diff --git a/Models/ModuleMapper.php b/Models/ModuleMapper.php
index 1f75a7c..252dc78 100644
--- a/Models/ModuleMapper.php
+++ b/Models/ModuleMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
 /**
  * Module mapper class.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/ModuleStatusUpdateType.php b/Models/ModuleStatusUpdateType.php
index 55c9e65..b7174dc 100644
--- a/Models/ModuleStatusUpdateType.php
+++ b/Models/ModuleStatusUpdateType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Permision state enum.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/NullAccount.php b/Models/NullAccount.php
index 1fefbf4..427a6bc 100644
--- a/Models/NullAccount.php
+++ b/Models/NullAccount.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
 /**
  * Null model
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/NullAccountPermission.php b/Models/NullAccountPermission.php
index fb9acfa..3057102 100644
--- a/Models/NullAccountPermission.php
+++ b/Models/NullAccountPermission.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
 /**
  * Null model
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/NullGroup.php b/Models/NullGroup.php
index c8d531f..450d062 100644
--- a/Models/NullGroup.php
+++ b/Models/NullGroup.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
 /**
  * Null model
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/NullGroupPermission.php b/Models/NullGroupPermission.php
index 55afbe0..cbba571 100644
--- a/Models/NullGroupPermission.php
+++ b/Models/NullGroupPermission.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
 /**
  * Null model
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index edf571c..4314814 100644
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.4
  *
- * @package   Modules\Admin
+ * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Permision state enum.
  *
- * @package Modules\Admin
+ * @package Modules\Admin\Models
  * @license OMS License 1.0
  * @link    https://orange-management.org
  * @since   1.0.0