diff --git a/lib/JBUS/src/busmaster_async.vhd b/lib/JBUS/src/busmaster/async/busmaster_async.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster_async.vhd
rename to lib/JBUS/src/busmaster/async/busmaster_async.vhd
diff --git a/lib/JBUS/src/busmaster_async_new.vhd b/lib/JBUS/src/busmaster/async/busmaster_async_new.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster_async_new.vhd
rename to lib/JBUS/src/busmaster/async/busmaster_async_new.vhd
diff --git a/lib/JBUS/src/tb_busmaster_async.vhd b/lib/JBUS/src/busmaster/async/tb_busmaster_async.vhd
similarity index 100%
rename from lib/JBUS/src/tb_busmaster_async.vhd
rename to lib/JBUS/src/busmaster/async/tb_busmaster_async.vhd
diff --git a/lib/JBUS/src/busmaster_types.vhd b/lib/JBUS/src/busmaster/busmaster_types.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster_types.vhd
rename to lib/JBUS/src/busmaster/busmaster_types.vhd
diff --git a/lib/JBUS/src/busmaster_sync.vhd b/lib/JBUS/src/busmaster/sync/busmaster_sync.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster_sync.vhd
rename to lib/JBUS/src/busmaster/sync/busmaster_sync.vhd
diff --git a/lib/JBUS/src/tb_busmaster_sync.vhd b/lib/JBUS/src/busmaster/sync/tb_busmaster_sync.vhd
similarity index 100%
rename from lib/JBUS/src/tb_busmaster_sync.vhd
rename to lib/JBUS/src/busmaster/sync/tb_busmaster_sync.vhd
diff --git a/lib/JBUS/src/dmac.vhd b/lib/JBUS/src/dmac/dmac.vhd
similarity index 100%
rename from lib/JBUS/src/dmac.vhd
rename to lib/JBUS/src/dmac/dmac.vhd
diff --git a/lib/JBUS/src/tb_dmac.vhd b/lib/JBUS/src/dmac/tb_dmac.vhd
similarity index 100%
rename from lib/JBUS/src/tb_dmac.vhd
rename to lib/JBUS/src/dmac/tb_dmac.vhd
diff --git a/lib/JBUS/src/test.vhd b/lib/JBUS/src/test.vhd
deleted file mode 100644
index c470271..0000000
--- a/lib/JBUS/src/test.vhd
+++ /dev/null
@@ -1,78 +0,0 @@
-entity *\(.*\) *is
-inst_\1 : work.\1
-
-Generic
-GENERIC MAP
-
-Port
-PORT MAP
-
-entity busmaster_32_sync is
-	GENERIC MAP
-	(
-		FIFO_DEPTH			: natural := 4
-	);
-	Port 
-	(
-		clk					: in std_logic;
-		rst					: in std_logic;
-
-		cmd_cycle_finished	: out std_logic;
-		cmd_cycle_en		: in std_logic;
-		cmd_rdy				: out std_logic;
-		cmd_we				: in std_logic;
-		
-		cmd_in				: in bm_cmd_32_t;
-		
-		dout				: out unsigned(31 downto 0);
-		dout_vld			: out std_logic;
-		dout_re				: in std_logic;
-		
-		-- J-BUS signals
-		ACK_I				: in std_logic;
-		SRDY_I				: in std_logic;
-		MDAT_I				: in unsigned(31 downto 0);
-		MDAT_O				: out unsigned(31 downto 0);
-		ADDR_O				: out unsigned(31 downto 0);
-		SEL_O				: out unsigned(3 downto 0);
-		WE_O				: out std_logic;
-		CYC_O				: out std_logic;
-		STB_O				: out std_logic;
-		MRDY_O				: out std_logic
-	);
-	end busmaster_32_sync;
-
-
-inst_uut : entity work.busmaster_32_sync
-	GENERIC MAP
-	(
-		FIFO_DEPTH					=> 4
-	)
-	PORT MAP
-	(
-		-- System signals
-		rst					=> RST_O,
-		clk					=> CLK_O,
-
-		cmd_cycle_finished	=> cmd_cycle_finished,
-		cmd_cycle_en		=> cmd_cycle_en,
-		cmd_rdy				=> cmd_rdy,
-		cmd_we				=> cmd_we,
-		cmd_in				=> cmd_in,
-		
-		dout				=> dout,
-		dout_vld			=> dout_vld,
-		dout_re				=> dout_re,
-
-		-- JBUS Master signals
-		CYC_O				=> CYC_O,
-		STB_O				=> STB_O,
-		WE_O				=> WE_O,
-		SEL_O				=> SEL_O,
-		ACK_I				=> ACK_I,
-		SRDY_I				=> SRDY_I,
-		MRDY_O				=> MRDY_O,
-		ADDR_O				=> ADDR_O,
-		MDAT_I				=> MDAT_I,
-		MDAT_O				=> MDAT_O
-	);