diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover b/common_libs/test_framework/adversaries/PatternMover/PatternMover
similarity index 100%
rename from common_libs/test_framework/adversaries/PatternMover_garage/PatternMover
rename to common_libs/test_framework/adversaries/PatternMover/PatternMover
diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.json b/common_libs/test_framework/adversaries/PatternMover/PatternMover.json
similarity index 100%
rename from common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.json
rename to common_libs/test_framework/adversaries/PatternMover/PatternMover.json
diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover.nimble b/common_libs/test_framework/adversaries/PatternMover/PatternMover.nimble
similarity index 100%
rename from common_libs/test_framework/adversaries/PatternMover_garage/PatternMover.nimble
rename to common_libs/test_framework/adversaries/PatternMover/PatternMover.nimble
diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.sh b/common_libs/test_framework/adversaries/PatternMover/PatternMover.sh
similarity index 100%
rename from common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.sh
rename to common_libs/test_framework/adversaries/PatternMover/PatternMover.sh
diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/config.nims b/common_libs/test_framework/adversaries/PatternMover/config.nims
similarity index 100%
rename from common_libs/test_framework/adversaries/PatternMover_garage/config.nims
rename to common_libs/test_framework/adversaries/PatternMover/config.nims
diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.nim b/common_libs/test_framework/adversaries/PatternMover/src/PatternMover.nim
similarity index 100%
rename from common_libs/test_framework/adversaries/PatternMover_garage/src/PatternMover.nim
rename to common_libs/test_framework/adversaries/PatternMover/src/PatternMover.nim
diff --git a/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.json b/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.json
deleted file mode 100644
index b15963d..0000000
--- a/common_libs/test_framework/adversaries/PatternMover_garage/PatternMover_garage.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "PatternMover",
-  "version": "0.1.0",
-  "authors": ["Davide Cappellini"],
-  "description": "Fixed movement sequence adversary — tests pattern-matching gun",
-  "homepage": "",
-  "countryCodes": ["IT"],
-  "gameTypes": ["classic", "1v1"],
-  "platform": "Nim",
-  "programmingLang": "Nim"
-}
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover b/common_libs/test_framework/adversaries/RandomMover/RandomMover
similarity index 100%
rename from common_libs/test_framework/adversaries/RandomMover_garage/RandomMover
rename to common_libs/test_framework/adversaries/RandomMover/RandomMover
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.json b/common_libs/test_framework/adversaries/RandomMover/RandomMover.json
similarity index 100%
rename from common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.json
rename to common_libs/test_framework/adversaries/RandomMover/RandomMover.json
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover.nimble b/common_libs/test_framework/adversaries/RandomMover/RandomMover.nimble
similarity index 100%
rename from common_libs/test_framework/adversaries/RandomMover_garage/RandomMover.nimble
rename to common_libs/test_framework/adversaries/RandomMover/RandomMover.nimble
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.sh b/common_libs/test_framework/adversaries/RandomMover/RandomMover.sh
similarity index 100%
rename from common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.sh
rename to common_libs/test_framework/adversaries/RandomMover/RandomMover.sh
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/config.nims b/common_libs/test_framework/adversaries/RandomMover/config.nims
similarity index 100%
rename from common_libs/test_framework/adversaries/RandomMover_garage/config.nims
rename to common_libs/test_framework/adversaries/RandomMover/config.nims
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.nim b/common_libs/test_framework/adversaries/RandomMover/src/RandomMover.nim
similarity index 100%
rename from common_libs/test_framework/adversaries/RandomMover_garage/src/RandomMover.nim
rename to common_libs/test_framework/adversaries/RandomMover/src/RandomMover.nim
diff --git a/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.json b/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.json
deleted file mode 100644
index 0faaed6..0000000
--- a/common_libs/test_framework/adversaries/RandomMover_garage/RandomMover_garage.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "RandomMover",
-  "version": "0.1.0",
-  "authors": ["Davide Cappellini"],
-  "description": "Random movement adversary — tests guns against unpredictable movement",
-  "homepage": "",
-  "countryCodes": ["IT"],
-  "gameTypes": ["classic", "1v1"],
-  "platform": "Nim",
-  "programmingLang": "Nim"
-}
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer b/common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer
similarity index 100%
rename from common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer
rename to common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.json b/common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer.json
similarity index 100%
rename from common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.json
rename to common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer.json
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer.nimble b/common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer.nimble
similarity index 100%
rename from common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer.nimble
rename to common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer.nimble
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.sh b/common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer.sh
similarity index 100%
rename from common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.sh
rename to common_libs/test_framework/adversaries/WaveSurfer/WaveSurfer.sh
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/config.nims b/common_libs/test_framework/adversaries/WaveSurfer/config.nims
similarity index 100%
rename from common_libs/test_framework/adversaries/WaveSurfer_garage/config.nims
rename to common_libs/test_framework/adversaries/WaveSurfer/config.nims
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.nim b/common_libs/test_framework/adversaries/WaveSurfer/src/WaveSurfer.nim
similarity index 100%
rename from common_libs/test_framework/adversaries/WaveSurfer_garage/src/WaveSurfer.nim
rename to common_libs/test_framework/adversaries/WaveSurfer/src/WaveSurfer.nim
diff --git a/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.json b/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.json
deleted file mode 100644
index bbe4c76..0000000
--- a/common_libs/test_framework/adversaries/WaveSurfer_garage/WaveSurfer_garage.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "WaveSurfer",
-  "version": "0.1.0",
-  "authors": ["Davide Cappellini"],
-  "description": "Reactive wave-surfing adversary — hardest test for TM gun",
-  "homepage": "",
-  "countryCodes": ["IT"],
-  "gameTypes": ["classic", "1v1"],
-  "platform": "Nim",
-  "programmingLang": "Nim"
-}