diff --git a/lib/JBUS/src/busmaster/async/busmaster_async.vhd b/lib/JBUS/src/busmaster/busmaster_async.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster/async/busmaster_async.vhd
rename to lib/JBUS/src/busmaster/busmaster_async.vhd
diff --git a/lib/JBUS/src/busmaster/async/busmaster_async_new.vhd b/lib/JBUS/src/busmaster/busmaster_async_new.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster/async/busmaster_async_new.vhd
rename to lib/JBUS/src/busmaster/busmaster_async_new.vhd
diff --git a/lib/JBUS/src/busmaster/sync/busmaster_sync.vhd b/lib/JBUS/src/busmaster/busmaster_sync.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster/sync/busmaster_sync.vhd
rename to lib/JBUS/src/busmaster/busmaster_sync.vhd
diff --git a/lib/JBUS/src/busmaster/async/tb_busmaster_async.vhd b/lib/JBUS/src/busmaster/tb_busmaster_async.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster/async/tb_busmaster_async.vhd
rename to lib/JBUS/src/busmaster/tb_busmaster_async.vhd
diff --git a/lib/JBUS/src/busmaster/sync/tb_busmaster_sync.vhd b/lib/JBUS/src/busmaster/tb_busmaster_sync.vhd
similarity index 100%
rename from lib/JBUS/src/busmaster/sync/tb_busmaster_sync.vhd
rename to lib/JBUS/src/busmaster/tb_busmaster_sync.vhd