diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 1cbbd28..2a3abe6 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Admin\Install
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\DatabasePool;
 /**
  * Navigation class.
  *
- * @package    Modules
+ * @package    Modules\Calendar\Admin\Install
  * @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 ac52219..85bcae9 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Admin
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +22,7 @@ use phpOMS\Module\InstallerAbstract;
 /**
  * Calendar install class.
  *
- * @package    Modules
+ * @package    Modules\Calendar\Admin
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Status.php b/Admin/Status.php
index cd8a531..edb993d 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Admin
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Navigation class.
  *
- * @package    Modules
+ * @package    Modules\Calendar\Admin
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index ac2e8fb..a958780 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Admin
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +22,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Navigation class.
  *
- * @package    Modules
+ * @package    Modules\Calendar\Admin
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Admin/Updater.php b/Admin/Updater.php
index 2a1f87e..c896a65 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Admin
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +22,7 @@ use phpOMS\Module\InfoManager;
 /**
  * Updater class.
  *
- * @package    Modules
+ * @package    Modules\Calendar\Admin
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Controller.php b/Controller.php
index 6e85313..f48e29e 100644
--- a/Controller.php
+++ b/Controller.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -33,7 +33,7 @@ use phpOMS\Message\Http\RequestStatusCode;
 /**
  * Calendar controller class.
  *
- * @package    Modules
+ * @package    Modules\Calendar
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/AcceptStatus.php b/Models/AcceptStatus.php
index dfbc00a..2e284cb 100644
--- a/Models/AcceptStatus.php
+++ b/Models/AcceptStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Accept status enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/AvailableStatus.php b/Models/AvailableStatus.php
index ca3840e..8026068 100644
--- a/Models/AvailableStatus.php
+++ b/Models/AvailableStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Available status enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/Calendar.php b/Models/Calendar.php
index 4fb1171..e35aea1 100644
--- a/Models/Calendar.php
+++ b/Models/Calendar.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\SmartDateTime;
 /**
  * Calendar class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php
index c67394f..8e3fed4 100644
--- a/Models/CalendarMapper.php
+++ b/Models/CalendarMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/Event.php b/Models/Event.php
index a2fa235..53fe0e9 100644
--- a/Models/Event.php
+++ b/Models/Event.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\Stdlib\Base\Location;
 /**
  * Event class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/EventMapper.php b/Models/EventMapper.php
index 2f783dc..beb1803 100644
--- a/Models/EventMapper.php
+++ b/Models/EventMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/EventStatus.php b/Models/EventStatus.php
index 7fb43de..e788f5d 100644
--- a/Models/EventStatus.php
+++ b/Models/EventStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Event type enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/EventTemplate.php b/Models/EventTemplate.php
index 03fe044..bbf9fb9 100644
--- a/Models/EventTemplate.php
+++ b/Models/EventTemplate.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Calendar\Models;
 /**
  * Event template class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/EventType.php b/Models/EventType.php
index 9d37f31..8a0cc9f 100644
--- a/Models/EventType.php
+++ b/Models/EventType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Event type enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/FrequencyInterval.php b/Models/FrequencyInterval.php
index af7f784..1d2298a 100644
--- a/Models/FrequencyInterval.php
+++ b/Models/FrequencyInterval.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Frequency interval type enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/FrequencyRelative.php b/Models/FrequencyRelative.php
index 354d55c..29fdc2a 100644
--- a/Models/FrequencyRelative.php
+++ b/Models/FrequencyRelative.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Frequency relative type enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/FrequencyType.php b/Models/FrequencyType.php
index a86914e..3f3f72b 100644
--- a/Models/FrequencyType.php
+++ b/Models/FrequencyType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Frequency type enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/IntervalType.php b/Models/IntervalType.php
index 66904e5..f5b29f9 100644
--- a/Models/IntervalType.php
+++ b/Models/IntervalType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Interval type type enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/NullCalendar.php b/Models/NullCalendar.php
index 101d4dc..faa2f9a 100644
--- a/Models/NullCalendar.php
+++ b/Models/NullCalendar.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Calendar\Models;
 /**
  * Calendar class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/NullEvent.php b/Models/NullEvent.php
index 63e67f2..dfa9b79 100644
--- a/Models/NullEvent.php
+++ b/Models/NullEvent.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Calendar\Models;
 /**
  * Null event class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/NullSchedule.php b/Models/NullSchedule.php
index 907e0df..b634c08 100644
--- a/Models/NullSchedule.php
+++ b/Models/NullSchedule.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace Modules\Calendar\Models;
 /**
  * Schedule class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/Schedule.php b/Models/Schedule.php
index 92da282..f1363ab 100644
--- a/Models/Schedule.php
+++ b/Models/Schedule.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 /**
  * Schedule class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/ScheduleMapper.php b/Models/ScheduleMapper.php
index 104644e..aaea3bf 100644
--- a/Models/ScheduleMapper.php
+++ b/Models/ScheduleMapper.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\RelationType;
 /**
  * Mapper class.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Models/ScheduleStatus.php b/Models/ScheduleStatus.php
index d381dae..6629b45 100644
--- a/Models/ScheduleStatus.php
+++ b/Models/ScheduleStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.2
  *
- * @package    TBD
+ * @package    Modules\Calendar\Models
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Schedule status enum.
  *
- * @package    Calendar
+ * @package    Modules\Calendar\Models
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0