diff --git a/Account/Account.php b/Account/Account.php
index ec3385b4a..65cf019a8 100644
--- a/Account/Account.php
+++ b/Account/Account.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +25,7 @@ use phpOMS\Validation\Network\Email;
  * The account class is the base model for accounts. This model contains the most common account 
  * information. This model is not comparable to a profile which contains much more information. 
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/AccountManager.php b/Account/AccountManager.php
index 23e685f57..c7a464f4b 100644
--- a/Account/AccountManager.php
+++ b/Account/AccountManager.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Session\SessionInterface;
  * 
  * The account manager is used to manage multiple accounts. 
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/AccountStatus.php b/Account/AccountStatus.php
index 80106439e..b152ef3c7 100644
--- a/Account/AccountStatus.php
+++ b/Account/AccountStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Account status enum.
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/AccountType.php b/Account/AccountType.php
index 4651e53a2..c299d4cf0 100644
--- a/Account/AccountType.php
+++ b/Account/AccountType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Account type enum.
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/Group.php b/Account/Group.php
index 05dd661a5..62e8a9600 100644
--- a/Account/Group.php
+++ b/Account/Group.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Contract\ArrayableInterface;
 /**
  * Account group class.
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/GroupStatus.php b/Account/GroupStatus.php
index d6b478ee0..566fa1bea 100644
--- a/Account/GroupStatus.php
+++ b/Account/GroupStatus.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @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    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/NullAccount.php b/Account/NullAccount.php
index e1ed14fb4..af897696a 100644
--- a/Account/NullAccount.php
+++ b/Account/NullAccount.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Account;
 /**
  * Null account class.
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/PermissionAbstract.php b/Account/PermissionAbstract.php
index 51c9a0729..1277f016e 100644
--- a/Account/PermissionAbstract.php
+++ b/Account/PermissionAbstract.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +20,7 @@ namespace phpOMS\Account;
  * This permission abstract is the basis for all permissions. Contrary to it's name it is not an
  * abstract class and can be used directly if needed.
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Account/PermissionType.php b/Account/PermissionType.php
index cb22fcab6..0845ac1e9 100644
--- a/Account/PermissionType.php
+++ b/Account/PermissionType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Permission type enum.
  *
- * @package    Framework
+ * @package    phpOMS\Account
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Asset/AssetManager.php b/Asset/AssetManager.php
index 26c8726d9..b415d4f23 100644
--- a/Asset/AssetManager.php
+++ b/Asset/AssetManager.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Asset
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Asset;
 /**
  * Asset manager class.
  *
- * @package    Framework
+ * @package    phpOMS\Asset
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Asset/AssetType.php b/Asset/AssetType.php
index 92f2675f0..39a4968b7 100644
--- a/Asset/AssetType.php
+++ b/Asset/AssetType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Asset
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Asset types enum.
  *
- * @package    Framework
+ * @package    phpOMS\Asset
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Auth/Auth.php b/Auth/Auth.php
index d277f7723..82e60cfd4 100644
--- a/Auth/Auth.php
+++ b/Auth/Auth.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Auth
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\DataStorage\Session\SessionInterface;
  *
  * Responsible for authenticating and initializing the connection
  *
- * @package    Framework
+ * @package    phpOMS\Auth
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Auth/LoginReturnType.php b/Auth/LoginReturnType.php
index 77c34b686..fe7f4062b 100644
--- a/Auth/LoginReturnType.php
+++ b/Auth/LoginReturnType.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Auth
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\Stdlib\Base\Enum;
  *
  * These are possible answers to authentications.
  *
- * @package    Framework
+ * @package    phpOMS\Auth
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Finance/Depreciation.php b/Business/Finance/Depreciation.php
index ddd668178..4cb20004a 100644
--- a/Business/Finance/Depreciation.php
+++ b/Business/Finance/Depreciation.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Business\Finance
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Business/Finance/FinanceFormulas.php b/Business/Finance/FinanceFormulas.php
index 9c75de654..509f6e04f 100644
--- a/Business/Finance/FinanceFormulas.php
+++ b/Business/Finance/FinanceFormulas.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException;
 /**
  * Finance class.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Finance/Loan.php b/Business/Finance/Loan.php
index 6428de5e0..2c81dbc97 100644
--- a/Business/Finance/Loan.php
+++ b/Business/Finance/Loan.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Business\Finance;
 /**
  * Finance class.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Finance/Lorenzkurve.php b/Business/Finance/Lorenzkurve.php
index 34e473f25..7b6dc4262 100644
--- a/Business/Finance/Lorenzkurve.php
+++ b/Business/Finance/Lorenzkurve.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Business\Finance;
 /**
  * Finance class.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Finance/StockBonds.php b/Business/Finance/StockBonds.php
index 639af5ccb..5b54db9f3 100644
--- a/Business/Finance/StockBonds.php
+++ b/Business/Finance/StockBonds.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Business\Finance;
 /**
  * Finance class.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Finance
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Marketing/Metrics.php b/Business/Marketing/Metrics.php
index 39f951976..a0a269a74 100644
--- a/Business/Marketing/Metrics.php
+++ b/Business/Marketing/Metrics.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Marketing
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Business\Marketing;
  * 
  * This class provided basic marketing metric calculations
  *
- * @package    Framework
+ * @package    phpOMS\Business\Marketing
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
@@ -28,6 +28,8 @@ class Metrics {
     /**
      * Calculate customer retention
      * 
+     * @latex  r = \frac{ce - cn}{cs}
+     * 
      * @param int $ce Customer at the end of the period
      * @param int $cn New customers during period
      * @param int $cs Customers at the start of the period
diff --git a/Business/Marketing/NetPromoterScore.php b/Business/Marketing/NetPromoterScore.php
index c1bca88f8..ac39aace3 100644
--- a/Business/Marketing/NetPromoterScore.php
+++ b/Business/Marketing/NetPromoterScore.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Marketing
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +20,7 @@ namespace phpOMS\Business\Marketing;
  * The net promoter score is a basic evaluation of the happiness of customers. 
  * Instead of customers the NPS can also be transferred to non-customers.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Marketing
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Programming/Metrics.php b/Business/Programming/Metrics.php
index 143d97971..298075734 100644
--- a/Business/Programming/Metrics.php
+++ b/Business/Programming/Metrics.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Business\Programming
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Business\Programming;
  * 
  * This class provides basic programming metric calculations.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Programming
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Business/Sales/MarketShareEstimation.php b/Business/Sales/MarketShareEstimation.php
index d2003a3c3..95c040d2e 100644
--- a/Business/Sales/MarketShareEstimation.php
+++ b/Business/Sales/MarketShareEstimation.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Business\Sales
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +20,7 @@ namespace phpOMS\Business\Sales;
  * This class can be used to calculate the market share based on a rank or vice versa 
  * the rank based on a marketshare in a Zipf distributed market.
  *
- * @package    Framework
+ * @package    phpOMS\Business\Sales
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Config/OptionsTrait.php b/Config/OptionsTrait.php
index 9a782e713..df83d06fb 100644
--- a/Config/OptionsTrait.php
+++ b/Config/OptionsTrait.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Config
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Config;
 /**
  * Options trait.
  *
- * @package    Framework
+ * @package    phpOMS\Config
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Config/SettingsAbstract.php b/Config/SettingsAbstract.php
index ca0700f1e..fdfd28497 100644
--- a/Config/SettingsAbstract.php
+++ b/Config/SettingsAbstract.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Config
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Query\Builder;
  *
  * Responsible for providing a database/cache bound settings manger
  *
- * @package    Framework
+ * @package    phpOMS\Config
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Contract/RenderableInterface.php b/Contract/RenderableInterface.php
index 67f190ed7..bb871ca83 100644
--- a/Contract/RenderableInterface.php
+++ b/Contract/RenderableInterface.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Contract
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +20,7 @@ namespace phpOMS\Contract;
  * This is primarily used for classes that provide formatted output or output,
  * that get's rendered in third party applications.
  *
- * @package    Framework
+ * @package    phpOMS\Contract
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Dispatcher/Dispatcher.php b/Dispatcher/Dispatcher.php
index 6bc2aa7e2..bb4ed0364 100644
--- a/Dispatcher/Dispatcher.php
+++ b/Dispatcher/Dispatcher.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Dispatcher
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\System\File\PathException;
 /**
  * Dispatcher class.
  *
- * @package    Framework
+ * @package    phpOMS\Dispatcher
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Event/EventManager.php b/Event/EventManager.php
index 6229c8265..cdd443c8e 100644
--- a/Event/EventManager.php
+++ b/Event/EventManager.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Event
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Event;
 /**
  * EventManager class.
  *
- * @package    Framework
+ * @package    phpOMS\Event
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Log/LogLevel.php b/Log/LogLevel.php
index e5ae12e5b..4c75f9182 100644
--- a/Log/LogLevel.php
+++ b/Log/LogLevel.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Log
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Log level enum.
  *
- * @package    Framework
+ * @package    phpOMS\Log
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Log/LoggerInterface.php b/Log/LoggerInterface.php
index f4b3cbc6f..52a68d853 100644
--- a/Log/LoggerInterface.php
+++ b/Log/LoggerInterface.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Log
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Log;
 /**
  * Logging interface.
  *
- * @package    Framework
+ * @package    phpOMS\Log
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Router/RouteVerb.php b/Router/RouteVerb.php
index 262402aff..cc2c2e2a4 100644
--- a/Router/RouteVerb.php
+++ b/Router/RouteVerb.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Router
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Route verb enum.
  *
- * @package    Framework
+ * @package    phpOMS\Router
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Router/Router.php b/Router/Router.php
index ebd9d686f..ab2e5ce65 100644
--- a/Router/Router.php
+++ b/Router/Router.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Router
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Message\RequestAbstract;
 /**
  * Router class.
  *
- * @package    Framework
+ * @package    phpOMS\Router
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Uri/Http.php b/Uri/Http.php
index 033a6f3d5..78fe75851 100644
--- a/Uri/Http.php
+++ b/Uri/Http.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Uri
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +21,7 @@ use phpOMS\Utils\StringUtils;
  *
  * Used in order to create and evaluate a uri
  *
- * @package    Framework
+ * @package    phpOMS\Uri
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Uri/InvalidUriException.php b/Uri/InvalidUriException.php
index 48dfb8219..4a45e37cc 100644
--- a/Uri/InvalidUriException.php
+++ b/Uri/InvalidUriException.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Uri
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Uri;
 /**
  * Uri exception.
  *
- * @package    Framework
+ * @package    phpOMS\Uri
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Uri/UriFactory.php b/Uri/UriFactory.php
index 71d59b7b4..4f1ba533a 100644
--- a/Uri/UriFactory.php
+++ b/Uri/UriFactory.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Uri
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Uri;
  *
  * Used in order to create a uri
  *
- * @package    Framework
+ * @package    phpOMS\Uri
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Uri/UriInterface.php b/Uri/UriInterface.php
index d2bb92b8c..8be075531 100644
--- a/Uri/UriInterface.php
+++ b/Uri/UriInterface.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Uri
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Uri;
 /**
  * Uri interface.
  *
- * @package    Framework
+ * @package    phpOMS\Uri
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Uri/UriScheme.php b/Uri/UriScheme.php
index 3fd8a1dca..19fb6de6b 100644
--- a/Uri/UriScheme.php
+++ b/Uri/UriScheme.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Uri
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\Stdlib\Base\Enum;
 /**
  * Uri scheme.
  *
- * @package    Framework
+ * @package    phpOMS\Uri
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/ArrayUtils.php b/Utils/ArrayUtils.php
index 75f5e45d3..74a93fd6c 100644
--- a/Utils/ArrayUtils.php
+++ b/Utils/ArrayUtils.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Utils;
 /**
  * Array utils.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/ColorUtils.php b/Utils/ColorUtils.php
index 0a46ca142..59aef46bc 100644
--- a/Utils/ColorUtils.php
+++ b/Utils/ColorUtils.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Utils;
 /**
  * Color class for color operations.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/ImageUtils.php b/Utils/ImageUtils.php
index 8401cefc4..3a9011ba6 100644
--- a/Utils/ImageUtils.php
+++ b/Utils/ImageUtils.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Utils;
  *
  * This class provides static helper functionalities for images.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/JsonBuilder.php b/Utils/JsonBuilder.php
index a4b2a3888..f36fe5bfa 100644
--- a/Utils/JsonBuilder.php
+++ b/Utils/JsonBuilder.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Utils;
 /**
  * Json builder class.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/Permutation.php b/Utils/Permutation.php
index b338acec1..fc0d320e5 100644
--- a/Utils/Permutation.php
+++ b/Utils/Permutation.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Utils;
 /**
  * String utils.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/StringCompare.php b/Utils/StringCompare.php
index abdf12449..0f80ae2bd 100644
--- a/Utils/StringCompare.php
+++ b/Utils/StringCompare.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Utils;
  *
  * This class helps to compare two strings
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/StringUtils.php b/Utils/StringUtils.php
index 3febdffec..80ba7e275 100644
--- a/Utils/StringUtils.php
+++ b/Utils/StringUtils.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Utils;
  *
  * This class provides static helper functionalities for strings.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Utils/TestUtils.php b/Utils/TestUtils.php
index 77cd0dbca..de9f98f80 100644
--- a/Utils/TestUtils.php
+++ b/Utils/TestUtils.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Utils
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Utils;
  *
  * Only for testing purposes. MUST NOT be used for other purposes.
  *
- * @package    Framework
+ * @package    phpOMS\Utils
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Validation/ModelValidationTrait.php b/Validation/ModelValidationTrait.php
index 3f86b891f..31ef9bdab 100644
--- a/Validation/ModelValidationTrait.php
+++ b/Validation/ModelValidationTrait.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Validation
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -14,11 +14,12 @@ declare(strict_types = 1);
 
 namespace phpOMS\Validation;
 
-
 /**
  * Model validation trait.
  *
- * @package    Framework
+ * @package    phpOMS\Validation
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
  * @since      1.0.0
  */
 trait ModelValidationTrait
