diff --git a/Makefile b/Makefile
index 631d326..b8f960b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-targets := ns.clock cricket dclock romx fujinet selectors ram.drv util textcolors
+targets := clocks selectors ram.drv util textcolors
 
 .PHONY: all $(targets) package
 
diff --git a/clocks/Makefile b/clocks/Makefile
new file mode 100644
index 0000000..d6db28f
--- /dev/null
+++ b/clocks/Makefile
@@ -0,0 +1,19 @@
+targets := ns.clock cricket dclock romx fujinet
+
+.PHONY: all $(targets)
+
+all: $(targets)
+
+# Build all targets
+$(targets):
+	@tput setaf 3 && echo "Building: $@" && tput sgr0
+	@$(MAKE) -C $@ \
+	  && (tput setaf 2 && echo "make $@ good" && tput sgr0) \
+          || (tput blink && tput setaf 1 && echo "MAKE $@ BAD" && tput sgr0 && false)
+
+# Clean all temporary/target files
+clean:
+	@for dir in $(targets); do \
+	  tput setaf 2 && echo "cleaning $$dir" && tput sgr0; \
+	  $(MAKE) -C $$dir clean; \
+	done
diff --git a/cricket/Makefile b/clocks/cricket/Makefile
similarity index 100%
rename from cricket/Makefile
rename to clocks/cricket/Makefile
diff --git a/cricket/README.md b/clocks/cricket/README.md
similarity index 100%
rename from cricket/README.md
rename to clocks/cricket/README.md
diff --git a/cricket/cricket.system.s b/clocks/cricket/cricket.system.s
similarity index 97%
rename from cricket/cricket.system.s
rename to clocks/cricket/cricket.system.s
index ca4e59b..c55e3fc 100644
--- a/cricket/cricket.system.s
+++ b/clocks/cricket/cricket.system.s
@@ -14,13 +14,13 @@
         .include "apple2.mac"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/prodos.inc"
-        .include "../inc/ascii.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/prodos.inc"
+        .include "../../inc/ascii.inc"
 
 ;;; ************************************************************
-        .include "../inc/driver_preamble.inc"
+        .include "../../inc/driver_preamble.inc"
 ;;; ************************************************************
 
 ;;; ============================================================
@@ -310,5 +310,5 @@ done:   pla                     ; restore saved command state
         .assert sizeof_driver <= 125, error, "Clock code must be <= 125 bytes"
 
 ;;; ************************************************************
-        .include "../inc/driver_postamble.inc"
+        .include "../../inc/driver_postamble.inc"
 ;;; ************************************************************
diff --git a/cricket/prodos.mod.s b/clocks/cricket/prodos.mod.s
similarity index 97%
rename from cricket/prodos.mod.s
rename to clocks/cricket/prodos.mod.s
index 056b85c..a5d6602 100644
--- a/cricket/prodos.mod.s
+++ b/clocks/cricket/prodos.mod.s
@@ -6,8 +6,8 @@
         .include "apple2.inc"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/prodos.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/prodos.inc"
 
         .org    $300
 
diff --git a/cricket/set.date.s b/clocks/cricket/set.date.s
similarity index 94%
rename from cricket/set.date.s
rename to clocks/cricket/set.date.s
index 2aedb6b..99da0ae 100644
--- a/cricket/set.date.s
+++ b/clocks/cricket/set.date.s
@@ -8,9 +8,9 @@
         .include "apple2.inc"
         .include "apple2.mac"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/ascii.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/ascii.inc"
 
         .org $2000
 
diff --git a/cricket/set.time.s b/clocks/cricket/set.time.s
similarity index 94%
rename from cricket/set.time.s
rename to clocks/cricket/set.time.s
index 8d816f4..cb7dd3c 100644
--- a/cricket/set.time.s
+++ b/clocks/cricket/set.time.s
@@ -8,9 +8,9 @@
         .include "apple2.inc"
         .include "apple2.mac"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/ascii.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/ascii.inc"
 
         .org $2000
 
diff --git a/cricket/test.s b/clocks/cricket/test.s
similarity index 97%
rename from cricket/test.s
rename to clocks/cricket/test.s
index 95f2d30..066a722 100644
--- a/cricket/test.s
+++ b/clocks/cricket/test.s
@@ -11,9 +11,9 @@
         .include "apple2.mac"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/ascii.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/ascii.inc"
 
         .org $2000
 
