diff --git a/Makefile b/Makefile
index 70d683c34..a24f19b6a 100644
--- a/Makefile
+++ b/Makefile
@@ -713,12 +713,12 @@ test: $(TARGETS) $(EXTRA_TARGETS)
 	+cd tests/opt && bash run-test.sh
 	+cd tests/aiger && bash run-test.sh $(ABCOPT)
 	+cd tests/arch && bash run-test.sh
-	+cd tests/ice40 && bash run-test.sh $(SEEDOPT)
+	+cd tests/arch/ice40 && bash run-test.sh $(SEEDOPT)
+	+cd tests/arch/xilinx && bash run-test.sh $(SEEDOPT)
+	+cd tests/arch/ecp5 && bash run-test.sh $(SEEDOPT)
+	+cd tests/arch/efinix && bash run-test.sh $(SEEDOPT)
+	+cd tests/arch/anlogic && bash run-test.sh $(SEEDOPT)
 	+cd tests/rpc && bash run-test.sh
-	+cd tests/efinix && bash run-test.sh $(SEEDOPT)
-	+cd tests/anlogic && bash run-test.sh $(SEEDOPT)
-	+cd tests/ecp5 && bash run-test.sh $(SEEDOPT)
-	+cd tests/xilinx && bash run-test.sh $(SEEDOPT)
 	@echo ""
 	@echo "  Passed \"make test\"."
 	@echo ""
