diff --git a/Makefile b/Makefile
index d92f15a..28921c9 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ $(BDPI_OBJ): $(BDPI_SRC)
 
 BSC_LINK_FLAGS += -keep-fires
 
-BSC_PATHS = -p bs/:bs/Tests/:bsv/:+
+BSC_PATHS = -p bs/Bus/:bs/:bs/Tests/:bsv/:+
 
 .PHONY: help
 help:
diff --git a/bs/Bus.bs b/bs/Bus/Bus.bs
similarity index 100%
rename from bs/Bus.bs
rename to bs/Bus/Bus.bs
diff --git a/bs/BusTypes.bs b/bs/Bus/BusTypes.bs
similarity index 100%
rename from bs/BusTypes.bs
rename to bs/Bus/BusTypes.bs