diff --git a/tests/all_tests.nim b/tests/all_tests.nim
index 8fb10fb..d686df5 100644
--- a/tests/all_tests.nim
+++ b/tests/all_tests.nim
@@ -1,8 +1,8 @@
-import ./swarmsim/engine/eventdrivenengine
-import ./swarmsim/engine/schedulableevent
-import ./swarmsim/engine/network
-import ./swarmsim/engine/peer
-import ./swarmsim/codex/dhttracker
+import engine/teventdrivenengine
+import engine/tschedulableevent
+import engine/tnetwork
+import engine/tpeer
+import codex/tdhttracker
 
 {.warning[UnusedImport]: off.}
 
diff --git a/tests/swarmsim/codex/dhttracker.nim b/tests/codex/tdhttracker.nim
similarity index 100%
rename from tests/swarmsim/codex/dhttracker.nim
rename to tests/codex/tdhttracker.nim
diff --git a/tests/swarmsim/engine/eventdrivenengine.nim b/tests/engine/teventdrivenengine.nim
similarity index 100%
rename from tests/swarmsim/engine/eventdrivenengine.nim
rename to tests/engine/teventdrivenengine.nim
diff --git a/tests/swarmsim/engine/network.nim b/tests/engine/tnetwork.nim
similarity index 100%
rename from tests/swarmsim/engine/network.nim
rename to tests/engine/tnetwork.nim
diff --git a/tests/swarmsim/engine/peer.nim b/tests/engine/tpeer.nim
similarity index 100%
rename from tests/swarmsim/engine/peer.nim
rename to tests/engine/tpeer.nim
diff --git a/tests/swarmsim/engine/schedulableevent.nim b/tests/engine/tschedulableevent.nim
similarity index 100%
rename from tests/swarmsim/engine/schedulableevent.nim
rename to tests/engine/tschedulableevent.nim