diff --git a/dclock/Makefile b/clocks/dclock/Makefile
similarity index 100%
rename from dclock/Makefile
rename to clocks/dclock/Makefile
diff --git a/dclock/README.md b/clocks/dclock/README.md
similarity index 100%
rename from dclock/README.md
rename to clocks/dclock/README.md
diff --git a/dclock/dclock.system.s b/clocks/dclock/dclock.system.s
similarity index 98%
rename from dclock/dclock.system.s
rename to clocks/dclock/dclock.system.s
index 3038bbe..0e95578 100644
--- a/dclock/dclock.system.s
+++ b/clocks/dclock/dclock.system.s
@@ -20,9 +20,9 @@
         .include "apple2.mac"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/prodos.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/prodos.inc"
 
 ; zero page locations
 SCRATCH         := $0B                          ; scratch value for BCD range checks
@@ -43,7 +43,7 @@ DPTRH           := SLOT4IO+2                    ; Slinky data ptr high
 DATA            := SLOT4IO+3                    ; Slinky data byte
 
 ;;; ************************************************************
-        .include "../inc/driver_preamble.inc"
+        .include "../../inc/driver_preamble.inc"
 ;;; ************************************************************
 
 ;;; ============================================================
@@ -380,5 +380,5 @@ regulk  = * - 1
         .assert sizeof_driver <= 125, error, "Clock code must be <= 125 bytes"
 
 ;;; ************************************************************
-        .include "../inc/driver_postamble.inc"
+        .include "../../inc/driver_postamble.inc"
 ;;; ************************************************************
diff --git a/fujinet/Makefile b/clocks/fujinet/Makefile
similarity index 100%
rename from fujinet/Makefile
rename to clocks/fujinet/Makefile
diff --git a/fujinet/README.md b/clocks/fujinet/README.md
similarity index 100%
rename from fujinet/README.md
rename to clocks/fujinet/README.md
diff --git a/fujinet/fn.clock.system.s b/clocks/fujinet/fn.clock.system.s
similarity index 94%
rename from fujinet/fn.clock.system.s
rename to clocks/fujinet/fn.clock.system.s
index d4e7ba6..c3d1fcc 100644
--- a/fujinet/fn.clock.system.s
+++ b/clocks/fujinet/fn.clock.system.s
@@ -9,13 +9,13 @@
         .include "apple2.mac"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/prodos.inc"
-        .include "../inc/ascii.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/prodos.inc"
+        .include "../../inc/ascii.inc"
 
 ;;; ************************************************************
-        .include "../inc/driver_preamble.inc"
+        .include "../../inc/driver_preamble.inc"
         .include "./smartport.inc"
 ;;; ************************************************************
 
@@ -182,5 +182,5 @@ loop:   lda     driver,y
 
 
 ;;; ************************************************************
-        .include "../inc/driver_postamble.inc"
+        .include "../../inc/driver_postamble.inc"
 ;;; ************************************************************
diff --git a/fujinet/smartport.inc b/clocks/fujinet/smartport.inc
similarity index 100%
rename from fujinet/smartport.inc
rename to clocks/fujinet/smartport.inc
diff --git a/ns.clock/Makefile b/clocks/ns.clock/Makefile
similarity index 100%
rename from ns.clock/Makefile
rename to clocks/ns.clock/Makefile
diff --git a/ns.clock/README.md b/clocks/ns.clock/README.md
similarity index 100%
rename from ns.clock/README.md
rename to clocks/ns.clock/README.md
diff --git a/ns.clock/ns.clock.system.s b/clocks/ns.clock/ns.clock.system.s
similarity index 97%
rename from ns.clock/ns.clock.system.s
rename to clocks/ns.clock/ns.clock.system.s
index 26527fd..58d8af5 100644
--- a/ns.clock/ns.clock.system.s
+++ b/clocks/ns.clock/ns.clock.system.s
@@ -13,12 +13,12 @@
         .include "apple2.mac"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/prodos.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/prodos.inc"
 
 ;;; ************************************************************
-        .include "../inc/driver_preamble.inc"
+        .include "../../inc/driver_preamble.inc"
 ;;; ************************************************************
 
 ;;; ============================================================
@@ -289,5 +289,5 @@ unlock:
 
 
 ;;; ************************************************************
-        .include "../inc/driver_postamble.inc"
+        .include "../../inc/driver_postamble.inc"
 ;;; ************************************************************
