diff --git a/cores/archie/bench/README b/cores/archie/bench/README
deleted file mode 100644
index 4f504f7..0000000
--- a/cores/archie/bench/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the testbench code that runs tests and simulations of various bits of the the the rtl.
-
-This still needs A LOT of tidy up.
\ No newline at end of file
diff --git a/cores/archie/bench/README.txt b/cores/archie/bench/README.txt
new file mode 100644
index 0000000..726c09d
--- /dev/null
+++ b/cores/archie/bench/README.txt
@@ -0,0 +1,3 @@
+This is the testbench code that runs tests and simulations of various bits of the the the rtl.
+
+This still needs A LOT of tidy up.This is a set of tests that will verify various aspects of the archimedes core. 
\ No newline at end of file
diff --git a/cores/archie/bench/tests/alufuzz/Makefile b/cores/archie/bench/alufuzz/Makefile
similarity index 100%
rename from cores/archie/bench/tests/alufuzz/Makefile
rename to cores/archie/bench/alufuzz/Makefile
diff --git a/cores/archie/bench/tests/alufuzz/alufuzz.cpp b/cores/archie/bench/alufuzz/alufuzz.cpp
similarity index 100%
rename from cores/archie/bench/tests/alufuzz/alufuzz.cpp
rename to cores/archie/bench/alufuzz/alufuzz.cpp
diff --git a/cores/archie/bench/tests/alufuzz/alufuzz.h b/cores/archie/bench/alufuzz/alufuzz.h
similarity index 100%
rename from cores/archie/bench/tests/alufuzz/alufuzz.h
rename to cores/archie/bench/alufuzz/alufuzz.h
diff --git a/cores/archie/bench/tests/caches/Makefile b/cores/archie/bench/caches/Makefile
similarity index 100%
rename from cores/archie/bench/tests/caches/Makefile
rename to cores/archie/bench/caches/Makefile
diff --git a/cores/archie/bench/tests/caches/a23_fetch.cpp b/cores/archie/bench/caches/a23_fetch.cpp
similarity index 100%
rename from cores/archie/bench/tests/caches/a23_fetch.cpp
rename to cores/archie/bench/caches/a23_fetch.cpp
diff --git a/cores/archie/bench/tests/caches/caches.project b/cores/archie/bench/caches/caches.project
similarity index 100%
rename from cores/archie/bench/tests/caches/caches.project
rename to cores/archie/bench/caches/caches.project
diff --git a/cores/archie/bench/tests/common/Makefile b/cores/archie/bench/common/Makefile
similarity index 100%
rename from cores/archie/bench/tests/common/Makefile
rename to cores/archie/bench/common/Makefile
diff --git a/cores/archie/bench/tests/common/arm/Makefile b/cores/archie/bench/common/arm/Makefile
similarity index 100%
rename from cores/archie/bench/tests/common/arm/Makefile
rename to cores/archie/bench/common/arm/Makefile
diff --git a/cores/archie/bench/tests/common/arm/arm.project b/cores/archie/bench/common/arm/arm.project
similarity index 100%
rename from cores/archie/bench/tests/common/arm/arm.project
rename to cores/archie/bench/common/arm/arm.project
diff --git a/cores/archie/bench/tests/common/arm/armcopro.c b/cores/archie/bench/common/arm/armcopro.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armcopro.c
rename to cores/archie/bench/common/arm/armcopro.c
diff --git a/cores/archie/bench/tests/common/arm/armcopro.h b/cores/archie/bench/common/arm/armcopro.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armcopro.h
rename to cores/archie/bench/common/arm/armcopro.h
diff --git a/cores/archie/bench/tests/common/arm/armdefs.h b/cores/archie/bench/common/arm/armdefs.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armdefs.h
rename to cores/archie/bench/common/arm/armdefs.h
diff --git a/cores/archie/bench/tests/common/arm/armemu.c b/cores/archie/bench/common/arm/armemu.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armemu.c
rename to cores/archie/bench/common/arm/armemu.c
diff --git a/cores/archie/bench/tests/common/arm/armemu.h b/cores/archie/bench/common/arm/armemu.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armemu.h
rename to cores/archie/bench/common/arm/armemu.h
diff --git a/cores/archie/bench/tests/common/arm/armemudec.c b/cores/archie/bench/common/arm/armemudec.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armemudec.c
rename to cores/archie/bench/common/arm/armemudec.c
diff --git a/cores/archie/bench/tests/common/arm/armemuinstr.c b/cores/archie/bench/common/arm/armemuinstr.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armemuinstr.c
rename to cores/archie/bench/common/arm/armemuinstr.c
diff --git a/cores/archie/bench/tests/common/arm/arminit.c b/cores/archie/bench/common/arm/arminit.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/arminit.c
rename to cores/archie/bench/common/arm/arminit.c
diff --git a/cores/archie/bench/tests/common/arm/armsupp.c b/cores/archie/bench/common/arm/armsupp.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/armsupp.c
rename to cores/archie/bench/common/arm/armsupp.c
diff --git a/cores/archie/bench/tests/common/arm/cp15.c b/cores/archie/bench/common/arm/cp15.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/cp15.c
rename to cores/archie/bench/common/arm/cp15.c
diff --git a/cores/archie/bench/tests/common/arm/cp15.h b/cores/archie/bench/common/arm/cp15.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/cp15.h
rename to cores/archie/bench/common/arm/cp15.h
diff --git a/cores/archie/bench/tests/common/arm/emurate.h b/cores/archie/bench/common/arm/emurate.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/emurate.h
rename to cores/archie/bench/common/arm/emurate.h
diff --git a/cores/archie/bench/tests/common/arm/eventq.c b/cores/archie/bench/common/arm/eventq.c
similarity index 100%
rename from cores/archie/bench/tests/common/arm/eventq.c
rename to cores/archie/bench/common/arm/eventq.c
diff --git a/cores/archie/bench/tests/common/arm/eventq.h b/cores/archie/bench/common/arm/eventq.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/eventq.h
rename to cores/archie/bench/common/arm/eventq.h
diff --git a/cores/archie/bench/tests/common/arm/prof.h b/cores/archie/bench/common/arm/prof.h
similarity index 100%
rename from cores/archie/bench/tests/common/arm/prof.h
rename to cores/archie/bench/common/arm/prof.h
diff --git a/cores/archie/bench/tests/common/common.project b/cores/archie/bench/common/common.project
similarity index 100%
rename from cores/archie/bench/tests/common/common.project
rename to cores/archie/bench/common/common.project
diff --git a/cores/archie/bench/tests/common/edge.cpp b/cores/archie/bench/common/edge.cpp
similarity index 100%
rename from cores/archie/bench/tests/common/edge.cpp
rename to cores/archie/bench/common/edge.cpp
diff --git a/cores/archie/bench/tests/common/edge.h b/cores/archie/bench/common/edge.h
similarity index 100%
rename from cores/archie/bench/tests/common/edge.h
rename to cores/archie/bench/common/edge.h
diff --git a/cores/archie/bench/tests/common/libdisarm/Makefile b/cores/archie/bench/common/libdisarm/Makefile
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/Makefile
rename to cores/archie/bench/common/libdisarm/Makefile
diff --git a/cores/archie/bench/tests/common/libdisarm/args.c b/cores/archie/bench/common/libdisarm/args.c
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/args.c
rename to cores/archie/bench/common/libdisarm/args.c
diff --git a/cores/archie/bench/tests/common/libdisarm/args.h b/cores/archie/bench/common/libdisarm/args.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/args.h
rename to cores/archie/bench/common/libdisarm/args.h
diff --git a/cores/archie/bench/tests/common/libdisarm/disarm.h b/cores/archie/bench/common/libdisarm/disarm.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/disarm.h
rename to cores/archie/bench/common/libdisarm/disarm.h
diff --git a/cores/archie/bench/tests/common/libdisarm/endian.h b/cores/archie/bench/common/libdisarm/endian.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/endian.h
rename to cores/archie/bench/common/libdisarm/endian.h
diff --git a/cores/archie/bench/tests/common/libdisarm/macros.h b/cores/archie/bench/common/libdisarm/macros.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/macros.h
rename to cores/archie/bench/common/libdisarm/macros.h
diff --git a/cores/archie/bench/tests/common/libdisarm/parser.c b/cores/archie/bench/common/libdisarm/parser.c
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/parser.c
rename to cores/archie/bench/common/libdisarm/parser.c
diff --git a/cores/archie/bench/tests/common/libdisarm/parser.h b/cores/archie/bench/common/libdisarm/parser.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/parser.h
rename to cores/archie/bench/common/libdisarm/parser.h
diff --git a/cores/archie/bench/tests/common/libdisarm/print.c b/cores/archie/bench/common/libdisarm/print.c
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/print.c
rename to cores/archie/bench/common/libdisarm/print.c
diff --git a/cores/archie/bench/tests/common/libdisarm/print.h b/cores/archie/bench/common/libdisarm/print.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/print.h
rename to cores/archie/bench/common/libdisarm/print.h
diff --git a/cores/archie/bench/tests/common/libdisarm/types.h b/cores/archie/bench/common/libdisarm/types.h
similarity index 100%
rename from cores/archie/bench/tests/common/libdisarm/types.h
rename to cores/archie/bench/common/libdisarm/types.h
diff --git a/cores/archie/bench/tests/default.mk b/cores/archie/bench/default.mk
similarity index 100%
rename from cores/archie/bench/tests/default.mk
rename to cores/archie/bench/default.mk
diff --git a/cores/archie/bench/tests/fuzz/Makefile b/cores/archie/bench/fuzz/Makefile
similarity index 100%
rename from cores/archie/bench/tests/fuzz/Makefile
rename to cores/archie/bench/fuzz/Makefile
diff --git a/cores/archie/bench/tests/fuzz/arm/Makefile b/cores/archie/bench/fuzz/arm/Makefile
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/Makefile
rename to cores/archie/bench/fuzz/arm/Makefile
diff --git a/cores/archie/bench/tests/fuzz/arm/arm.project b/cores/archie/bench/fuzz/arm/arm.project
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/arm.project
rename to cores/archie/bench/fuzz/arm/arm.project
diff --git a/cores/archie/bench/tests/fuzz/arm/armcopro.c b/cores/archie/bench/fuzz/arm/armcopro.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armcopro.c
rename to cores/archie/bench/fuzz/arm/armcopro.c
diff --git a/cores/archie/bench/tests/fuzz/arm/armcopro.h b/cores/archie/bench/fuzz/arm/armcopro.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armcopro.h
rename to cores/archie/bench/fuzz/arm/armcopro.h
diff --git a/cores/archie/bench/tests/fuzz/arm/armdefs.h b/cores/archie/bench/fuzz/arm/armdefs.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armdefs.h
rename to cores/archie/bench/fuzz/arm/armdefs.h
diff --git a/cores/archie/bench/tests/fuzz/arm/armemu.c b/cores/archie/bench/fuzz/arm/armemu.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armemu.c
rename to cores/archie/bench/fuzz/arm/armemu.c
diff --git a/cores/archie/bench/tests/fuzz/arm/armemu.h b/cores/archie/bench/fuzz/arm/armemu.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armemu.h
rename to cores/archie/bench/fuzz/arm/armemu.h
diff --git a/cores/archie/bench/tests/fuzz/arm/armemudec.c b/cores/archie/bench/fuzz/arm/armemudec.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armemudec.c
rename to cores/archie/bench/fuzz/arm/armemudec.c
diff --git a/cores/archie/bench/tests/fuzz/arm/armemuinstr.c b/cores/archie/bench/fuzz/arm/armemuinstr.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armemuinstr.c
rename to cores/archie/bench/fuzz/arm/armemuinstr.c
diff --git a/cores/archie/bench/tests/fuzz/arm/arminit.c b/cores/archie/bench/fuzz/arm/arminit.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/arminit.c
rename to cores/archie/bench/fuzz/arm/arminit.c
diff --git a/cores/archie/bench/tests/fuzz/arm/armsupp.c b/cores/archie/bench/fuzz/arm/armsupp.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/armsupp.c
rename to cores/archie/bench/fuzz/arm/armsupp.c
diff --git a/cores/archie/bench/tests/fuzz/arm/cp15.c b/cores/archie/bench/fuzz/arm/cp15.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/cp15.c
rename to cores/archie/bench/fuzz/arm/cp15.c
diff --git a/cores/archie/bench/tests/fuzz/arm/cp15.h b/cores/archie/bench/fuzz/arm/cp15.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/cp15.h
rename to cores/archie/bench/fuzz/arm/cp15.h
diff --git a/cores/archie/bench/tests/fuzz/arm/emurate.h b/cores/archie/bench/fuzz/arm/emurate.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/emurate.h
rename to cores/archie/bench/fuzz/arm/emurate.h
diff --git a/cores/archie/bench/tests/fuzz/arm/eventq.c b/cores/archie/bench/fuzz/arm/eventq.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/eventq.c
rename to cores/archie/bench/fuzz/arm/eventq.c
diff --git a/cores/archie/bench/tests/fuzz/arm/eventq.h b/cores/archie/bench/fuzz/arm/eventq.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/eventq.h
rename to cores/archie/bench/fuzz/arm/eventq.h
diff --git a/cores/archie/bench/tests/fuzz/arm/prof.h b/cores/archie/bench/fuzz/arm/prof.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/arm/prof.h
rename to cores/archie/bench/fuzz/arm/prof.h
diff --git a/cores/archie/bench/tests/fuzz/bugs/Makefile b/cores/archie/bench/fuzz/bugs/Makefile
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/Makefile
rename to cores/archie/bench/fuzz/bugs/Makefile
diff --git a/cores/archie/bench/tests/fuzz/bugs/andsbug.s b/cores/archie/bench/fuzz/bugs/andsbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/andsbug.s
rename to cores/archie/bench/fuzz/bugs/andsbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/cmpbug.s b/cores/archie/bench/fuzz/bugs/cmpbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/cmpbug.s
rename to cores/archie/bench/fuzz/bugs/cmpbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/ldmbug.s b/cores/archie/bench/fuzz/bugs/ldmbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/ldmbug.s
rename to cores/archie/bench/fuzz/bugs/ldmbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/rrxbug.s b/cores/archie/bench/fuzz/bugs/rrxbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/rrxbug.s
rename to cores/archie/bench/fuzz/bugs/rrxbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/swpbbug.s b/cores/archie/bench/fuzz/bugs/swpbbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/swpbbug.s
rename to cores/archie/bench/fuzz/bugs/swpbbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/swpbug.s b/cores/archie/bench/fuzz/bugs/swpbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/swpbug.s
rename to cores/archie/bench/fuzz/bugs/swpbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/teqbug.s b/cores/archie/bench/fuzz/bugs/teqbug.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/teqbug.s
rename to cores/archie/bench/fuzz/bugs/teqbug.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/tstbug1.s b/cores/archie/bench/fuzz/bugs/tstbug1.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/tstbug1.s
rename to cores/archie/bench/fuzz/bugs/tstbug1.s
diff --git a/cores/archie/bench/tests/fuzz/bugs/tstbug2.s b/cores/archie/bench/fuzz/bugs/tstbug2.s
similarity index 100%
rename from cores/archie/bench/tests/fuzz/bugs/tstbug2.s
rename to cores/archie/bench/fuzz/bugs/tstbug2.s
diff --git a/cores/archie/bench/tests/fuzz/fuzz.cpp b/cores/archie/bench/fuzz/fuzz.cpp
similarity index 100%
rename from cores/archie/bench/tests/fuzz/fuzz.cpp
rename to cores/archie/bench/fuzz/fuzz.cpp
diff --git a/cores/archie/bench/tests/fuzz/fuzz.h b/cores/archie/bench/fuzz/fuzz.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/fuzz.h
rename to cores/archie/bench/fuzz/fuzz.h
diff --git a/cores/archie/bench/tests/fuzz/fuzz.project b/cores/archie/bench/fuzz/fuzz.project
similarity index 100%
rename from cores/archie/bench/tests/fuzz/fuzz.project
rename to cores/archie/bench/fuzz/fuzz.project
diff --git a/cores/archie/bench/tests/fuzz/fuzz.workspace b/cores/archie/bench/fuzz/fuzz.workspace
similarity index 100%
rename from cores/archie/bench/tests/fuzz/fuzz.workspace
rename to cores/archie/bench/fuzz/fuzz.workspace
diff --git a/cores/archie/bench/tests/fuzz/ldstfuzz.cpp b/cores/archie/bench/fuzz/ldstfuzz.cpp
similarity index 100%
rename from cores/archie/bench/tests/fuzz/ldstfuzz.cpp
rename to cores/archie/bench/fuzz/ldstfuzz.cpp
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/Makefile b/cores/archie/bench/fuzz/libdisarm/Makefile
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/Makefile
rename to cores/archie/bench/fuzz/libdisarm/Makefile
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/args.c b/cores/archie/bench/fuzz/libdisarm/args.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/args.c
rename to cores/archie/bench/fuzz/libdisarm/args.c
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/args.h b/cores/archie/bench/fuzz/libdisarm/args.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/args.h
rename to cores/archie/bench/fuzz/libdisarm/args.h
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/disarm.h b/cores/archie/bench/fuzz/libdisarm/disarm.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/disarm.h
rename to cores/archie/bench/fuzz/libdisarm/disarm.h
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/endian.h b/cores/archie/bench/fuzz/libdisarm/endian.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/endian.h
rename to cores/archie/bench/fuzz/libdisarm/endian.h
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/macros.h b/cores/archie/bench/fuzz/libdisarm/macros.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/macros.h
rename to cores/archie/bench/fuzz/libdisarm/macros.h
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/parser.c b/cores/archie/bench/fuzz/libdisarm/parser.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/parser.c
rename to cores/archie/bench/fuzz/libdisarm/parser.c
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/parser.h b/cores/archie/bench/fuzz/libdisarm/parser.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/parser.h
rename to cores/archie/bench/fuzz/libdisarm/parser.h
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/print.c b/cores/archie/bench/fuzz/libdisarm/print.c
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/print.c
rename to cores/archie/bench/fuzz/libdisarm/print.c
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/print.h b/cores/archie/bench/fuzz/libdisarm/print.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/print.h
rename to cores/archie/bench/fuzz/libdisarm/print.h
diff --git a/cores/archie/bench/tests/fuzz/libdisarm/types.h b/cores/archie/bench/fuzz/libdisarm/types.h
similarity index 100%
rename from cores/archie/bench/tests/fuzz/libdisarm/types.h
rename to cores/archie/bench/fuzz/libdisarm/types.h
diff --git a/cores/archie/bench/tests/fuzz/main.cpp b/cores/archie/bench/fuzz/main.cpp
similarity index 100%
rename from cores/archie/bench/tests/fuzz/main.cpp
rename to cores/archie/bench/fuzz/main.cpp
diff --git a/cores/archie/bench/tests/fuzz/program.cpp b/cores/archie/bench/fuzz/program.cpp
similarity index 100%
rename from cores/archie/bench/tests/fuzz/program.cpp
rename to cores/archie/bench/fuzz/program.cpp
diff --git a/cores/archie/bench/tests/fuzz/rrxfuzz.cpp b/cores/archie/bench/fuzz/rrxfuzz.cpp
similarity index 100%
rename from cores/archie/bench/tests/fuzz/rrxfuzz.cpp
rename to cores/archie/bench/fuzz/rrxfuzz.cpp
diff --git a/cores/archie/bench/tests/sdram/Makefile b/cores/archie/bench/sdram/Makefile
similarity index 100%
rename from cores/archie/bench/tests/sdram/Makefile
rename to cores/archie/bench/sdram/Makefile
diff --git a/cores/archie/bench/tests/sdram/sdram.cpp b/cores/archie/bench/sdram/sdram.cpp
similarity index 100%
rename from cores/archie/bench/tests/sdram/sdram.cpp
rename to cores/archie/bench/sdram/sdram.cpp
diff --git a/cores/archie/bench/tests/sdram/sdram.v b/cores/archie/bench/sdram/sdram.v
similarity index 100%
rename from cores/archie/bench/tests/sdram/sdram.v
rename to cores/archie/bench/sdram/sdram.v
diff --git a/cores/archie/bench/tests/sdram/sram.vmem b/cores/archie/bench/sdram/sram.vmem
similarity index 100%
rename from cores/archie/bench/tests/sdram/sram.vmem
rename to cores/archie/bench/sdram/sram.vmem
diff --git a/cores/archie/bench/tests/sound/Makefile b/cores/archie/bench/sound/Makefile
similarity index 100%
rename from cores/archie/bench/tests/sound/Makefile
rename to cores/archie/bench/sound/Makefile
diff --git a/cores/archie/bench/tests/sound/conv.c b/cores/archie/bench/sound/conv.c
similarity index 100%
rename from cores/archie/bench/tests/sound/conv.c
rename to cores/archie/bench/sound/conv.c
diff --git a/cores/archie/bench/tests/sound/llama.wav b/cores/archie/bench/sound/llama.wav
similarity index 100%
rename from cores/archie/bench/tests/sound/llama.wav
rename to cores/archie/bench/sound/llama.wav
diff --git a/cores/archie/bench/tests/sound/mu255.c b/cores/archie/bench/sound/mu255.c
similarity index 100%
rename from cores/archie/bench/tests/sound/mu255.c
rename to cores/archie/bench/sound/mu255.c
diff --git a/cores/archie/bench/tests/sound/sound.project b/cores/archie/bench/sound/sound.project
similarity index 100%
rename from cores/archie/bench/tests/sound/sound.project
rename to cores/archie/bench/sound/sound.project
diff --git a/cores/archie/bench/tests/sound/start.ac b/cores/archie/bench/sound/start.ac
similarity index 100%
rename from cores/archie/bench/tests/sound/start.ac
rename to cores/archie/bench/sound/start.ac
diff --git a/cores/archie/bench/tests/sound/vidc_audio.cpp b/cores/archie/bench/sound/vidc_audio.cpp
similarity index 100%
rename from cores/archie/bench/tests/sound/vidc_audio.cpp
rename to cores/archie/bench/sound/vidc_audio.cpp
diff --git a/cores/archie/bench/tests/support/README b/cores/archie/bench/support/README
similarity index 100%
rename from cores/archie/bench/tests/support/README
rename to cores/archie/bench/support/README
diff --git a/cores/archie/bench/tests/support/debug_functions.vh b/cores/archie/bench/support/debug_functions.vh
similarity index 100%
rename from cores/archie/bench/tests/support/debug_functions.vh
rename to cores/archie/bench/support/debug_functions.vh
diff --git a/cores/archie/bench/tests/support/generic_sram_byte_en.v b/cores/archie/bench/support/generic_sram_byte_en.v
similarity index 100%
rename from cores/archie/bench/tests/support/generic_sram_byte_en.v
rename to cores/archie/bench/support/generic_sram_byte_en.v
diff --git a/cores/archie/bench/tests/support/generic_sram_line_en.v b/cores/archie/bench/support/generic_sram_line_en.v
similarity index 100%
rename from cores/archie/bench/tests/support/generic_sram_line_en.v
rename to cores/archie/bench/support/generic_sram_line_en.v
diff --git a/cores/archie/bench/tests/support/global_defines.vh b/cores/archie/bench/support/global_defines.vh
similarity index 100%
rename from cores/archie/bench/tests/support/global_defines.vh
rename to cores/archie/bench/support/global_defines.vh
diff --git a/cores/archie/bench/tests/support/global_timescale.vh b/cores/archie/bench/support/global_timescale.vh
similarity index 100%
rename from cores/archie/bench/tests/support/global_timescale.vh
rename to cores/archie/bench/support/global_timescale.vh
diff --git a/cores/archie/bench/tests/support/memory_configuration.vh b/cores/archie/bench/support/memory_configuration.vh
similarity index 100%
rename from cores/archie/bench/tests/support/memory_configuration.vh
rename to cores/archie/bench/support/memory_configuration.vh
diff --git a/cores/archie/bench/tests/system/Makefile b/cores/archie/bench/system/Makefile
similarity index 100%
rename from cores/archie/bench/tests/system/Makefile
rename to cores/archie/bench/system/Makefile
diff --git a/cores/archie/bench/tests/system/archimedes_top.cpp b/cores/archie/bench/system/archimedes_top.cpp
similarity index 100%
rename from cores/archie/bench/tests/system/archimedes_top.cpp
rename to cores/archie/bench/system/archimedes_top.cpp
diff --git a/cores/archie/bench/tests/tests.workspace b/cores/archie/bench/tests.workspace
similarity index 100%
rename from cores/archie/bench/tests/tests.workspace
rename to cores/archie/bench/tests.workspace
diff --git a/cores/archie/bench/tests/README b/cores/archie/bench/tests/README
deleted file mode 100644
index 237335f..0000000
--- a/cores/archie/bench/tests/README
+++ /dev/null
@@ -1 +0,0 @@
-This is a set of tests that will verify various aspects of the archimedes core. 
\ No newline at end of file
diff --git a/cores/archie/bench/tests/video/Makefile b/cores/archie/bench/video/Makefile
similarity index 100%
rename from cores/archie/bench/tests/video/Makefile
rename to cores/archie/bench/video/Makefile
diff --git a/cores/archie/bench/tests/video/cursor.dat b/cores/archie/bench/video/cursor.dat
similarity index 100%
rename from cores/archie/bench/tests/video/cursor.dat
rename to cores/archie/bench/video/cursor.dat
diff --git a/cores/archie/bench/tests/video/vidc.cpp b/cores/archie/bench/video/vidc.cpp
similarity index 100%
rename from cores/archie/bench/tests/video/vidc.cpp
rename to cores/archie/bench/video/vidc.cpp
diff --git a/cores/archie/bench/tests/video/video.dat b/cores/archie/bench/video/video.dat
similarity index 100%
rename from cores/archie/bench/tests/video/video.dat
rename to cores/archie/bench/video/video.dat
diff --git a/cores/archie/bench/tests/video/video.project b/cores/archie/bench/video/video.project
similarity index 100%
rename from cores/archie/bench/tests/video/video.project
rename to cores/archie/bench/video/video.project
diff --git a/cores/archie/bench/tests/video/video2.dat b/cores/archie/bench/video/video2.dat
similarity index 100%
rename from cores/archie/bench/tests/video/video2.dat
rename to cores/archie/bench/video/video2.dat
diff --git a/cores/archie/bench/tests/video/video28.dat b/cores/archie/bench/video/video28.dat
similarity index 100%
rename from cores/archie/bench/tests/video/video28.dat
rename to cores/archie/bench/video/video28.dat