diff --git a/Makefile b/Makefile
index 1a42d46..5ad0e41 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ $(BDPI_OBJ): $(BDPI_SRC)
 
 BSC_LINK_FLAGS += -keep-fires
 
-BSC_PATHS = -p bs/Bus/:bs/:bs/Tests/:bsv/:+
+BSC_PATHS = -p bs/Uart/:bs/Bus/:bs/:bs/Tests/:bsv/:+
 
 .PHONY: help
 help:
@@ -159,7 +159,7 @@ v_sim_vcd:
 # ----------------------------------------------------------------
 
 fpga:
-	make -C ulx3s_fpga mkTop.bit
+	make -C ulx3s_fpga mkTop.bit prog
 
 .PHONY: clean
 clean:
diff --git a/bs/ClkDivider.bs b/bs/Uart/ClkDivider.bs
similarity index 100%
rename from bs/ClkDivider.bs
rename to bs/Uart/ClkDivider.bs
diff --git a/bs/Deserializer.bs b/bs/Uart/Deserializer.bs
similarity index 100%
rename from bs/Deserializer.bs
rename to bs/Uart/Deserializer.bs
diff --git a/bs/Serializer.bs b/bs/Uart/Serializer.bs
similarity index 90%
rename from bs/Serializer.bs
rename to bs/Uart/Serializer.bs
index ff445fa..cf39721 100644
--- a/bs/Serializer.bs
+++ b/bs/Uart/Serializer.bs
@@ -15,8 +15,8 @@ serialize ftdiState dataReg =
         _        -> 1'b1
 
 interface (ISerializer :: # -> # -> *) clkFreq baudRate =
-  putBit8    :: (Bit 8) -> Action {-# always_enabled, always_ready #-}
-  bitLineOut ::  Bit 1            {-# always_ready #-}
+  putBit8    :: (Bit 8) -> Action
+  bitLineOut ::  Bit 1
 
 mkSerialize :: Handle -> Module (ISerializer clkFreq baudRate)
 mkSerialize fileHandle = do
diff --git a/bs/State.bs b/bs/Uart/State.bs
similarity index 100%
rename from bs/State.bs
rename to bs/Uart/State.bs