diff --git a/composer.json b/composer.json
index 03963d1..b0f2226 100644
--- a/composer.json
+++ b/composer.json
@@ -23,12 +23,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Beste\\Clock\\": "src/Clock"
+            "Beste\\Clock\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Beste\\Clock\\Tests\\": "tests/Clock"
+            "Beste\\Clock\\Tests\\": "tests"
         }
     },
     "provide": {
diff --git a/src/Clock/FrozenClock.php b/src/FrozenClock.php
similarity index 100%
rename from src/Clock/FrozenClock.php
rename to src/FrozenClock.php
diff --git a/src/Clock/LocalizedClock.php b/src/LocalizedClock.php
similarity index 100%
rename from src/Clock/LocalizedClock.php
rename to src/LocalizedClock.php
diff --git a/src/Clock/MinuteClock.php b/src/MinuteClock.php
similarity index 100%
rename from src/Clock/MinuteClock.php
rename to src/MinuteClock.php
diff --git a/src/Clock/SystemClock.php b/src/SystemClock.php
similarity index 100%
rename from src/Clock/SystemClock.php
rename to src/SystemClock.php
diff --git a/src/Clock/UTCClock.php b/src/UTCClock.php
similarity index 100%
rename from src/Clock/UTCClock.php
rename to src/UTCClock.php
diff --git a/src/Clock/WrappingClock.php b/src/WrappingClock.php
similarity index 100%
rename from src/Clock/WrappingClock.php
rename to src/WrappingClock.php
diff --git a/tests/Clock/FrozenClockTest.php b/tests/FrozenClockTest.php
similarity index 100%
rename from tests/Clock/FrozenClockTest.php
rename to tests/FrozenClockTest.php
diff --git a/tests/Clock/LocalizedClockTest.php b/tests/LocalizedClockTest.php
similarity index 100%
rename from tests/Clock/LocalizedClockTest.php
rename to tests/LocalizedClockTest.php
diff --git a/tests/Clock/MinuteClockTest.php b/tests/MinuteClockTest.php
similarity index 100%
rename from tests/Clock/MinuteClockTest.php
rename to tests/MinuteClockTest.php
diff --git a/tests/Clock/SystemClockTest.php b/tests/SystemClockTest.php
similarity index 100%
rename from tests/Clock/SystemClockTest.php
rename to tests/SystemClockTest.php
diff --git a/tests/Clock/UTCClockTest.php b/tests/UTCClockTest.php
similarity index 100%
rename from tests/Clock/UTCClockTest.php
rename to tests/UTCClockTest.php
diff --git a/tests/Clock/WrappingClockTest.php b/tests/WrappingClockTest.php
similarity index 100%
rename from tests/Clock/WrappingClockTest.php
rename to tests/WrappingClockTest.php