diff --git a/minitests/clb_bused/.gitignore b/fuzzers/011-clb-ffconfig/minitest/.gitignore
similarity index 100%
rename from minitests/clb_bused/.gitignore
rename to fuzzers/011-clb-ffconfig/minitest/.gitignore
diff --git a/minitests/clb_bused/Makefile b/fuzzers/011-clb-ffconfig/minitest/Makefile
similarity index 100%
rename from minitests/clb_bused/Makefile
rename to fuzzers/011-clb-ffconfig/minitest/Makefile
diff --git a/minitests/clb_ffcfg/README.md b/fuzzers/011-clb-ffconfig/minitest/README.md
similarity index 100%
rename from minitests/clb_ffcfg/README.md
rename to fuzzers/011-clb-ffconfig/minitest/README.md
diff --git a/minitests/clb_ffcfg/top.v b/fuzzers/011-clb-ffconfig/minitest/top.v
similarity index 100%
rename from minitests/clb_ffcfg/top.v
rename to fuzzers/011-clb-ffconfig/minitest/top.v
diff --git a/minitests/clb_muxf8/.gitignore b/fuzzers/012-clb-n5ffmux/minitest/.gitignore
similarity index 100%
rename from minitests/clb_muxf8/.gitignore
rename to fuzzers/012-clb-n5ffmux/minitest/.gitignore
diff --git a/minitests/clb_ffcfg/Makefile b/fuzzers/012-clb-n5ffmux/minitest/Makefile
similarity index 100%
rename from minitests/clb_ffcfg/Makefile
rename to fuzzers/012-clb-n5ffmux/minitest/Makefile
diff --git a/minitests/clb_n5ffmux/README.md b/fuzzers/012-clb-n5ffmux/minitest/README.md
similarity index 100%
rename from minitests/clb_n5ffmux/README.md
rename to fuzzers/012-clb-n5ffmux/minitest/README.md
diff --git a/minitests/clb_n5ffmux/top.v b/fuzzers/012-clb-n5ffmux/minitest/top.v
similarity index 100%
rename from minitests/clb_n5ffmux/top.v
rename to fuzzers/012-clb-n5ffmux/minitest/top.v
diff --git a/minitests/clb_n5ffmux/.gitignore b/fuzzers/013-clb-ncy0/minitest/.gitignore
similarity index 100%
rename from minitests/clb_n5ffmux/.gitignore
rename to fuzzers/013-clb-ncy0/minitest/.gitignore
diff --git a/minitests/clb_muxf8/Makefile b/fuzzers/013-clb-ncy0/minitest/Makefile
similarity index 100%
rename from minitests/clb_muxf8/Makefile
rename to fuzzers/013-clb-ncy0/minitest/Makefile
diff --git a/minitests/clb_ncy0/README.md b/fuzzers/013-clb-ncy0/minitest/README.md
similarity index 100%
rename from minitests/clb_ncy0/README.md
rename to fuzzers/013-clb-ncy0/minitest/README.md
diff --git a/minitests/clb_ncy0/top.v b/fuzzers/013-clb-ncy0/minitest/top.v
similarity index 100%
rename from minitests/clb_ncy0/top.v
rename to fuzzers/013-clb-ncy0/minitest/top.v
diff --git a/minitests/clb_ncy0/.gitignore b/fuzzers/015-clb-nffmux/minitest/.gitignore
similarity index 100%
rename from minitests/clb_ncy0/.gitignore
rename to fuzzers/015-clb-nffmux/minitest/.gitignore
diff --git a/minitests/clb_n5ffmux/Makefile b/fuzzers/015-clb-nffmux/minitest/Makefile
similarity index 100%
rename from minitests/clb_n5ffmux/Makefile
rename to fuzzers/015-clb-nffmux/minitest/Makefile
diff --git a/minitests/clb_nffmux/README.md b/fuzzers/015-clb-nffmux/minitest/README.md
similarity index 100%
rename from minitests/clb_nffmux/README.md
rename to fuzzers/015-clb-nffmux/minitest/README.md
diff --git a/minitests/clb_nffmux/top.v b/fuzzers/015-clb-nffmux/minitest/top.v
similarity index 100%
rename from minitests/clb_nffmux/top.v
rename to fuzzers/015-clb-nffmux/minitest/top.v
diff --git a/minitests/clb_ndi1mux/.gitignore b/fuzzers/018-clb-ram/minitest/.gitignore
similarity index 100%
rename from minitests/clb_ndi1mux/.gitignore
rename to fuzzers/018-clb-ram/minitest/.gitignore
diff --git a/minitests/clb_ncy0/Makefile b/fuzzers/018-clb-ram/minitest/Makefile
similarity index 100%
rename from minitests/clb_ncy0/Makefile
rename to fuzzers/018-clb-ram/minitest/Makefile
diff --git a/minitests/clb_ram/README.md b/fuzzers/018-clb-ram/minitest/README.md
similarity index 100%
rename from minitests/clb_ram/README.md
rename to fuzzers/018-clb-ram/minitest/README.md
diff --git a/minitests/clb_ram/top.v b/fuzzers/018-clb-ram/minitest/top.v
similarity index 100%
rename from minitests/clb_ram/top.v
rename to fuzzers/018-clb-ram/minitest/top.v
diff --git a/minitests/clb_nffmux/.gitignore b/fuzzers/019-clb-ndi1mux/minitest/.gitignore
similarity index 100%
rename from minitests/clb_nffmux/.gitignore
rename to fuzzers/019-clb-ndi1mux/minitest/.gitignore
diff --git a/minitests/clb_ndi1mux/Makefile b/fuzzers/019-clb-ndi1mux/minitest/Makefile
similarity index 100%
rename from minitests/clb_ndi1mux/Makefile
rename to fuzzers/019-clb-ndi1mux/minitest/Makefile
diff --git a/minitests/clb_ndi1mux/README.md b/fuzzers/019-clb-ndi1mux/minitest/README.md
similarity index 100%
rename from minitests/clb_ndi1mux/README.md
rename to fuzzers/019-clb-ndi1mux/minitest/README.md
diff --git a/minitests/clb_ndi1mux/top.v b/fuzzers/019-clb-ndi1mux/minitest/top.v
similarity index 100%
rename from minitests/clb_ndi1mux/top.v
rename to fuzzers/019-clb-ndi1mux/minitest/top.v
diff --git a/minitests/clb_ffcfg/.gitignore b/minitests/clb-bused/.gitignore
similarity index 100%
rename from minitests/clb_ffcfg/.gitignore
rename to minitests/clb-bused/.gitignore
diff --git a/minitests/clb_nffmux/Makefile b/minitests/clb-bused/Makefile
similarity index 100%
rename from minitests/clb_nffmux/Makefile
rename to minitests/clb-bused/Makefile
diff --git a/minitests/clb_bused/README.md b/minitests/clb-bused/README.md
similarity index 100%
rename from minitests/clb_bused/README.md
rename to minitests/clb-bused/README.md
diff --git a/minitests/clb_bused/top.v b/minitests/clb-bused/top.v
similarity index 100%
rename from minitests/clb_bused/top.v
rename to minitests/clb-bused/top.v
diff --git a/minitests/carry_cin_cyinit/README b/minitests/clb-carry_cin_cyinit/README
similarity index 100%
rename from minitests/carry_cin_cyinit/README
rename to minitests/clb-carry_cin_cyinit/README
diff --git a/minitests/carry_cin_cyinit/runme.tcl b/minitests/clb-carry_cin_cyinit/runme.tcl
similarity index 100%
rename from minitests/carry_cin_cyinit/runme.tcl
rename to minitests/clb-carry_cin_cyinit/runme.tcl
diff --git a/minitests/carry_cin_cyinit/top.v b/minitests/clb-carry_cin_cyinit/top.v
similarity index 100%
rename from minitests/carry_cin_cyinit/top.v
rename to minitests/clb-carry_cin_cyinit/top.v
diff --git a/minitests/clbconfigs/.gitignore b/minitests/clb-configs/.gitignore
similarity index 100%
rename from minitests/clbconfigs/.gitignore
rename to minitests/clb-configs/.gitignore
diff --git a/minitests/clbconfigs/README b/minitests/clb-configs/README
similarity index 100%
rename from minitests/clbconfigs/README
rename to minitests/clb-configs/README
diff --git a/minitests/clbconfigs/runme.sh b/minitests/clb-configs/runme.sh
similarity index 100%
rename from minitests/clbconfigs/runme.sh
rename to minitests/clb-configs/runme.sh
diff --git a/minitests/clbconfigs/runme.tcl b/minitests/clb-configs/runme.tcl
similarity index 100%
rename from minitests/clbconfigs/runme.tcl
rename to minitests/clb-configs/runme.tcl
diff --git a/minitests/clbconfigs/top.v b/minitests/clb-configs/top.v
similarity index 100%
rename from minitests/clbconfigs/top.v
rename to minitests/clb-configs/top.v
diff --git a/minitests/clb_ram/.gitignore b/minitests/clb-muxf8/.gitignore
similarity index 100%
rename from minitests/clb_ram/.gitignore
rename to minitests/clb-muxf8/.gitignore
diff --git a/minitests/clb_ram/Makefile b/minitests/clb-muxf8/Makefile
similarity index 100%
rename from minitests/clb_ram/Makefile
rename to minitests/clb-muxf8/Makefile
diff --git a/minitests/clb_muxf8/README.md b/minitests/clb-muxf8/README.md
similarity index 100%
rename from minitests/clb_muxf8/README.md
rename to minitests/clb-muxf8/README.md
diff --git a/minitests/clb_muxf8/top.v b/minitests/clb-muxf8/top.v
similarity index 100%
rename from minitests/clb_muxf8/top.v
rename to minitests/clb-muxf8/top.v
diff --git a/minitests/switchboxes/.gitignore b/minitests/pip-switchboxes/.gitignore
similarity index 100%
rename from minitests/switchboxes/.gitignore
rename to minitests/pip-switchboxes/.gitignore
diff --git a/minitests/switchboxes/README b/minitests/pip-switchboxes/README
similarity index 100%
rename from minitests/switchboxes/README
rename to minitests/pip-switchboxes/README
diff --git a/minitests/switchboxes/pips.tcl b/minitests/pip-switchboxes/pips.tcl
similarity index 100%
rename from minitests/switchboxes/pips.tcl
rename to minitests/pip-switchboxes/pips.tcl
diff --git a/minitests/switchboxes/routes.tcl b/minitests/pip-switchboxes/routes.tcl
similarity index 100%
rename from minitests/switchboxes/routes.tcl
rename to minitests/pip-switchboxes/routes.tcl
diff --git a/minitests/switchboxes/runme.sh b/minitests/pip-switchboxes/runme.sh
similarity index 100%
rename from minitests/switchboxes/runme.sh
rename to minitests/pip-switchboxes/runme.sh
diff --git a/minitests/switchboxes/runme.tcl b/minitests/pip-switchboxes/runme.tcl
similarity index 100%
rename from minitests/switchboxes/runme.tcl
rename to minitests/pip-switchboxes/runme.tcl
diff --git a/minitests/switchboxes/top.v b/minitests/pip-switchboxes/top.v
similarity index 100%
rename from minitests/switchboxes/top.v
rename to minitests/pip-switchboxes/top.v