diff --git a/tests/anlogic/.gitignore b/tests/arch/anlogic/.gitignore
similarity index 100%
rename from tests/anlogic/.gitignore
rename to tests/arch/anlogic/.gitignore
diff --git a/tests/anlogic/add_sub.v b/tests/arch/anlogic/add_sub.v
similarity index 100%
rename from tests/anlogic/add_sub.v
rename to tests/arch/anlogic/add_sub.v
diff --git a/tests/anlogic/add_sub.ys b/tests/arch/anlogic/add_sub.ys
similarity index 100%
rename from tests/anlogic/add_sub.ys
rename to tests/arch/anlogic/add_sub.ys
diff --git a/tests/anlogic/counter.v b/tests/arch/anlogic/counter.v
similarity index 100%
rename from tests/anlogic/counter.v
rename to tests/arch/anlogic/counter.v
diff --git a/tests/anlogic/counter.ys b/tests/arch/anlogic/counter.ys
similarity index 100%
rename from tests/anlogic/counter.ys
rename to tests/arch/anlogic/counter.ys
diff --git a/tests/anlogic/dffs.v b/tests/arch/anlogic/dffs.v
similarity index 100%
rename from tests/anlogic/dffs.v
rename to tests/arch/anlogic/dffs.v
diff --git a/tests/anlogic/dffs.ys b/tests/arch/anlogic/dffs.ys
similarity index 100%
rename from tests/anlogic/dffs.ys
rename to tests/arch/anlogic/dffs.ys
diff --git a/tests/anlogic/fsm.v b/tests/arch/anlogic/fsm.v
similarity index 100%
rename from tests/anlogic/fsm.v
rename to tests/arch/anlogic/fsm.v
diff --git a/tests/anlogic/fsm.ys b/tests/arch/anlogic/fsm.ys
similarity index 100%
rename from tests/anlogic/fsm.ys
rename to tests/arch/anlogic/fsm.ys
diff --git a/tests/anlogic/latches.v b/tests/arch/anlogic/latches.v
similarity index 100%
rename from tests/anlogic/latches.v
rename to tests/arch/anlogic/latches.v
diff --git a/tests/anlogic/latches.ys b/tests/arch/anlogic/latches.ys
similarity index 100%
rename from tests/anlogic/latches.ys
rename to tests/arch/anlogic/latches.ys
diff --git a/tests/anlogic/memory.v b/tests/arch/anlogic/memory.v
similarity index 100%
rename from tests/anlogic/memory.v
rename to tests/arch/anlogic/memory.v
diff --git a/tests/anlogic/memory.ys b/tests/arch/anlogic/memory.ys
similarity index 100%
rename from tests/anlogic/memory.ys
rename to tests/arch/anlogic/memory.ys
diff --git a/tests/anlogic/mux.v b/tests/arch/anlogic/mux.v
similarity index 100%
rename from tests/anlogic/mux.v
rename to tests/arch/anlogic/mux.v
diff --git a/tests/anlogic/mux.ys b/tests/arch/anlogic/mux.ys
similarity index 100%
rename from tests/anlogic/mux.ys
rename to tests/arch/anlogic/mux.ys
diff --git a/tests/anlogic/run-test.sh b/tests/arch/anlogic/run-test.sh
similarity index 100%
rename from tests/anlogic/run-test.sh
rename to tests/arch/anlogic/run-test.sh
diff --git a/tests/anlogic/shifter.v b/tests/arch/anlogic/shifter.v
similarity index 100%
rename from tests/anlogic/shifter.v
rename to tests/arch/anlogic/shifter.v
diff --git a/tests/anlogic/shifter.ys b/tests/arch/anlogic/shifter.ys
similarity index 100%
rename from tests/anlogic/shifter.ys
rename to tests/arch/anlogic/shifter.ys
diff --git a/tests/anlogic/tribuf.v b/tests/arch/anlogic/tribuf.v
similarity index 100%
rename from tests/anlogic/tribuf.v
rename to tests/arch/anlogic/tribuf.v
diff --git a/tests/anlogic/tribuf.ys b/tests/arch/anlogic/tribuf.ys
similarity index 100%
rename from tests/anlogic/tribuf.ys
rename to tests/arch/anlogic/tribuf.ys
diff --git a/tests/ecp5/.gitignore b/tests/arch/ecp5/.gitignore
similarity index 100%
rename from tests/ecp5/.gitignore
rename to tests/arch/ecp5/.gitignore
diff --git a/tests/ecp5/add_sub.v b/tests/arch/ecp5/add_sub.v
similarity index 100%
rename from tests/ecp5/add_sub.v
rename to tests/arch/ecp5/add_sub.v
diff --git a/tests/ecp5/add_sub.ys b/tests/arch/ecp5/add_sub.ys
similarity index 100%
rename from tests/ecp5/add_sub.ys
rename to tests/arch/ecp5/add_sub.ys
diff --git a/tests/ecp5/adffs.v b/tests/arch/ecp5/adffs.v
similarity index 100%
rename from tests/ecp5/adffs.v
rename to tests/arch/ecp5/adffs.v
diff --git a/tests/ecp5/adffs.ys b/tests/arch/ecp5/adffs.ys
similarity index 100%
rename from tests/ecp5/adffs.ys
rename to tests/arch/ecp5/adffs.ys
diff --git a/tests/ecp5/counter.v b/tests/arch/ecp5/counter.v
similarity index 100%
rename from tests/ecp5/counter.v
rename to tests/arch/ecp5/counter.v
diff --git a/tests/ecp5/counter.ys b/tests/arch/ecp5/counter.ys
similarity index 100%
rename from tests/ecp5/counter.ys
rename to tests/arch/ecp5/counter.ys
diff --git a/tests/ecp5/dffs.v b/tests/arch/ecp5/dffs.v
similarity index 100%
rename from tests/ecp5/dffs.v
rename to tests/arch/ecp5/dffs.v
diff --git a/tests/ecp5/dffs.ys b/tests/arch/ecp5/dffs.ys
similarity index 100%
rename from tests/ecp5/dffs.ys
rename to tests/arch/ecp5/dffs.ys
diff --git a/tests/ecp5/dpram.v b/tests/arch/ecp5/dpram.v
similarity index 100%
rename from tests/ecp5/dpram.v
rename to tests/arch/ecp5/dpram.v
diff --git a/tests/ecp5/dpram.ys b/tests/arch/ecp5/dpram.ys
similarity index 100%
rename from tests/ecp5/dpram.ys
rename to tests/arch/ecp5/dpram.ys
diff --git a/tests/ecp5/fsm.v b/tests/arch/ecp5/fsm.v
similarity index 100%
rename from tests/ecp5/fsm.v
rename to tests/arch/ecp5/fsm.v
diff --git a/tests/ecp5/fsm.ys b/tests/arch/ecp5/fsm.ys
similarity index 100%
rename from tests/ecp5/fsm.ys
rename to tests/arch/ecp5/fsm.ys
diff --git a/tests/ecp5/latches.v b/tests/arch/ecp5/latches.v
similarity index 100%
rename from tests/ecp5/latches.v
rename to tests/arch/ecp5/latches.v
diff --git a/tests/ecp5/latches.ys b/tests/arch/ecp5/latches.ys
similarity index 100%
rename from tests/ecp5/latches.ys
rename to tests/arch/ecp5/latches.ys
diff --git a/tests/ecp5/logic.v b/tests/arch/ecp5/logic.v
similarity index 100%
rename from tests/ecp5/logic.v
rename to tests/arch/ecp5/logic.v
diff --git a/tests/ecp5/logic.ys b/tests/arch/ecp5/logic.ys
similarity index 100%
rename from tests/ecp5/logic.ys
rename to tests/arch/ecp5/logic.ys
diff --git a/tests/ecp5/macc.v b/tests/arch/ecp5/macc.v
similarity index 100%
rename from tests/ecp5/macc.v
rename to tests/arch/ecp5/macc.v
diff --git a/tests/ecp5/macc.ys b/tests/arch/ecp5/macc.ys
similarity index 100%
rename from tests/ecp5/macc.ys
rename to tests/arch/ecp5/macc.ys
diff --git a/tests/ecp5/memory.v b/tests/arch/ecp5/memory.v
similarity index 100%
rename from tests/ecp5/memory.v
rename to tests/arch/ecp5/memory.v
diff --git a/tests/ecp5/memory.ys b/tests/arch/ecp5/memory.ys
similarity index 100%
rename from tests/ecp5/memory.ys
rename to tests/arch/ecp5/memory.ys
diff --git a/tests/ecp5/mul.v b/tests/arch/ecp5/mul.v
similarity index 100%
rename from tests/ecp5/mul.v
rename to tests/arch/ecp5/mul.v
diff --git a/tests/ecp5/mul.ys b/tests/arch/ecp5/mul.ys
similarity index 100%
rename from tests/ecp5/mul.ys
rename to tests/arch/ecp5/mul.ys
diff --git a/tests/ecp5/mux.v b/tests/arch/ecp5/mux.v
similarity index 100%
rename from tests/ecp5/mux.v
rename to tests/arch/ecp5/mux.v
diff --git a/tests/ecp5/mux.ys b/tests/arch/ecp5/mux.ys
similarity index 100%
rename from tests/ecp5/mux.ys
rename to tests/arch/ecp5/mux.ys
diff --git a/tests/ecp5/rom.v b/tests/arch/ecp5/rom.v
similarity index 100%
rename from tests/ecp5/rom.v
rename to tests/arch/ecp5/rom.v
diff --git a/tests/ecp5/rom.ys b/tests/arch/ecp5/rom.ys
similarity index 100%
rename from tests/ecp5/rom.ys
rename to tests/arch/ecp5/rom.ys
diff --git a/tests/ecp5/run-test.sh b/tests/arch/ecp5/run-test.sh
similarity index 100%
rename from tests/ecp5/run-test.sh
rename to tests/arch/ecp5/run-test.sh
diff --git a/tests/ecp5/shifter.v b/tests/arch/ecp5/shifter.v
similarity index 100%
rename from tests/ecp5/shifter.v
rename to tests/arch/ecp5/shifter.v
diff --git a/tests/ecp5/shifter.ys b/tests/arch/ecp5/shifter.ys
similarity index 100%
rename from tests/ecp5/shifter.ys
rename to tests/arch/ecp5/shifter.ys
diff --git a/tests/ecp5/tribuf.v b/tests/arch/ecp5/tribuf.v
similarity index 100%
rename from tests/ecp5/tribuf.v
rename to tests/arch/ecp5/tribuf.v
diff --git a/tests/ecp5/tribuf.ys b/tests/arch/ecp5/tribuf.ys
similarity index 100%
rename from tests/ecp5/tribuf.ys
rename to tests/arch/ecp5/tribuf.ys
diff --git a/tests/efinix/.gitignore b/tests/arch/efinix/.gitignore
similarity index 100%
rename from tests/efinix/.gitignore
rename to tests/arch/efinix/.gitignore
diff --git a/tests/efinix/add_sub.v b/tests/arch/efinix/add_sub.v
similarity index 100%
rename from tests/efinix/add_sub.v
rename to tests/arch/efinix/add_sub.v
diff --git a/tests/efinix/add_sub.ys b/tests/arch/efinix/add_sub.ys
similarity index 100%
rename from tests/efinix/add_sub.ys
rename to tests/arch/efinix/add_sub.ys
diff --git a/tests/efinix/adffs.v b/tests/arch/efinix/adffs.v
similarity index 100%
rename from tests/efinix/adffs.v
rename to tests/arch/efinix/adffs.v
diff --git a/tests/efinix/adffs.ys b/tests/arch/efinix/adffs.ys
similarity index 100%
rename from tests/efinix/adffs.ys
rename to tests/arch/efinix/adffs.ys
diff --git a/tests/efinix/counter.v b/tests/arch/efinix/counter.v
similarity index 100%
rename from tests/efinix/counter.v
rename to tests/arch/efinix/counter.v
diff --git a/tests/efinix/counter.ys b/tests/arch/efinix/counter.ys
similarity index 100%
rename from tests/efinix/counter.ys
rename to tests/arch/efinix/counter.ys
diff --git a/tests/efinix/dffs.v b/tests/arch/efinix/dffs.v
similarity index 100%
rename from tests/efinix/dffs.v
rename to tests/arch/efinix/dffs.v
diff --git a/tests/efinix/dffs.ys b/tests/arch/efinix/dffs.ys
similarity index 100%
rename from tests/efinix/dffs.ys
rename to tests/arch/efinix/dffs.ys
diff --git a/tests/efinix/fsm.v b/tests/arch/efinix/fsm.v
similarity index 100%
rename from tests/efinix/fsm.v
rename to tests/arch/efinix/fsm.v
diff --git a/tests/efinix/fsm.ys b/tests/arch/efinix/fsm.ys
similarity index 100%
rename from tests/efinix/fsm.ys
rename to tests/arch/efinix/fsm.ys
diff --git a/tests/efinix/latches.v b/tests/arch/efinix/latches.v
similarity index 100%
rename from tests/efinix/latches.v
rename to tests/arch/efinix/latches.v
diff --git a/tests/efinix/latches.ys b/tests/arch/efinix/latches.ys
similarity index 100%
rename from tests/efinix/latches.ys
rename to tests/arch/efinix/latches.ys
diff --git a/tests/efinix/logic.v b/tests/arch/efinix/logic.v
similarity index 100%
rename from tests/efinix/logic.v
rename to tests/arch/efinix/logic.v
diff --git a/tests/efinix/logic.ys b/tests/arch/efinix/logic.ys
similarity index 100%
rename from tests/efinix/logic.ys
rename to tests/arch/efinix/logic.ys
diff --git a/tests/efinix/memory.v b/tests/arch/efinix/memory.v
similarity index 100%
rename from tests/efinix/memory.v
rename to tests/arch/efinix/memory.v
diff --git a/tests/efinix/memory.ys b/tests/arch/efinix/memory.ys
similarity index 100%
rename from tests/efinix/memory.ys
rename to tests/arch/efinix/memory.ys
diff --git a/tests/efinix/mux.v b/tests/arch/efinix/mux.v
similarity index 100%
rename from tests/efinix/mux.v
rename to tests/arch/efinix/mux.v
diff --git a/tests/efinix/mux.ys b/tests/arch/efinix/mux.ys
similarity index 100%
rename from tests/efinix/mux.ys
rename to tests/arch/efinix/mux.ys
diff --git a/tests/efinix/run-test.sh b/tests/arch/efinix/run-test.sh
similarity index 100%
rename from tests/efinix/run-test.sh
rename to tests/arch/efinix/run-test.sh
diff --git a/tests/efinix/shifter.v b/tests/arch/efinix/shifter.v
similarity index 100%
rename from tests/efinix/shifter.v
rename to tests/arch/efinix/shifter.v
diff --git a/tests/efinix/shifter.ys b/tests/arch/efinix/shifter.ys
similarity index 100%
rename from tests/efinix/shifter.ys
rename to tests/arch/efinix/shifter.ys
diff --git a/tests/efinix/tribuf.v b/tests/arch/efinix/tribuf.v
similarity index 100%
rename from tests/efinix/tribuf.v
rename to tests/arch/efinix/tribuf.v
diff --git a/tests/efinix/tribuf.ys b/tests/arch/efinix/tribuf.ys
similarity index 100%
rename from tests/efinix/tribuf.ys
rename to tests/arch/efinix/tribuf.ys
diff --git a/tests/ice40/.gitignore b/tests/arch/ice40/.gitignore
similarity index 100%
rename from tests/ice40/.gitignore
rename to tests/arch/ice40/.gitignore
diff --git a/tests/ice40/add_sub.v b/tests/arch/ice40/add_sub.v
similarity index 100%
rename from tests/ice40/add_sub.v
rename to tests/arch/ice40/add_sub.v
diff --git a/tests/ice40/add_sub.ys b/tests/arch/ice40/add_sub.ys
similarity index 100%
rename from tests/ice40/add_sub.ys
rename to tests/arch/ice40/add_sub.ys
diff --git a/tests/ice40/adffs.v b/tests/arch/ice40/adffs.v
similarity index 100%
rename from tests/ice40/adffs.v
rename to tests/arch/ice40/adffs.v
diff --git a/tests/ice40/adffs.ys b/tests/arch/ice40/adffs.ys
similarity index 100%
rename from tests/ice40/adffs.ys
rename to tests/arch/ice40/adffs.ys
diff --git a/tests/ice40/alu.v b/tests/arch/ice40/alu.v
similarity index 100%
rename from tests/ice40/alu.v
rename to tests/arch/ice40/alu.v
diff --git a/tests/ice40/alu.ys b/tests/arch/ice40/alu.ys
similarity index 100%
rename from tests/ice40/alu.ys
rename to tests/arch/ice40/alu.ys
diff --git a/tests/ice40/counter.v b/tests/arch/ice40/counter.v
similarity index 100%
rename from tests/ice40/counter.v
rename to tests/arch/ice40/counter.v
diff --git a/tests/ice40/counter.ys b/tests/arch/ice40/counter.ys
similarity index 100%
rename from tests/ice40/counter.ys
rename to tests/arch/ice40/counter.ys
diff --git a/tests/ice40/dffs.v b/tests/arch/ice40/dffs.v
similarity index 100%
rename from tests/ice40/dffs.v
rename to tests/arch/ice40/dffs.v
diff --git a/tests/ice40/dffs.ys b/tests/arch/ice40/dffs.ys
similarity index 100%
rename from tests/ice40/dffs.ys
rename to tests/arch/ice40/dffs.ys
diff --git a/tests/ice40/div_mod.v b/tests/arch/ice40/div_mod.v
similarity index 100%
rename from tests/ice40/div_mod.v
rename to tests/arch/ice40/div_mod.v
diff --git a/tests/ice40/div_mod.ys b/tests/arch/ice40/div_mod.ys
similarity index 100%
rename from tests/ice40/div_mod.ys
rename to tests/arch/ice40/div_mod.ys
diff --git a/tests/ice40/dpram.v b/tests/arch/ice40/dpram.v
similarity index 100%
rename from tests/ice40/dpram.v
rename to tests/arch/ice40/dpram.v
diff --git a/tests/ice40/dpram.ys b/tests/arch/ice40/dpram.ys
similarity index 100%
rename from tests/ice40/dpram.ys
rename to tests/arch/ice40/dpram.ys
diff --git a/tests/ice40/fsm.v b/tests/arch/ice40/fsm.v
similarity index 100%
rename from tests/ice40/fsm.v
rename to tests/arch/ice40/fsm.v
diff --git a/tests/ice40/fsm.ys b/tests/arch/ice40/fsm.ys
similarity index 100%
rename from tests/ice40/fsm.ys
rename to tests/arch/ice40/fsm.ys
diff --git a/tests/ice40/ice40_opt.ys b/tests/arch/ice40/ice40_opt.ys
similarity index 100%
rename from tests/ice40/ice40_opt.ys
rename to tests/arch/ice40/ice40_opt.ys
diff --git a/tests/ice40/latches.v b/tests/arch/ice40/latches.v
similarity index 100%
rename from tests/ice40/latches.v
rename to tests/arch/ice40/latches.v
diff --git a/tests/ice40/latches.ys b/tests/arch/ice40/latches.ys
similarity index 100%
rename from tests/ice40/latches.ys
rename to tests/arch/ice40/latches.ys
diff --git a/tests/ice40/logic.v b/tests/arch/ice40/logic.v
similarity index 100%
rename from tests/ice40/logic.v
rename to tests/arch/ice40/logic.v
diff --git a/tests/ice40/logic.ys b/tests/arch/ice40/logic.ys
similarity index 100%
rename from tests/ice40/logic.ys
rename to tests/arch/ice40/logic.ys
diff --git a/tests/ice40/macc.v b/tests/arch/ice40/macc.v
similarity index 100%
rename from tests/ice40/macc.v
rename to tests/arch/ice40/macc.v
diff --git a/tests/ice40/macc.ys b/tests/arch/ice40/macc.ys
similarity index 100%
rename from tests/ice40/macc.ys
rename to tests/arch/ice40/macc.ys
diff --git a/tests/ice40/memory.v b/tests/arch/ice40/memory.v
similarity index 100%
rename from tests/ice40/memory.v
rename to tests/arch/ice40/memory.v
diff --git a/tests/ice40/memory.ys b/tests/arch/ice40/memory.ys
similarity index 100%
rename from tests/ice40/memory.ys
rename to tests/arch/ice40/memory.ys
diff --git a/tests/ice40/mul.v b/tests/arch/ice40/mul.v
similarity index 100%
rename from tests/ice40/mul.v
rename to tests/arch/ice40/mul.v
diff --git a/tests/ice40/mul.ys b/tests/arch/ice40/mul.ys
similarity index 100%
rename from tests/ice40/mul.ys
rename to tests/arch/ice40/mul.ys
diff --git a/tests/ice40/mux.v b/tests/arch/ice40/mux.v
similarity index 100%
rename from tests/ice40/mux.v
rename to tests/arch/ice40/mux.v
diff --git a/tests/ice40/mux.ys b/tests/arch/ice40/mux.ys
similarity index 100%
rename from tests/ice40/mux.ys
rename to tests/arch/ice40/mux.ys
diff --git a/tests/ice40/rom.v b/tests/arch/ice40/rom.v
similarity index 100%
rename from tests/ice40/rom.v
rename to tests/arch/ice40/rom.v
diff --git a/tests/ice40/rom.ys b/tests/arch/ice40/rom.ys
similarity index 100%
rename from tests/ice40/rom.ys
rename to tests/arch/ice40/rom.ys
diff --git a/tests/ice40/run-test.sh b/tests/arch/ice40/run-test.sh
similarity index 100%
rename from tests/ice40/run-test.sh
rename to tests/arch/ice40/run-test.sh
diff --git a/tests/ice40/shifter.v b/tests/arch/ice40/shifter.v
similarity index 100%
rename from tests/ice40/shifter.v
rename to tests/arch/ice40/shifter.v
diff --git a/tests/ice40/shifter.ys b/tests/arch/ice40/shifter.ys
similarity index 100%
rename from tests/ice40/shifter.ys
rename to tests/arch/ice40/shifter.ys
diff --git a/tests/ice40/tribuf.v b/tests/arch/ice40/tribuf.v
similarity index 100%
rename from tests/ice40/tribuf.v
rename to tests/arch/ice40/tribuf.v
diff --git a/tests/ice40/tribuf.ys b/tests/arch/ice40/tribuf.ys
similarity index 100%
rename from tests/ice40/tribuf.ys
rename to tests/arch/ice40/tribuf.ys
diff --git a/tests/ice40/wrapcarry.ys b/tests/arch/ice40/wrapcarry.ys
similarity index 100%
rename from tests/ice40/wrapcarry.ys
rename to tests/arch/ice40/wrapcarry.ys
diff --git a/tests/xilinx/.gitignore b/tests/arch/xilinx/.gitignore
similarity index 100%
rename from tests/xilinx/.gitignore
rename to tests/arch/xilinx/.gitignore
diff --git a/tests/xilinx/add_sub.v b/tests/arch/xilinx/add_sub.v
similarity index 100%
rename from tests/xilinx/add_sub.v
rename to tests/arch/xilinx/add_sub.v
diff --git a/tests/xilinx/add_sub.ys b/tests/arch/xilinx/add_sub.ys
similarity index 100%
rename from tests/xilinx/add_sub.ys
rename to tests/arch/xilinx/add_sub.ys
diff --git a/tests/xilinx/adffs.v b/tests/arch/xilinx/adffs.v
similarity index 100%
rename from tests/xilinx/adffs.v
rename to tests/arch/xilinx/adffs.v
diff --git a/tests/xilinx/adffs.ys b/tests/arch/xilinx/adffs.ys
similarity index 100%
rename from tests/xilinx/adffs.ys
rename to tests/arch/xilinx/adffs.ys
diff --git a/tests/xilinx/counter.v b/tests/arch/xilinx/counter.v
similarity index 100%
rename from tests/xilinx/counter.v
rename to tests/arch/xilinx/counter.v
diff --git a/tests/xilinx/counter.ys b/tests/arch/xilinx/counter.ys
similarity index 100%
rename from tests/xilinx/counter.ys
rename to tests/arch/xilinx/counter.ys
diff --git a/tests/xilinx/dffs.v b/tests/arch/xilinx/dffs.v
similarity index 100%
rename from tests/xilinx/dffs.v
rename to tests/arch/xilinx/dffs.v
diff --git a/tests/xilinx/dffs.ys b/tests/arch/xilinx/dffs.ys
similarity index 100%
rename from tests/xilinx/dffs.ys
rename to tests/arch/xilinx/dffs.ys
diff --git a/tests/xilinx/dsp_simd.ys b/tests/arch/xilinx/dsp_simd.ys
similarity index 100%
rename from tests/xilinx/dsp_simd.ys
rename to tests/arch/xilinx/dsp_simd.ys
diff --git a/tests/xilinx/fsm.v b/tests/arch/xilinx/fsm.v
similarity index 100%
rename from tests/xilinx/fsm.v
rename to tests/arch/xilinx/fsm.v
diff --git a/tests/xilinx/fsm.ys b/tests/arch/xilinx/fsm.ys
similarity index 100%
rename from tests/xilinx/fsm.ys
rename to tests/arch/xilinx/fsm.ys
diff --git a/tests/xilinx/latches.v b/tests/arch/xilinx/latches.v
similarity index 100%
rename from tests/xilinx/latches.v
rename to tests/arch/xilinx/latches.v
diff --git a/tests/xilinx/latches.ys b/tests/arch/xilinx/latches.ys
similarity index 100%
rename from tests/xilinx/latches.ys
rename to tests/arch/xilinx/latches.ys
diff --git a/tests/xilinx/logic.v b/tests/arch/xilinx/logic.v
similarity index 100%
rename from tests/xilinx/logic.v
rename to tests/arch/xilinx/logic.v
diff --git a/tests/xilinx/logic.ys b/tests/arch/xilinx/logic.ys
similarity index 100%
rename from tests/xilinx/logic.ys
rename to tests/arch/xilinx/logic.ys
diff --git a/tests/xilinx/macc.sh b/tests/arch/xilinx/macc.sh
similarity index 100%
rename from tests/xilinx/macc.sh
rename to tests/arch/xilinx/macc.sh
diff --git a/tests/xilinx/macc.v b/tests/arch/xilinx/macc.v
similarity index 100%
rename from tests/xilinx/macc.v
rename to tests/arch/xilinx/macc.v
diff --git a/tests/xilinx/macc.ys b/tests/arch/xilinx/macc.ys
similarity index 100%
rename from tests/xilinx/macc.ys
rename to tests/arch/xilinx/macc.ys
diff --git a/tests/xilinx/macc_tb.v b/tests/arch/xilinx/macc_tb.v
similarity index 100%
rename from tests/xilinx/macc_tb.v
rename to tests/arch/xilinx/macc_tb.v
diff --git a/tests/xilinx/memory.v b/tests/arch/xilinx/memory.v
similarity index 100%
rename from tests/xilinx/memory.v
rename to tests/arch/xilinx/memory.v
diff --git a/tests/xilinx/memory.ys b/tests/arch/xilinx/memory.ys
similarity index 100%
rename from tests/xilinx/memory.ys
rename to tests/arch/xilinx/memory.ys
diff --git a/tests/xilinx/mul.v b/tests/arch/xilinx/mul.v
similarity index 100%
rename from tests/xilinx/mul.v
rename to tests/arch/xilinx/mul.v
diff --git a/tests/xilinx/mul.ys b/tests/arch/xilinx/mul.ys
similarity index 100%
rename from tests/xilinx/mul.ys
rename to tests/arch/xilinx/mul.ys
diff --git a/tests/xilinx/mul_unsigned.v b/tests/arch/xilinx/mul_unsigned.v
similarity index 100%
rename from tests/xilinx/mul_unsigned.v
rename to tests/arch/xilinx/mul_unsigned.v
diff --git a/tests/xilinx/mul_unsigned.ys b/tests/arch/xilinx/mul_unsigned.ys
similarity index 100%
rename from tests/xilinx/mul_unsigned.ys
rename to tests/arch/xilinx/mul_unsigned.ys
diff --git a/tests/xilinx/mux.v b/tests/arch/xilinx/mux.v
similarity index 100%
rename from tests/xilinx/mux.v
rename to tests/arch/xilinx/mux.v
diff --git a/tests/xilinx/mux.ys b/tests/arch/xilinx/mux.ys
similarity index 100%
rename from tests/xilinx/mux.ys
rename to tests/arch/xilinx/mux.ys
diff --git a/tests/xilinx/pmgen_xilinx_srl.ys b/tests/arch/xilinx/pmgen_xilinx_srl.ys
similarity index 100%
rename from tests/xilinx/pmgen_xilinx_srl.ys
rename to tests/arch/xilinx/pmgen_xilinx_srl.ys
diff --git a/tests/xilinx/run-test.sh b/tests/arch/xilinx/run-test.sh
similarity index 100%
rename from tests/xilinx/run-test.sh
rename to tests/arch/xilinx/run-test.sh
diff --git a/tests/xilinx/shifter.v b/tests/arch/xilinx/shifter.v
similarity index 100%
rename from tests/xilinx/shifter.v
rename to tests/arch/xilinx/shifter.v
diff --git a/tests/xilinx/shifter.ys b/tests/arch/xilinx/shifter.ys
similarity index 100%
rename from tests/xilinx/shifter.ys
rename to tests/arch/xilinx/shifter.ys
diff --git a/tests/xilinx/tribuf.v b/tests/arch/xilinx/tribuf.v
similarity index 100%
rename from tests/xilinx/tribuf.v
rename to tests/arch/xilinx/tribuf.v
diff --git a/tests/xilinx/tribuf.ys b/tests/arch/xilinx/tribuf.ys
similarity index 100%
rename from tests/xilinx/tribuf.ys
rename to tests/arch/xilinx/tribuf.ys
diff --git a/tests/xilinx/xilinx_srl.v b/tests/arch/xilinx/xilinx_srl.v
similarity index 100%
rename from tests/xilinx/xilinx_srl.v
rename to tests/arch/xilinx/xilinx_srl.v
diff --git a/tests/xilinx/xilinx_srl.ys b/tests/arch/xilinx/xilinx_srl.ys
similarity index 100%
rename from tests/xilinx/xilinx_srl.ys
rename to tests/arch/xilinx/xilinx_srl.ys