diff --git a/romx/Makefile b/clocks/romx/Makefile
similarity index 100%
rename from romx/Makefile
rename to clocks/romx/Makefile
diff --git a/romx/README.md b/clocks/romx/README.md
similarity index 100%
rename from romx/README.md
rename to clocks/romx/README.md
diff --git a/romx/romxrtc.system.s b/clocks/romx/romxrtc.system.s
similarity index 97%
rename from romx/romxrtc.system.s
rename to clocks/romx/romxrtc.system.s
index f0ca48e..1a492e2 100644
--- a/romx/romxrtc.system.s
+++ b/clocks/romx/romxrtc.system.s
@@ -16,16 +16,16 @@
         .include "apple2.mac"
         .include "opcodes.inc"
 
-        .include "../inc/apple2.inc"
-        .include "../inc/macros.inc"
-        .include "../inc/prodos.inc"
+        .include "../../inc/apple2.inc"
+        .include "../../inc/macros.inc"
+        .include "../../inc/prodos.inc"
 
 ;;; Uncomment the following to "fake" a clock with a fixed date.
 ;;; Used for testing without a real ROMX around.
 ;;; FAKE_CLOCK = 1
 
 ;;; ************************************************************
-        .include "../inc/driver_preamble.inc"
+        .include "../../inc/driver_preamble.inc"
 ;;; ************************************************************
 
 ZipSlo        :=  $C0E0       ; ZIP CHIP slowdown
@@ -313,5 +313,5 @@ ClockDrvSize = ClockDrvEnd - ClockDrv
             .sprintf("Clock driver must be <= 125 bytes, was %d bytes", ClockDrvSize)
 
 ;;; ************************************************************
-        .include "../inc/driver_postamble.inc"
+        .include "../../inc/driver_postamble.inc"
 ;;; ************************************************************
diff --git a/package.sh b/package.sh
index d98fac0..c8fd041 100755
--- a/package.sh
+++ b/package.sh
@@ -18,14 +18,14 @@ add_file () {
     cadius ADDFILE "$IMGFILE" "$3" "$PACKDIR/$2" --no-case-bits --quiet
 }
 
-add_file "cricket/out/cricket.system.SYS"    "cricket.system#FF0000"  "/$VOLNAME"
-add_file "cricket/out/set.date.BIN"          "set.date#062000"        "/$VOLNAME/CRICKET.UTIL"
-add_file "cricket/out/set.time.BIN"          "set.time#062000"        "/$VOLNAME/CRICKET.UTIL"
-add_file "cricket/out/test.BIN"              "test#062000"            "/$VOLNAME/CRICKET.UTIL"
-add_file "dclock/out/dclock.system.SYS"      "dclock.system#FF0000"   "/$VOLNAME"
-add_file "ns.clock/out/ns.clock.system.SYS"  "ns.clock.system#FF0000" "/$VOLNAME"
-add_file "romx/out/romxrtc.system.SYS"       "romxrtc.system#FF0000"  "/$VOLNAME"
-add_file "fujinet/out/fn.clock.system.SYS"   "fn.clock.system#FF0000" "/$VOLNAME"
+add_file "clocks/cricket/out/cricket.system.SYS"    "cricket.system#FF0000"  "/$VOLNAME"
+add_file "clocks/cricket/out/set.date.BIN"          "set.date#062000"        "/$VOLNAME/CRICKET.UTIL"
+add_file "clocks/cricket/out/set.time.BIN"          "set.time#062000"        "/$VOLNAME/CRICKET.UTIL"
+add_file "clocks/cricket/out/test.BIN"              "test#062000"            "/$VOLNAME/CRICKET.UTIL"
+add_file "clocks/dclock/out/dclock.system.SYS"      "dclock.system#FF0000"   "/$VOLNAME"
+add_file "clocks/ns.clock/out/ns.clock.system.SYS"  "ns.clock.system#FF0000" "/$VOLNAME"
+add_file "clocks/romx/out/romxrtc.system.SYS"       "romxrtc.system#FF0000"  "/$VOLNAME"
+add_file "clocks/fujinet/out/fn.clock.system.SYS"   "fn.clock.system#FF0000" "/$VOLNAME"
 add_file "ram.drv/out/ram.drv.system.SYS"    "ram.drv.system#FF0000"  "/$VOLNAME"
 add_file "selectors/out/bbb.system.SYS"      "bbb.system#FF0000"      "/$VOLNAME"
 add_file "selectors/out/buhbye.system.SYS"   "buhbye.system#FF0000"   "/$VOLNAME"