diff --git a/composer.json b/composer.json
index 360b527..3d3466e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,9 +21,14 @@
         "phpunit/phpunit": "^6.0"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "Luxifer\\": "src/"
         }
     },
+     "autoload-dev": {
+         "psr-4": {
+             "Luxifer\\Tests\\": "tests/"
+         }
+     },
     "minimum-stability": "stable"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 868438c..a736f0a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,17 +9,17 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="./src/Luxifer/Tests/Init.php"
+         bootstrap="./tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="Doctrine Functions Test Suite">
-            <directory>./src/Luxifer/Tests/</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/Luxifer/</directory>
+            <directory>./src</directory>
         </whitelist>
     </filter>
 
diff --git a/src/Luxifer/DQL/Datetime/.gitkeep b/src/DQL/Datetime/.gitkeep
similarity index 100%
rename from src/Luxifer/DQL/Datetime/.gitkeep
rename to src/DQL/Datetime/.gitkeep
diff --git a/src/Luxifer/DQL/Datetime/ConvertTZ.php b/src/DQL/Datetime/ConvertTZ.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/ConvertTZ.php
rename to src/DQL/Datetime/ConvertTZ.php
diff --git a/src/Luxifer/DQL/Datetime/Date.php b/src/DQL/Datetime/Date.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Date.php
rename to src/DQL/Datetime/Date.php
diff --git a/src/Luxifer/DQL/Datetime/DateDiff.php b/src/DQL/Datetime/DateDiff.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/DateDiff.php
rename to src/DQL/Datetime/DateDiff.php
diff --git a/src/Luxifer/DQL/Datetime/DateFormat.php b/src/DQL/Datetime/DateFormat.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/DateFormat.php
rename to src/DQL/Datetime/DateFormat.php
diff --git a/src/Luxifer/DQL/Datetime/Day.php b/src/DQL/Datetime/Day.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Day.php
rename to src/DQL/Datetime/Day.php
diff --git a/src/Luxifer/DQL/Datetime/DayOfMonth.php b/src/DQL/Datetime/DayOfMonth.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/DayOfMonth.php
rename to src/DQL/Datetime/DayOfMonth.php
diff --git a/src/Luxifer/DQL/Datetime/DayOfWeek.php b/src/DQL/Datetime/DayOfWeek.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/DayOfWeek.php
rename to src/DQL/Datetime/DayOfWeek.php
diff --git a/src/Luxifer/DQL/Datetime/DayOfYear.php b/src/DQL/Datetime/DayOfYear.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/DayOfYear.php
rename to src/DQL/Datetime/DayOfYear.php
diff --git a/src/Luxifer/DQL/Datetime/FromUnixtime.php b/src/DQL/Datetime/FromUnixtime.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/FromUnixtime.php
rename to src/DQL/Datetime/FromUnixtime.php
diff --git a/src/Luxifer/DQL/Datetime/Hour.php b/src/DQL/Datetime/Hour.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Hour.php
rename to src/DQL/Datetime/Hour.php
diff --git a/src/Luxifer/DQL/Datetime/Minute.php b/src/DQL/Datetime/Minute.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Minute.php
rename to src/DQL/Datetime/Minute.php
diff --git a/src/Luxifer/DQL/Datetime/Month.php b/src/DQL/Datetime/Month.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Month.php
rename to src/DQL/Datetime/Month.php
diff --git a/src/Luxifer/DQL/Datetime/Quarter.php b/src/DQL/Datetime/Quarter.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Quarter.php
rename to src/DQL/Datetime/Quarter.php
diff --git a/src/Luxifer/DQL/Datetime/Second.php b/src/DQL/Datetime/Second.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Second.php
rename to src/DQL/Datetime/Second.php
diff --git a/src/Luxifer/DQL/Datetime/Time.php b/src/DQL/Datetime/Time.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Time.php
rename to src/DQL/Datetime/Time.php
diff --git a/src/Luxifer/DQL/Datetime/Week.php b/src/DQL/Datetime/Week.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Week.php
rename to src/DQL/Datetime/Week.php
diff --git a/src/Luxifer/DQL/Datetime/Year.php b/src/DQL/Datetime/Year.php
similarity index 100%
rename from src/Luxifer/DQL/Datetime/Year.php
rename to src/DQL/Datetime/Year.php
diff --git a/src/Luxifer/DQL/Numeric/.gitkeep b/src/DQL/Numeric/.gitkeep
similarity index 100%
rename from src/Luxifer/DQL/Numeric/.gitkeep
rename to src/DQL/Numeric/.gitkeep
diff --git a/src/Luxifer/DQL/Numeric/Rand.php b/src/DQL/Numeric/Rand.php
similarity index 100%
rename from src/Luxifer/DQL/Numeric/Rand.php
rename to src/DQL/Numeric/Rand.php
diff --git a/src/Luxifer/DQL/String/.gitkeep b/src/DQL/String/.gitkeep
similarity index 100%
rename from src/Luxifer/DQL/String/.gitkeep
rename to src/DQL/String/.gitkeep
diff --git a/src/Luxifer/DQL/String/ConcatWs.php b/src/DQL/String/ConcatWs.php
similarity index 100%
rename from src/Luxifer/DQL/String/ConcatWs.php
rename to src/DQL/String/ConcatWs.php
diff --git a/src/Luxifer/DQL/String/IfElse.php b/src/DQL/String/IfElse.php
similarity index 100%
rename from src/Luxifer/DQL/String/IfElse.php
rename to src/DQL/String/IfElse.php
diff --git a/src/Luxifer/DQL/String/Md5.php b/src/DQL/String/Md5.php
similarity index 100%
rename from src/Luxifer/DQL/String/Md5.php
rename to src/DQL/String/Md5.php
diff --git a/src/Luxifer/Tests/DQLFunctionTest.php b/tests/DQLFunctionTest.php
similarity index 100%
rename from src/Luxifer/Tests/DQLFunctionTest.php
rename to tests/DQLFunctionTest.php
diff --git a/src/Luxifer/Tests/DateTest.php b/tests/DateTest.php
similarity index 100%
rename from src/Luxifer/Tests/DateTest.php
rename to tests/DateTest.php
diff --git a/src/Luxifer/Tests/Fixtures/Entity/Fake.php b/tests/Fixtures/Entity/Fake.php
similarity index 100%
rename from src/Luxifer/Tests/Fixtures/Entity/Fake.php
rename to tests/Fixtures/Entity/Fake.php
diff --git a/src/Luxifer/Tests/Mocks/ConnectionMock.php b/tests/Mocks/ConnectionMock.php
similarity index 100%
rename from src/Luxifer/Tests/Mocks/ConnectionMock.php
rename to tests/Mocks/ConnectionMock.php
diff --git a/src/Luxifer/Tests/Mocks/DatabasePlatformMock.php b/tests/Mocks/DatabasePlatformMock.php
similarity index 100%
rename from src/Luxifer/Tests/Mocks/DatabasePlatformMock.php
rename to tests/Mocks/DatabasePlatformMock.php
diff --git a/src/Luxifer/Tests/Mocks/DriverMock.php b/tests/Mocks/DriverMock.php
similarity index 100%
rename from src/Luxifer/Tests/Mocks/DriverMock.php
rename to tests/Mocks/DriverMock.php
diff --git a/src/Luxifer/Tests/Mocks/EntityManagerMock.php b/tests/Mocks/EntityManagerMock.php
similarity index 100%
rename from src/Luxifer/Tests/Mocks/EntityManagerMock.php
rename to tests/Mocks/EntityManagerMock.php
diff --git a/src/Luxifer/Tests/Mocks/QuotingStrategy.php b/tests/Mocks/QuotingStrategy.php
similarity index 100%
rename from src/Luxifer/Tests/Mocks/QuotingStrategy.php
rename to tests/Mocks/QuotingStrategy.php
diff --git a/src/Luxifer/Tests/NumericTest.php b/tests/NumericTest.php
similarity index 100%
rename from src/Luxifer/Tests/NumericTest.php
rename to tests/NumericTest.php
diff --git a/src/Luxifer/Tests/Proxies/.gitkeep b/tests/Proxies/.gitkeep
similarity index 100%
rename from src/Luxifer/Tests/Proxies/.gitkeep
rename to tests/Proxies/.gitkeep
diff --git a/src/Luxifer/Tests/StringTest.php b/tests/StringTest.php
similarity index 100%
rename from src/Luxifer/Tests/StringTest.php
rename to tests/StringTest.php
diff --git a/src/Luxifer/Tests/Init.php b/tests/bootstrap.php
similarity index 75%
rename from src/Luxifer/Tests/Init.php
rename to tests/bootstrap.php
index 2112374..13cc9fd 100644
--- a/src/Luxifer/Tests/Init.php
+++ b/tests/bootstrap.php
@@ -7,5 +7,5 @@
 
 error_reporting(E_ALL | E_STRICT);
 
-require_once __DIR__ . "/../../../vendor/autoload.php";
+require_once __DIR__ . "/../vendor/autoload.php";
 // @codeCoverageIgnoreEnd