diff --git a/composer.json b/composer.json
index 9d334e6..126ad3e 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Meritoo\\Common\\": "src/Meritoo/Common/",
-            "Meritoo\\Common\\Test\\": "tests/Meritoo/Common/Test/"
+            "Meritoo\\Common\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Meritoo\\Common\\Test\\": "tests/"
         }
     }
 }
diff --git a/src/Meritoo/Common/Collection/Collection.php b/src/Collection/Collection.php
similarity index 100%
rename from src/Meritoo/Common/Collection/Collection.php
rename to src/Collection/Collection.php
diff --git a/src/Meritoo/Common/Exception/Base/UnknownTypeException.php b/src/Exception/Base/UnknownTypeException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Base/UnknownTypeException.php
rename to src/Exception/Base/UnknownTypeException.php
diff --git a/src/Meritoo/Common/Exception/Date/UnknownDatePartTypeException.php b/src/Exception/Date/UnknownDatePartTypeException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Date/UnknownDatePartTypeException.php
rename to src/Exception/Date/UnknownDatePartTypeException.php
diff --git a/src/Meritoo/Common/Exception/File/EmptyFileException.php b/src/Exception/File/EmptyFileException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/File/EmptyFileException.php
rename to src/Exception/File/EmptyFileException.php
diff --git a/src/Meritoo/Common/Exception/File/EmptyFilePathException.php b/src/Exception/File/EmptyFilePathException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/File/EmptyFilePathException.php
rename to src/Exception/File/EmptyFilePathException.php
diff --git a/src/Meritoo/Common/Exception/File/NotExistingFileException.php b/src/Exception/File/NotExistingFileException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/File/NotExistingFileException.php
rename to src/Exception/File/NotExistingFileException.php
diff --git a/src/Meritoo/Common/Exception/Method/DisabledMethodException.php b/src/Exception/Method/DisabledMethodException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Method/DisabledMethodException.php
rename to src/Exception/Method/DisabledMethodException.php
diff --git a/src/Meritoo/Common/Exception/Reflection/CannotResolveClassNameException.php b/src/Exception/Reflection/CannotResolveClassNameException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Reflection/CannotResolveClassNameException.php
rename to src/Exception/Reflection/CannotResolveClassNameException.php
diff --git a/src/Meritoo/Common/Exception/Reflection/MissingChildClassesException.php b/src/Exception/Reflection/MissingChildClassesException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Reflection/MissingChildClassesException.php
rename to src/Exception/Reflection/MissingChildClassesException.php
diff --git a/src/Meritoo/Common/Exception/Reflection/TooManyChildClassesException.php b/src/Exception/Reflection/TooManyChildClassesException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Reflection/TooManyChildClassesException.php
rename to src/Exception/Reflection/TooManyChildClassesException.php
diff --git a/src/Meritoo/Common/Exception/Regex/IncorrectColorHexLengthException.php b/src/Exception/Regex/IncorrectColorHexLengthException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Regex/IncorrectColorHexLengthException.php
rename to src/Exception/Regex/IncorrectColorHexLengthException.php
diff --git a/src/Meritoo/Common/Exception/Regex/InvalidColorHexValueException.php b/src/Exception/Regex/InvalidColorHexValueException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Regex/InvalidColorHexValueException.php
rename to src/Exception/Regex/InvalidColorHexValueException.php
diff --git a/src/Meritoo/Common/Exception/Regex/InvalidUrlException.php b/src/Exception/Regex/InvalidUrlException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Regex/InvalidUrlException.php
rename to src/Exception/Regex/InvalidUrlException.php
diff --git a/src/Meritoo/Common/Exception/Type/UnknownOopVisibilityTypeException.php b/src/Exception/Type/UnknownOopVisibilityTypeException.php
similarity index 100%
rename from src/Meritoo/Common/Exception/Type/UnknownOopVisibilityTypeException.php
rename to src/Exception/Type/UnknownOopVisibilityTypeException.php
diff --git a/src/Meritoo/Common/Test/Base/BaseTestCase.php b/src/Test/Base/BaseTestCase.php
similarity index 100%
rename from src/Meritoo/Common/Test/Base/BaseTestCase.php
rename to src/Test/Base/BaseTestCase.php
diff --git a/src/Meritoo/Common/Test/Base/BaseTypeTestCase.php b/src/Test/Base/BaseTypeTestCase.php
similarity index 100%
rename from src/Meritoo/Common/Test/Base/BaseTypeTestCase.php
rename to src/Test/Base/BaseTypeTestCase.php
diff --git a/src/Meritoo/Common/Type/Base/BaseType.php b/src/Type/Base/BaseType.php
similarity index 100%
rename from src/Meritoo/Common/Type/Base/BaseType.php
rename to src/Type/Base/BaseType.php
diff --git a/src/Meritoo/Common/Type/DatePartType.php b/src/Type/DatePartType.php
similarity index 100%
rename from src/Meritoo/Common/Type/DatePartType.php
rename to src/Type/DatePartType.php
diff --git a/src/Meritoo/Common/Type/OopVisibilityType.php b/src/Type/OopVisibilityType.php
similarity index 100%
rename from src/Meritoo/Common/Type/OopVisibilityType.php
rename to src/Type/OopVisibilityType.php
diff --git a/src/Meritoo/Common/Utilities/Arrays.php b/src/Utilities/Arrays.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Arrays.php
rename to src/Utilities/Arrays.php
diff --git a/src/Meritoo/Common/Utilities/Bundle.php b/src/Utilities/Bundle.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Bundle.php
rename to src/Utilities/Bundle.php
diff --git a/src/Meritoo/Common/Utilities/Composer.php b/src/Utilities/Composer.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Composer.php
rename to src/Utilities/Composer.php
diff --git a/src/Meritoo/Common/Utilities/Date.php b/src/Utilities/Date.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Date.php
rename to src/Utilities/Date.php
diff --git a/src/Meritoo/Common/Utilities/DatePeriod.php b/src/Utilities/DatePeriod.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/DatePeriod.php
rename to src/Utilities/DatePeriod.php
diff --git a/src/Meritoo/Common/Utilities/GeneratorUtility.php b/src/Utilities/GeneratorUtility.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/GeneratorUtility.php
rename to src/Utilities/GeneratorUtility.php
diff --git a/src/Meritoo/Common/Utilities/Locale.php b/src/Utilities/Locale.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Locale.php
rename to src/Utilities/Locale.php
diff --git a/src/Meritoo/Common/Utilities/MimeTypes.php b/src/Utilities/MimeTypes.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/MimeTypes.php
rename to src/Utilities/MimeTypes.php
diff --git a/src/Meritoo/Common/Utilities/Miscellaneous.php b/src/Utilities/Miscellaneous.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Miscellaneous.php
rename to src/Utilities/Miscellaneous.php
diff --git a/src/Meritoo/Common/Utilities/QueryBuilderUtility.php b/src/Utilities/QueryBuilderUtility.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/QueryBuilderUtility.php
rename to src/Utilities/QueryBuilderUtility.php
diff --git a/src/Meritoo/Common/Utilities/Reflection.php b/src/Utilities/Reflection.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Reflection.php
rename to src/Utilities/Reflection.php
diff --git a/src/Meritoo/Common/Utilities/Regex.php b/src/Utilities/Regex.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Regex.php
rename to src/Utilities/Regex.php
diff --git a/src/Meritoo/Common/Utilities/Repository.php b/src/Utilities/Repository.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Repository.php
rename to src/Utilities/Repository.php
diff --git a/src/Meritoo/Common/Utilities/Uri.php b/src/Utilities/Uri.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Uri.php
rename to src/Utilities/Uri.php
diff --git a/src/Meritoo/Common/Utilities/Xml.php b/src/Utilities/Xml.php
similarity index 100%
rename from src/Meritoo/Common/Utilities/Xml.php
rename to src/Utilities/Xml.php
diff --git a/tests/Meritoo/Common/Test/Collection/CollectionTest.php b/tests/Collection/CollectionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Collection/CollectionTest.php
rename to tests/Collection/CollectionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Base/UnknownTypeExceptionTest.php b/tests/Exception/Base/UnknownTypeExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Base/UnknownTypeExceptionTest.php
rename to tests/Exception/Base/UnknownTypeExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Date/UnknownDatePartTypeExceptionTest.php b/tests/Exception/Date/UnknownDatePartTypeExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Date/UnknownDatePartTypeExceptionTest.php
rename to tests/Exception/Date/UnknownDatePartTypeExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/File/EmptyFileExceptionTest.php b/tests/Exception/File/EmptyFileExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/File/EmptyFileExceptionTest.php
rename to tests/Exception/File/EmptyFileExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/File/EmptyFilePathExceptionTest.php b/tests/Exception/File/EmptyFilePathExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/File/EmptyFilePathExceptionTest.php
rename to tests/Exception/File/EmptyFilePathExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/File/NotExistingFileExceptionTest.php b/tests/Exception/File/NotExistingFileExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/File/NotExistingFileExceptionTest.php
rename to tests/Exception/File/NotExistingFileExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Method/DisabledMethodExceptionTest.php b/tests/Exception/Method/DisabledMethodExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Method/DisabledMethodExceptionTest.php
rename to tests/Exception/Method/DisabledMethodExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Reflection/CannotResolveClassNameExceptionTest.php b/tests/Exception/Reflection/CannotResolveClassNameExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Reflection/CannotResolveClassNameExceptionTest.php
rename to tests/Exception/Reflection/CannotResolveClassNameExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Reflection/MissingChildClassesExceptionTest.php b/tests/Exception/Reflection/MissingChildClassesExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Reflection/MissingChildClassesExceptionTest.php
rename to tests/Exception/Reflection/MissingChildClassesExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Reflection/TooManyChildClassesExceptionTest.php b/tests/Exception/Reflection/TooManyChildClassesExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Reflection/TooManyChildClassesExceptionTest.php
rename to tests/Exception/Reflection/TooManyChildClassesExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Regex/IncorrectColorHexLengthExceptionTest.php b/tests/Exception/Regex/IncorrectColorHexLengthExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Regex/IncorrectColorHexLengthExceptionTest.php
rename to tests/Exception/Regex/IncorrectColorHexLengthExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Regex/InvalidColorHexValueExceptionTest.php b/tests/Exception/Regex/InvalidColorHexValueExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Regex/InvalidColorHexValueExceptionTest.php
rename to tests/Exception/Regex/InvalidColorHexValueExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Regex/InvalidUrlExceptionTest.php b/tests/Exception/Regex/InvalidUrlExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Regex/InvalidUrlExceptionTest.php
rename to tests/Exception/Regex/InvalidUrlExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Exception/Type/UnknownOopVisibilityTypeExceptionTest.php b/tests/Exception/Type/UnknownOopVisibilityTypeExceptionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Exception/Type/UnknownOopVisibilityTypeExceptionTest.php
rename to tests/Exception/Type/UnknownOopVisibilityTypeExceptionTest.php
diff --git a/tests/Meritoo/Common/Test/Type/Base/BaseTypeTest.php b/tests/Type/Base/BaseTypeTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Type/Base/BaseTypeTest.php
rename to tests/Type/Base/BaseTypeTest.php
diff --git a/tests/Meritoo/Common/Test/Type/DatePartTypeTest.php b/tests/Type/DatePartTypeTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Type/DatePartTypeTest.php
rename to tests/Type/DatePartTypeTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/ArraysTest.php b/tests/Utilities/ArraysTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/ArraysTest.php
rename to tests/Utilities/ArraysTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/BundleTest.php b/tests/Utilities/BundleTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/BundleTest.php
rename to tests/Utilities/BundleTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/ComposerTest.php b/tests/Utilities/ComposerTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/ComposerTest.php
rename to tests/Utilities/ComposerTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php b/tests/Utilities/DatePeriodTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php
rename to tests/Utilities/DatePeriodTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/DateTest.php b/tests/Utilities/DateTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/DateTest.php
rename to tests/Utilities/DateTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php b/tests/Utilities/GeneratorUtilityTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php
rename to tests/Utilities/GeneratorUtilityTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/LocaleTest.php b/tests/Utilities/LocaleTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/LocaleTest.php
rename to tests/Utilities/LocaleTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php b/tests/Utilities/MimeTypesTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php
rename to tests/Utilities/MimeTypesTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php b/tests/Utilities/MiscellaneousTest.php
similarity index 99%
rename from tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php
rename to tests/Utilities/MiscellaneousTest.php
index 13d8a0d..7fa0a21 100644
--- a/tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php
+++ b/tests/Utilities/MiscellaneousTest.php
@@ -159,8 +159,8 @@ class MiscellaneousTest extends BaseTestCase
         $expected = "int(123)\n";
 
         if ($xdebugLoaded) {
-            $libraryPath = realpath(sprintf('%s%s', dirname(__FILE__), '/../../../../..'));
-            $filePath = sprintf('%s%s', $libraryPath, '/src/Meritoo/Common/Utilities/Miscellaneous.php:');
+            $libraryPath = realpath(sprintf('%s%s', dirname(__FILE__), '/../..'));
+            $filePath = sprintf('%s%s', $libraryPath, '/src/Utilities/Miscellaneous.php:');
 
             /*
              * Attention. I have to use "\d+" at the end of $filePath, because number of line may be different if new
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/A.php b/tests/Utilities/Reflection/A.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/A.php
rename to tests/Utilities/Reflection/A.php
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/B.php b/tests/Utilities/Reflection/B.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/B.php
rename to tests/Utilities/Reflection/B.php
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/C.php b/tests/Utilities/Reflection/C.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/C.php
rename to tests/Utilities/Reflection/C.php
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/D.php b/tests/Utilities/Reflection/D.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/D.php
rename to tests/Utilities/Reflection/D.php
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/E.php b/tests/Utilities/Reflection/E.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/E.php
rename to tests/Utilities/Reflection/E.php
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/F.php b/tests/Utilities/Reflection/F.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/F.php
rename to tests/Utilities/Reflection/F.php
diff --git a/tests/Meritoo/Common/Test/Utilities/Reflection/G.php b/tests/Utilities/Reflection/G.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/Reflection/G.php
rename to tests/Utilities/Reflection/G.php
diff --git a/tests/Meritoo/Common/Test/Utilities/ReflectionTest.php b/tests/Utilities/ReflectionTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/ReflectionTest.php
rename to tests/Utilities/ReflectionTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/RegexTest.php b/tests/Utilities/RegexTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/RegexTest.php
rename to tests/Utilities/RegexTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/UriTest.php b/tests/Utilities/UriTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/UriTest.php
rename to tests/Utilities/UriTest.php
diff --git a/tests/Meritoo/Common/Test/Utilities/XmlTest.php b/tests/Utilities/XmlTest.php
similarity index 100%
rename from tests/Meritoo/Common/Test/Utilities/XmlTest.php
rename to tests/Utilities/XmlTest.php