@@ -45,7 +46,6 @@ trait ModelValidationTrait
     }
 
     /** @noinspection PhpUnusedPrivateMethodInspection */
-
     /**
      * Validate member variable.
      *
diff --git a/Validation/Validator.php b/Validation/Validator.php
index 66e73bf88..63c05bf86 100644
--- a/Validation/Validator.php
+++ b/Validation/Validator.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Validation
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,9 @@ use phpOMS\Utils\StringUtils;
 /**
  * Validator class.
  *
- * @package    Framework
+ * @package    phpOMS\Validation
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
  * @since      1.0.0
  */
 final class Validator extends ValidatorAbstract
diff --git a/Validation/ValidatorAbstract.php b/Validation/ValidatorAbstract.php
index 83621543c..af1094d1b 100644
--- a/Validation/ValidatorAbstract.php
+++ b/Validation/ValidatorAbstract.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Validation
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Validation;
 /**
  * Validator abstract.
  *
- * @package    Validation
+ * @package    phpOMS\Validation
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Validation/ValidatorInterface.php b/Validation/ValidatorInterface.php
index a936a8633..3caf69be0 100644
--- a/Validation/ValidatorInterface.php
+++ b/Validation/ValidatorInterface.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Validation
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -17,7 +17,7 @@ namespace phpOMS\Validation;
 /**
  * Validator interface.
  *
- * @package    Validation
+ * @package    phpOMS\Validation
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Version/Version.php b/Version/Version.php
index b78f1a6de..aa41fe399 100644
--- a/Version/Version.php
+++ b/Version/Version.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    TBD
+ * @package    phpOMS\Version
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ namespace phpOMS\Version;
  *
  * Responsible for handling versions
  *
- * @package    Version
+ * @package    phpOMS\Version
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0
diff --git a/Views/ViewAbstract.php b/Views/ViewAbstract.php
index 1b46d2eef..b32a9039f 100644
--- a/Views/ViewAbstract.php
+++ b/Views/ViewAbstract.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 7.1
  *
- * @package    Framework
+ * @package    phpOMS\Views
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -19,7 +19,7 @@ use phpOMS\System\File\PathException;
 /**
  * List view.
  *
- * @package    Framework
+ * @package    phpOMS\Views
  * @license    OMS License 1.0
  * @link       http://website.orange-management.de
  * @since      1.0.0