diff --git a/implementations/racket/info.rkt b/implementations/racket/info.rkt
deleted file mode 100644
index a7e6f87..0000000
--- a/implementations/racket/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang setup/infotab
-(define collection 'multi)
-(define deps '("base"
-	       "bitsyntax"
-               "rackunit-lib"
-               "data-lib"))
diff --git a/implementations/racket/.gitignore b/implementations/racket/preserves/.gitignore
similarity index 100%
rename from implementations/racket/.gitignore
rename to implementations/racket/preserves/.gitignore
diff --git a/implementations/racket/Makefile b/implementations/racket/preserves/Makefile
similarity index 100%
rename from implementations/racket/Makefile
rename to implementations/racket/preserves/Makefile
diff --git a/implementations/racket/preserves/info.rkt b/implementations/racket/preserves/info.rkt
index 2532275..a7e6f87 100644
--- a/implementations/racket/preserves/info.rkt
+++ b/implementations/racket/preserves/info.rkt
@@ -1,3 +1,6 @@
 #lang setup/infotab
-(define racket-launcher-names '("preserves-tool"))
-(define racket-launcher-libraries '("tool.rkt"))
+(define collection 'multi)
+(define deps '("base"
+	       "bitsyntax"
+               "rackunit-lib"
+               "data-lib"))
diff --git a/implementations/racket/preserves/preserves/info.rkt b/implementations/racket/preserves/preserves/info.rkt
new file mode 100644
index 0000000..2532275
--- /dev/null
+++ b/implementations/racket/preserves/preserves/info.rkt
@@ -0,0 +1,3 @@
+#lang setup/infotab
+(define racket-launcher-names '("preserves-tool"))
+(define racket-launcher-libraries '("tool.rkt"))
diff --git a/implementations/racket/preserves/main.rkt b/implementations/racket/preserves/preserves/main.rkt
similarity index 100%
rename from implementations/racket/preserves/main.rkt
rename to implementations/racket/preserves/preserves/main.rkt
diff --git a/implementations/racket/preserves/record.rkt b/implementations/racket/preserves/preserves/record.rkt
similarity index 100%
rename from implementations/racket/preserves/record.rkt
rename to implementations/racket/preserves/preserves/record.rkt
diff --git a/implementations/racket/preserves/struct.rkt b/implementations/racket/preserves/preserves/struct.rkt
similarity index 100%
rename from implementations/racket/preserves/struct.rkt
rename to implementations/racket/preserves/preserves/struct.rkt
diff --git a/implementations/racket/preserves/tool.rkt b/implementations/racket/preserves/preserves/tool.rkt
similarity index 100%
rename from implementations/racket/preserves/tool.rkt
rename to implementations/racket/preserves/preserves/tool.rkt
diff --git a/implementations/racket/preserves/varint.rkt b/implementations/racket/preserves/preserves/varint.rkt
similarity index 100%
rename from implementations/racket/preserves/varint.rkt
rename to implementations/racket/preserves/preserves/varint.rkt
diff --git a/tests/Makefile b/tests/Makefile
index 6d41757..28acbe7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,7 @@
 all: samples.bin
 
 samples.bin: samples.txt
-	racket ../implementations/racket/preserves/tool.rkt --atob < $< > $@
+	racket ../implementations/racket/preserves/preserves/tool.rkt --atob < $< > $@
 
 clean:
 	rm -f samples.bin