diff --git a/.idea/anb_php_components_pack.iml b/.idea/anb_php_components_pack.iml
index b0be567..0ee0ec1 100644
--- a/.idea/anb_php_components_pack.iml
+++ b/.idea/anb_php_components_pack.iml
@@ -9,6 +9,7 @@
       <sourceFolder url="file://$MODULE_DIR$/sources/interfaces" isTestSource="false" packagePrefix="goodboyalex\php_components_pack\interfaces\" />
       <sourceFolder url="file://$MODULE_DIR$/sources/models" isTestSource="false" packagePrefix="goodboyalex\php_components_pack\models\" />
       <sourceFolder url="file://$MODULE_DIR$/sources/traits" isTestSource="false" packagePrefix="goodboyalex\php_components_pack\traits\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="false" packagePrefix="goodboyalex\php_components_pack\tests\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
@@ -36,6 +37,8 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/staabm/side-effects-detector" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/php.xml b/.idea/php.xml
index 3040e92..cf2048e 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -38,6 +38,8 @@
       <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
       <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
       <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
index 8523430..4f8104c 100644
--- a/.idea/phpunit.xml
+++ b/.idea/phpunit.xml
@@ -3,7 +3,7 @@
   <component name="PHPUnit">
     <option name="directories">
       <list>
-        <option value="D:\my_projects\anb_php_components_pack\tests" />
+        <option value="$PROJECT_DIR$/tests" />
       </list>
     </option>
   </component>
diff --git a/composer.json b/composer.json
index 1d62cdd..26fed5c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
   "keywords": [
     "components"
   ],
-  "homepage": "https://gitverse.ru/babaev-an/anb_php_components_pack",
+  "homepage": "https://gitverse.ru/babaev-an/php_components_pack",
   "license": "GPL-3.0-or-later",
   "type": "library",
   "authors": [
@@ -23,13 +23,11 @@
   },
   "autoload": {
     "psr-4": {
-      "goodboyalex\\php_components_pack\\": "sources",
-      "goodboyalex\\php_components_pack\\classes\\": "sources/classes",
-      "goodboyalex\\php_components_pack\\enums\\": "sources/enums",
-      "goodboyalex\\php_components_pack\\extensions\\": "sources/extensions",
-      "goodboyalex\\php_components_pack\\interfaces\\": "sources/interfaces",
-      "goodboyalex\\php_components_pack\\models\\": "sources/models",
-      "goodboyalex\\php_components_pack\\traits\\": "sources/traits",
+      "goodboyalex\\php_components_pack\\": "sources"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
       "goodboyalex\\php_components_pack\\tests\\": "tests"
     }
   }
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 03d6231..e7ebc9f 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,13 +6,7 @@ $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    'goodboyalex\\php_components_pack\\traits\\' => array($baseDir . '/sources/traits'),
     'goodboyalex\\php_components_pack\\tests\\' => array($baseDir . '/tests'),
-    'goodboyalex\\php_components_pack\\models\\' => array($baseDir . '/sources/models'),
-    'goodboyalex\\php_components_pack\\interfaces\\' => array($baseDir . '/sources/interfaces'),
-    'goodboyalex\\php_components_pack\\extensions\\' => array($baseDir . '/sources/extensions'),
-    'goodboyalex\\php_components_pack\\enums\\' => array($baseDir . '/sources/enums'),
-    'goodboyalex\\php_components_pack\\classes\\' => array($baseDir . '/sources/classes'),
     'goodboyalex\\php_components_pack\\' => array($baseDir . '/sources'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 3fc1a40..ed2745e 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -14,13 +14,7 @@ class ComposerStaticInitc00e5b601adae61bbbc3f6be4864ef55
     public static $prefixLengthsPsr4 = array (
         'g' => 
         array (
-            'goodboyalex\\php_components_pack\\traits\\' => 39,
             'goodboyalex\\php_components_pack\\tests\\' => 38,
-            'goodboyalex\\php_components_pack\\models\\' => 39,
-            'goodboyalex\\php_components_pack\\interfaces\\' => 43,
-            'goodboyalex\\php_components_pack\\extensions\\' => 43,
-            'goodboyalex\\php_components_pack\\enums\\' => 38,
-            'goodboyalex\\php_components_pack\\classes\\' => 40,
             'goodboyalex\\php_components_pack\\' => 32,
         ),
         'P' => 
@@ -34,34 +28,10 @@ class ComposerStaticInitc00e5b601adae61bbbc3f6be4864ef55
     );
 
     public static $prefixDirsPsr4 = array (
-        'goodboyalex\\php_components_pack\\traits\\' => 
-        array (
-            0 => __DIR__ . '/../..' . '/sources/traits',
-        ),
         'goodboyalex\\php_components_pack\\tests\\' => 
         array (
             0 => __DIR__ . '/../..' . '/tests',
         ),
-        'goodboyalex\\php_components_pack\\models\\' => 
-        array (
-            0 => __DIR__ . '/../..' . '/sources/models',
-        ),
-        'goodboyalex\\php_components_pack\\interfaces\\' => 
-        array (
-            0 => __DIR__ . '/../..' . '/sources/interfaces',
-        ),
-        'goodboyalex\\php_components_pack\\extensions\\' => 
-        array (
-            0 => __DIR__ . '/../..' . '/sources/extensions',
-        ),
-        'goodboyalex\\php_components_pack\\enums\\' => 
-        array (
-            0 => __DIR__ . '/../..' . '/sources/enums',
-        ),
-        'goodboyalex\\php_components_pack\\classes\\' => 
-        array (
-            0 => __DIR__ . '/../..' . '/sources/classes',
-        ),
         'goodboyalex\\php_components_pack\\' => 
         array (
             0 => __DIR__ . '/../..' . '/sources',
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index c16a6b2..0d24b0c 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'goodboyalex/php_components_pack',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '4bcb4c60dd4219bbb7ff6c9887884541010bcdbc',
+        'reference' => '50343d5a87c64d1ac1cf93a8c89a7f294b3dfe44',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'goodboyalex/php_components_pack' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '4bcb4c60dd4219bbb7ff6c9887884541010bcdbc',
+            'reference' => '50343d5a87c64d1ac1cf93a8c89a7f294b3dfe44',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),