diff --git a/lib/misc/async_port_wb.vhd b/lib/JBUS/src/async_port/async_port_wb.vhd
similarity index 100%
rename from lib/misc/async_port_wb.vhd
rename to lib/JBUS/src/async_port/async_port_wb.vhd
diff --git a/lib/misc/async_types.vhd b/lib/JBUS/src/async_port/async_types.vhd
similarity index 100%
rename from lib/misc/async_types.vhd
rename to lib/JBUS/src/async_port/async_types.vhd
diff --git a/lib/misc/flash_port_wb.vhd b/lib/JBUS/src/flash_port/flash_port_wb.vhd
similarity index 100%
rename from lib/misc/flash_port_wb.vhd
rename to lib/JBUS/src/flash_port/flash_port_wb.vhd
diff --git a/lib/misc/gpio_wb.vhd b/lib/JBUS/src/gpio/gpio_wb.vhd
similarity index 100%
rename from lib/misc/gpio_wb.vhd
rename to lib/JBUS/src/gpio/gpio_wb.vhd
diff --git a/lib/misc/ram_wb.vhd b/lib/JBUS/src/memory/ram_wb.vhd
similarity index 100%
rename from lib/misc/ram_wb.vhd
rename to lib/JBUS/src/memory/ram_wb.vhd
diff --git a/lib/misc/rom_wb.vhd b/lib/JBUS/src/memory/rom_wb.vhd
similarity index 100%
rename from lib/misc/rom_wb.vhd
rename to lib/JBUS/src/memory/rom_wb.vhd
diff --git a/lib/misc/tb_ram_wb.vhd b/lib/JBUS/src/memory/tb_ram_wb.vhd
similarity index 100%
rename from lib/misc/tb_ram_wb.vhd
rename to lib/JBUS/src/memory/tb_ram_wb.vhd
diff --git a/lib/misc/tb_rom_wb.vhd b/lib/JBUS/src/memory/tb_rom_wb.vhd
similarity index 100%
rename from lib/misc/tb_rom_wb.vhd
rename to lib/JBUS/src/memory/tb_rom_wb.vhd
diff --git a/lib/misc/sim/tb_bbfifo.fdo b/lib/misc/bbfifo/sim/tb_bbfifo.fdo
similarity index 100%
rename from lib/misc/sim/tb_bbfifo.fdo
rename to lib/misc/bbfifo/sim/tb_bbfifo.fdo
diff --git a/lib/misc/sim/tb_bbfifo.wdo b/lib/misc/bbfifo/sim/tb_bbfifo.wdo
similarity index 100%
rename from lib/misc/sim/tb_bbfifo.wdo
rename to lib/misc/bbfifo/sim/tb_bbfifo.wdo
diff --git a/lib/misc/bbfifo.vhd b/lib/misc/bbfifo/src/bbfifo.vhd
similarity index 100%
rename from lib/misc/bbfifo.vhd
rename to lib/misc/bbfifo/src/bbfifo.vhd
diff --git a/lib/misc/tb_bbfifo.vhd b/lib/misc/bbfifo/src/tb_bbfifo.vhd
similarity index 100%
rename from lib/misc/tb_bbfifo.vhd
rename to lib/misc/bbfifo/src/tb_bbfifo.vhd