diff --git a/techlibs/microchip/tests/Registers/Registers.v b/tests/arch/microchip/Registers/Registers.v
similarity index 100%
rename from techlibs/microchip/tests/Registers/Registers.v
rename to tests/arch/microchip/Registers/Registers.v
diff --git a/techlibs/microchip/tests/Registers/Registers.ys b/tests/arch/microchip/Registers/Registers.ys
similarity index 100%
rename from techlibs/microchip/tests/Registers/Registers.ys
rename to tests/arch/microchip/Registers/Registers.ys
diff --git a/techlibs/microchip/tests/carryout/carryout.v b/tests/arch/microchip/carryout/carryout.v
similarity index 100%
rename from techlibs/microchip/tests/carryout/carryout.v
rename to tests/arch/microchip/carryout/carryout.v
diff --git a/techlibs/microchip/tests/carryout/carryout.ys b/tests/arch/microchip/carryout/carryout.ys
similarity index 100%
rename from techlibs/microchip/tests/carryout/carryout.ys
rename to tests/arch/microchip/carryout/carryout.ys
diff --git a/techlibs/microchip/tests/cascade/cascade.v b/tests/arch/microchip/cascade/cascade.v
similarity index 100%
rename from techlibs/microchip/tests/cascade/cascade.v
rename to tests/arch/microchip/cascade/cascade.v
diff --git a/techlibs/microchip/tests/cascade/cascade.ys b/tests/arch/microchip/cascade/cascade.ys
similarity index 100%
rename from techlibs/microchip/tests/cascade/cascade.ys
rename to tests/arch/microchip/cascade/cascade.ys
diff --git a/techlibs/microchip/tests/dff_opt/dff_opt.v b/tests/arch/microchip/dff_opt/dff_opt.v
similarity index 100%
rename from techlibs/microchip/tests/dff_opt/dff_opt.v
rename to tests/arch/microchip/dff_opt/dff_opt.v
diff --git a/techlibs/microchip/tests/dff_opt/dff_opt.ys b/tests/arch/microchip/dff_opt/dff_opt.ys
similarity index 100%
rename from techlibs/microchip/tests/dff_opt/dff_opt.ys
rename to tests/arch/microchip/dff_opt/dff_opt.ys
diff --git a/techlibs/microchip/tests/full_dsp/full_dsp.v b/tests/arch/microchip/full_dsp/full_dsp.v
similarity index 100%
rename from techlibs/microchip/tests/full_dsp/full_dsp.v
rename to tests/arch/microchip/full_dsp/full_dsp.v
diff --git a/techlibs/microchip/tests/full_dsp/full_dsp.ys b/tests/arch/microchip/full_dsp/full_dsp.ys
similarity index 100%
rename from techlibs/microchip/tests/full_dsp/full_dsp.ys
rename to tests/arch/microchip/full_dsp/full_dsp.ys
diff --git a/techlibs/microchip/tests/large_mult/large_mult.v b/tests/arch/microchip/large_mult/large_mult.v
similarity index 100%
rename from techlibs/microchip/tests/large_mult/large_mult.v
rename to tests/arch/microchip/large_mult/large_mult.v
diff --git a/techlibs/microchip/tests/large_mult/large_mult.ys b/tests/arch/microchip/large_mult/large_mult.ys
similarity index 100%
rename from techlibs/microchip/tests/large_mult/large_mult.ys
rename to tests/arch/microchip/large_mult/large_mult.ys
diff --git a/techlibs/microchip/tests/mac/mac.v b/tests/arch/microchip/mac/mac.v
similarity index 100%
rename from techlibs/microchip/tests/mac/mac.v
rename to tests/arch/microchip/mac/mac.v
diff --git a/techlibs/microchip/tests/mac/mac.ys b/tests/arch/microchip/mac/mac.ys
similarity index 100%
rename from techlibs/microchip/tests/mac/mac.ys
rename to tests/arch/microchip/mac/mac.ys
diff --git a/techlibs/microchip/tests/postAdd_mult/postAdd_mult.v b/tests/arch/microchip/postAdd_mult/postAdd_mult.v
similarity index 100%
rename from techlibs/microchip/tests/postAdd_mult/postAdd_mult.v
rename to tests/arch/microchip/postAdd_mult/postAdd_mult.v
diff --git a/techlibs/microchip/tests/postAdd_mult/postAdd_mult.ys b/tests/arch/microchip/postAdd_mult/postAdd_mult.ys
similarity index 100%
rename from techlibs/microchip/tests/postAdd_mult/postAdd_mult.ys
rename to tests/arch/microchip/postAdd_mult/postAdd_mult.ys
diff --git a/techlibs/microchip/tests/post_adder/post_adder.v b/tests/arch/microchip/post_adder/post_adder.v
similarity index 100%
rename from techlibs/microchip/tests/post_adder/post_adder.v
rename to tests/arch/microchip/post_adder/post_adder.v
diff --git a/techlibs/microchip/tests/post_adder/post_adder.ys b/tests/arch/microchip/post_adder/post_adder.ys
similarity index 100%
rename from techlibs/microchip/tests/post_adder/post_adder.ys
rename to tests/arch/microchip/post_adder/post_adder.ys
diff --git a/techlibs/microchip/tests/pre_adder_dsp/pre_adder_dsp.v b/tests/arch/microchip/pre_adder_dsp/pre_adder_dsp.v
similarity index 100%
rename from techlibs/microchip/tests/pre_adder_dsp/pre_adder_dsp.v
rename to tests/arch/microchip/pre_adder_dsp/pre_adder_dsp.v
diff --git a/techlibs/microchip/tests/pre_adder_dsp/pre_adder_dsp.ys b/tests/arch/microchip/pre_adder_dsp/pre_adder_dsp.ys
similarity index 100%
rename from techlibs/microchip/tests/pre_adder_dsp/pre_adder_dsp.ys
rename to tests/arch/microchip/pre_adder_dsp/pre_adder_dsp.ys
diff --git a/techlibs/microchip/tests/ram_SDP/ram_SDP.v b/tests/arch/microchip/ram_SDP/ram_SDP.v
similarity index 100%
rename from techlibs/microchip/tests/ram_SDP/ram_SDP.v
rename to tests/arch/microchip/ram_SDP/ram_SDP.v
diff --git a/techlibs/microchip/tests/ram_SDP/ram_SDP.ys b/tests/arch/microchip/ram_SDP/ram_SDP.ys
similarity index 100%
rename from techlibs/microchip/tests/ram_SDP/ram_SDP.ys
rename to tests/arch/microchip/ram_SDP/ram_SDP.ys
diff --git a/techlibs/microchip/tests/ram_TDP/ram_TDP.v b/tests/arch/microchip/ram_TDP/ram_TDP.v
similarity index 100%
rename from techlibs/microchip/tests/ram_TDP/ram_TDP.v
rename to tests/arch/microchip/ram_TDP/ram_TDP.v
diff --git a/techlibs/microchip/tests/ram_TDP/ram_TDP.ys b/tests/arch/microchip/ram_TDP/ram_TDP.ys
similarity index 100%
rename from techlibs/microchip/tests/ram_TDP/ram_TDP.ys
rename to tests/arch/microchip/ram_TDP/ram_TDP.ys
diff --git a/techlibs/microchip/tests/reduce/reduce.v b/tests/arch/microchip/reduce/reduce.v
similarity index 100%
rename from techlibs/microchip/tests/reduce/reduce.v
rename to tests/arch/microchip/reduce/reduce.v
diff --git a/techlibs/microchip/tests/reduce/reduce.ys b/tests/arch/microchip/reduce/reduce.ys
similarity index 100%
rename from techlibs/microchip/tests/reduce/reduce.ys
rename to tests/arch/microchip/reduce/reduce.ys
diff --git a/techlibs/microchip/tests/reg_c/reg_c.v b/tests/arch/microchip/reg_c/reg_c.v
similarity index 100%
rename from techlibs/microchip/tests/reg_c/reg_c.v
rename to tests/arch/microchip/reg_c/reg_c.v
diff --git a/techlibs/microchip/tests/reg_c/reg_c.ys b/tests/arch/microchip/reg_c/reg_c.ys
similarity index 100%
rename from techlibs/microchip/tests/reg_c/reg_c.ys
rename to tests/arch/microchip/reg_c/reg_c.ys
diff --git a/techlibs/microchip/tests/reg_test/reg_test.v b/tests/arch/microchip/reg_test/reg_test.v
similarity index 100%
rename from techlibs/microchip/tests/reg_test/reg_test.v
rename to tests/arch/microchip/reg_test/reg_test.v
diff --git a/techlibs/microchip/tests/reg_test/reg_test.ys b/tests/arch/microchip/reg_test/reg_test.ys
similarity index 100%
rename from techlibs/microchip/tests/reg_test/reg_test.ys
rename to tests/arch/microchip/reg_test/reg_test.ys
diff --git a/techlibs/microchip/tests/signed_mult/signed_mult.v b/tests/arch/microchip/signed_mult/signed_mult.v
similarity index 100%
rename from techlibs/microchip/tests/signed_mult/signed_mult.v
rename to tests/arch/microchip/signed_mult/signed_mult.v
diff --git a/techlibs/microchip/tests/signed_mult/signed_mult.ys b/tests/arch/microchip/signed_mult/signed_mult.ys
similarity index 100%
rename from techlibs/microchip/tests/signed_mult/signed_mult.ys
rename to tests/arch/microchip/signed_mult/signed_mult.ys
diff --git a/techlibs/microchip/tests/simple_ram/simple_ram.v b/tests/arch/microchip/simple_ram/simple_ram.v
similarity index 100%
rename from techlibs/microchip/tests/simple_ram/simple_ram.v
rename to tests/arch/microchip/simple_ram/simple_ram.v
diff --git a/techlibs/microchip/tests/simple_ram/simple_ram.ys b/tests/arch/microchip/simple_ram/simple_ram.ys
similarity index 100%
rename from techlibs/microchip/tests/simple_ram/simple_ram.ys
rename to tests/arch/microchip/simple_ram/simple_ram.ys
diff --git a/techlibs/microchip/tests/unsigned_mult/unsigned_mult.v b/tests/arch/microchip/unsigned_mult/unsigned_mult.v
similarity index 100%
rename from techlibs/microchip/tests/unsigned_mult/unsigned_mult.v
rename to tests/arch/microchip/unsigned_mult/unsigned_mult.v
diff --git a/techlibs/microchip/tests/unsigned_mult/unsigned_mult.ys b/tests/arch/microchip/unsigned_mult/unsigned_mult.ys
similarity index 100%
rename from techlibs/microchip/tests/unsigned_mult/unsigned_mult.ys
rename to tests/arch/microchip/unsigned_mult/unsigned_mult.ys
diff --git a/techlibs/microchip/tests/uram_ar/uram_ar.v b/tests/arch/microchip/uram_ar/uram_ar.v
similarity index 100%
rename from techlibs/microchip/tests/uram_ar/uram_ar.v
rename to tests/arch/microchip/uram_ar/uram_ar.v
diff --git a/techlibs/microchip/tests/uram_ar/uram_ar.ys b/tests/arch/microchip/uram_ar/uram_ar.ys
similarity index 100%
rename from techlibs/microchip/tests/uram_ar/uram_ar.ys
rename to tests/arch/microchip/uram_ar/uram_ar.ys
diff --git a/techlibs/microchip/tests/uram_sr/uram_sr.v b/tests/arch/microchip/uram_sr/uram_sr.v
similarity index 100%
rename from techlibs/microchip/tests/uram_sr/uram_sr.v
rename to tests/arch/microchip/uram_sr/uram_sr.v
diff --git a/techlibs/microchip/tests/uram_sr/uram_sr.ys b/tests/arch/microchip/uram_sr/uram_sr.ys
similarity index 100%
rename from techlibs/microchip/tests/uram_sr/uram_sr.ys
rename to tests/arch/microchip/uram_sr/uram_sr.ys
diff --git a/techlibs/microchip/tests/widemux/widemux.v b/tests/arch/microchip/widemux/widemux.v
similarity index 100%
rename from techlibs/microchip/tests/widemux/widemux.v
rename to tests/arch/microchip/widemux/widemux.v
diff --git a/techlibs/microchip/tests/widemux/widemux.ys b/tests/arch/microchip/widemux/widemux.ys
similarity index 100%
rename from techlibs/microchip/tests/widemux/widemux.ys
rename to tests/arch/microchip/widemux/widemux.ys