diff --git a/.gitignore b/.gitignore
index df6bbc8..c0a042b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,5 @@ build/n.out
 build/alt/a.lst
 build/alt/a.out
 build/alt/image.fs
-/.DS_Store
+**/.DS_Store
 /a.out
diff --git a/build/Makefile b/build/Makefile
index 901608b..0abc2c3 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -103,97 +103,93 @@ altcmd: dirs $(BINDIR)/as $(BINDIR)/cat $(BINDIR)/check $(BINDIR)/chmod \
 	$(BINDIR)/chown $(BINDIR)/altchrm $(BINDIR)/cp $(BINDIR)/ds \
 	$(BINDIR)/ed $(BINDIR)/altinit $(BINDIR)/altmkdir
 
-$(BINDIR)/as: $(CMDSRC)/as/as.s
-	$(AS) $(ASARGS) -o $(BINDIR)/as $(CMDSRC)/as/as.s
+$(BINDIR)/as: $(CMDSRC)/as.s
+	$(AS) $(ASARGS) -o $(BINDIR)/as $(CMDSRC)/as.s
 
-$(BINDIR)/cat: $(CMDSRC)/cat/cat.s
-	$(AS) $(ASARGS) -o $(BINDIR)/cat $(CMDSRC)/cat/cat.s
+$(BINDIR)/cat: $(CMDSRC)/cat.s
+	$(AS) $(ASARGS) -o $(BINDIR)/cat $(CMDSRC)/cat.s
 
-$(BINDIR)/check: $(CMDSRC)/check/check.s
-	$(AS) $(ASARGS) -o $(BINDIR)/check $(CMDSRC)/check/check.s
+$(BINDIR)/check: $(CMDSRC)/check.s
+	$(AS) $(ASARGS) -o $(BINDIR)/check $(CMDSRC)/check.s
 
-$(BINDIR)/chmod: $(CMDSRC)/chmod/chmod.s
-	$(AS) $(ASARGS) -o $(BINDIR)/chmod $(CMDSRC)/chmod/chmod.s
+$(BINDIR)/chmod: $(CMDSRC)/chmod.s
+	$(AS) $(ASARGS) -o $(BINDIR)/chmod $(CMDSRC)/chmod.s
 
-$(BINDIR)/chown: $(CMDSRC)/chown/chown.s
-	$(AS) $(ASARGS) -o $(BINDIR)/chown $(CMDSRC)/chown/chown.s
+$(BINDIR)/chown: $(CMDSRC)/chown.s
+	$(AS) $(ASARGS) -o $(BINDIR)/chown $(CMDSRC)/chown.s
 
-$(BINDIR)/chrm: $(CMDSRC)/chrm/chrm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/chrm $(CMDSRC)/chrm/chrm.s
+$(BINDIR)/chrm: $(CMDSRC)/chrm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/chrm $(CMDSRC)/chrm.s
 
-$(BINDIR)/altchrm: $(ALTSRC)/chrm/chrm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altchrm $(ALTSRC)/chrm/chrm.s
+$(BINDIR)/altchrm: $(ALTSRC)/chrm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altchrm $(ALTSRC)/chrm.s
 
-$(BINDIR)/cp: $(CMDSRC)/cp/cp.s
-	$(AS) $(ASARGS) -o $(BINDIR)/cp $(CMDSRC)/cp/cp.s
+$(BINDIR)/cp: $(CMDSRC)/cp.s
+	$(AS) $(ASARGS) -o $(BINDIR)/cp $(CMDSRC)/cp.s
 
-$(BINDIR)/ds: $(CMDSRC)/ds/ds.s
-	$(AS) $(ASARGS) -o $(BINDIR)/ds $(CMDSRC)/ds/ds.s
+$(BINDIR)/ds: $(CMDSRC)/ds.s
+	$(AS) $(ASARGS) -o $(BINDIR)/ds $(CMDSRC)/ds.s
 
-$(BINDIR)/dskres: $(CMDSRC)/dskres/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
-	$(AS) $(ASARGS) -o $(BINDIR)/dskres $(CMDSRC)/dskres/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
+$(BINDIR)/dskres: $(CMDSRC)/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
+	$(AS) $(ASARGS) -o $(BINDIR)/dskres $(CMDSRC)/dskres.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
 
-$(BINDIR)/dsksav: $(CMDSRC)/dsksav/dsksav.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
-	$(AS) $(ASARGS) -o $(BINDIR)/dsksav $(CMDSRC)/dsksav/dsksav.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
+$(BINDIR)/dsksav: $(CMDSRC)/dsksav.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
+	$(AS) $(ASARGS) -o $(BINDIR)/dsksav $(CMDSRC)/dsksav.s $(CMDSRC)/dskio.s $(SYSSRC)/sop.s
 
-$(BINDIR)/ed: $(CMDSRC)/ed/ed1.s $(CMDSRC)/ed/ed2.s
-	$(AS) $(ASARGS) -o $(BINDIR)/ed $(CMDSRC)/ed/ed1.s $(CMDSRC)/ed/ed2.s
+$(BINDIR)/ed: $(CMDSRC)/ed1.s $(CMDSRC)/ed2.s
+	$(AS) $(ASARGS) -o $(BINDIR)/ed $(CMDSRC)/ed1.s $(CMDSRC)/ed2.s
 
-$(BINDIR)/init: $(CMDSRC)/init/init.s
-	$(AS) $(ASARGS) -o $(BINDIR)/init $(CMDSRC)/init/init.s
+$(BINDIR)/init: $(CMDSRC)/init.s
+	$(AS) $(ASARGS) -o $(BINDIR)/init $(CMDSRC)/init.s
 
-$(BINDIR)/db: $(CMDSRC)/db/db.s
-	$(AS) $(ASARGS) -o $(BINDIR)/db $(CMDSRC)/db/db.s
+$(BINDIR)/db: $(CMDSRC)/db.s
+	$(AS) $(ASARGS) -o $(BINDIR)/db $(CMDSRC)/db.s
 
-$(BINDIR)/stat: $(CMDSRC)/stat/stat.s
-	$(AS) $(ASARGS) -o $(BINDIR)/stat $(CMDSRC)/stat/stat.s
+$(BINDIR)/stat: $(CMDSRC)/stat.s
+	$(AS) $(ASARGS) -o $(BINDIR)/stat $(CMDSRC)//stat.s
 
-$(BINDIR)/tm: $(CMDSRC)/tm/tm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/tm $(CMDSRC)/tm/tm.s
+$(BINDIR)/tm: $(CMDSRC)/tm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/tm $(CMDSRC)/tm.s
 
-$(BINDIR)/cas: $(CMDSRC)/cas/cas.s
-	$(AS) $(ASARGS) -o $(BINDIR)/cas $(CMDSRC)/cas/cas.s
+$(BINDIR)/cas: $(CMDSRC)/cas.s
+	$(AS) $(ASARGS) -o $(BINDIR)/cas $(CMDSRC)/cas.s
 
 # -- compile errors
-$(BINDIR)/dmabs: $(CMDSRC)/dmabs/dmabs.s
-	$(AS) $(ASARGS) -o $(BINDIR)/dmabs $(CMDSRC)/dmabs/dmabs.s
+$(BINDIR)/dmabs: $(CMDSRC)/dmabs.s
+	$(AS) $(ASARGS) -o $(BINDIR)/dmabs $(CMDSRC)/dmabs.s
 
 # -- compile errors
-$(BINDIR)/st: $(GAMESRC)/st/st1.s $(GAMESRC)/st/st2.s  $(GAMESRC)/st/st3.s  $(GAMESRC)/st/st4.s  $(GAMESRC)/st/st5.s  $(GAMESRC)/st/st6.s $(GAMESRC)/st/st7.s 
-	$(AS) $(ASARGS) -o $(BINDIR)/st $(GAMESRC)/st/st1.s $(GAMESRC)/st/st2.s  $(GAMESRC)/st/st3.s  $(GAMESRC)/st/st4.s  $(GAMESRC)/st/st5.s  $(GAMESRC)/st/st6.s $(GAMESRC)/st/st7.s 
+$(BINDIR)/bc: $(CMDSRC)/bc.s
+	$(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bc.s
+
+$(BINDIR)/dsw: $(CMDSRC)/dsw.s
+	$(AS) $(ASARGS) -o $(BINDIR)/dsw $(CMDSRC)/dsw.s
+
+$(BINDIR)/apr: $(CMDSRC)/apr.s
+	$(AS) $(ASARGS) -o $(BINDIR)/apr $(CMDSRC)/apr.s
 
 # -- compile errors
-$(BINDIR)/bc: $(CMDSRC)/bc/bc.s
-	$(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bc/bc.s
+$(BINDIR)/adm: $(CMDSRC)/adm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/adm $(CMDSRC)/adm.s
 
-$(BINDIR)/dsw: $(CMDSRC)/dsw/dsw.s
-	$(AS) $(ASARGS) -o $(BINDIR)/dsw $(CMDSRC)/dsw/dsw.s
+$(BINDIR)/sh: $(CMDSRC)/sh.s
+	$(AS) $(ASARGS) -o $(BINDIR)/sh $(CMDSRC)/sh.s
 
-$(BINDIR)/apr: $(CMDSRC)/apr/apr.s
-	$(AS) $(ASARGS) -o $(BINDIR)/apr $(CMDSRC)/apr/apr.s
+$(BINDIR)/rn: $(CMDSRC)/rn.s
+	$(AS) $(ASARGS) -o $(BINDIR)/rn $(CMDSRC)/rn.s
 
-# -- compile errors
-$(BINDIR)/adm: $(CMDSRC)/adm/adm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/adm $(CMDSRC)/adm/adm.s
+$(BINDIR)/rm: $(CMDSRC)/rm.s
+	$(AS) $(ASARGS) -o $(BINDIR)/rm $(CMDSRC)/rm.s
 
-$(BINDIR)/sh: $(CMDSRC)/sh/sh.s
-	$(AS) $(ASARGS) -o $(BINDIR)/sh $(CMDSRC)/sh/sh.s
-
-$(BINDIR)/rn: $(CMDSRC)/rn/rn.s
-	$(AS) $(ASARGS) -o $(BINDIR)/rn $(CMDSRC)/rn/rn.s
-
-$(BINDIR)/rm: $(CMDSRC)/rm/rm.s
-	$(AS) $(ASARGS) -o $(BINDIR)/rm $(CMDSRC)/rm/rm.s
-
-$(BINDIR)/pd: $(CMDSRC)/pd/pd.s
-	$(AS) $(ASARGS) -o $(BINDIR)/pd $(CMDSRC)/pd/pd.s
+$(BINDIR)/pd: $(CMDSRC)/pd.s
+	$(AS) $(ASARGS) -o $(BINDIR)/pd $(CMDSRC)/pd.s
 
 # Alternative init: no dd directory
-$(BINDIR)/altinit: $(ALTSRC)/init/init.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altinit $(ALTSRC)/init/init.s
+$(BINDIR)/altinit: $(ALTSRC)/init.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altinit $(ALTSRC)/init.s
 
-$(BINDIR)/altmkdir: $(ALTSRC)/wktmkdir/wktmkdir.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altmkdir $(ALTSRC)/wktmkdir/wktmkdir.s
+$(BINDIR)/altmkdir: $(ALTSRC)/wktmkdir.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altmkdir $(ALTSRC)/wktmkdir.s
 
 
 # The commands that did not come from the scans
@@ -243,10 +239,10 @@ $(BINDIR)/od: $(OTHERSRC)/wktod.s
 	$(AS) $(ASARGS) -o $(BINDIR)/od $(OTHERSRC)/wktod.s
 
 # B compiler
-$(BINDIR)/bc: $(CMDSRC)/bl/bl.s $(CMDSRC)/bi/bi.s ../tools/b.c $(OTHERSRC)/b.b
+$(BINDIR)/bc: $(CMDSRC)/bl.s $(CMDSRC)/bi.s ../tools/b.c $(OTHERSRC)/b.b
 	$(CC) $(CCARGS) -o b ../tools/b.c
 	./b $(OTHERSRC)/b.b b.s
-	$(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bl/bl.s b.s $(CMDSRC)/bi/bi.s
+	$(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bl.s b.s $(CMDSRC)/bi.s
 	rm b b.s
 
 tests:
diff --git a/build/proto b/build/proto
index 97b1abb..be4bf63 100644
--- a/build/proto
+++ b/build/proto
@@ -70,11 +70,11 @@ dd 	         drwr- -1 4
       $
     dmr        drwr- 12
       system   l----  3
-      as.s     frwr- 12 ../src/cmd/as/as.s
+      as.s     frwr- 12 ../src/cmd/as.s
       b_readme frwr- 12 fs/b_readme
-      bi.s     frwr- 12 ../src/cmd/bi/bi.s
-      bl.s     frwr- 12 ../src/cmd/bl/bl.s
-      db.s     frwr- 12 ../src/cmd/db/db.s
+      bi.s     frwr- 12 ../src/cmd/bi.s
+      bl.s     frwr- 12 ../src/cmd/bl.s
+      db.s     frwr- 12 ../src/cmd/db.s
       hello.b  frwr- 12 ../src/other/hello.b
       ops.s    frwr- 12 ../src/other/ops.s
       $
diff --git a/src/cmd/.DS_Store b/src/cmd/.DS_Store
new file mode 100644
index 0000000..9a3bd68
Binary files /dev/null and b/src/cmd/.DS_Store differ
diff --git a/src/cmd/adm/adm.s b/src/cmd/adm.s
similarity index 100%
rename from src/cmd/adm/adm.s
rename to src/cmd/adm.s
diff --git a/src/cmd/apr/apr.s b/src/cmd/apr.s
similarity index 100%
rename from src/cmd/apr/apr.s
rename to src/cmd/apr.s
diff --git a/src/cmd/as/as.s b/src/cmd/as.s
similarity index 100%
rename from src/cmd/as/as.s
rename to src/cmd/as.s
diff --git a/src/cmd/bc/bc.s b/src/cmd/bc.s
similarity index 100%
rename from src/cmd/bc/bc.s
rename to src/cmd/bc.s
diff --git a/src/cmd/bi/bi.s b/src/cmd/bi.s
similarity index 100%
rename from src/cmd/bi/bi.s
rename to src/cmd/bi.s
diff --git a/src/cmd/bl/bl.s b/src/cmd/bl.s
similarity index 100%
rename from src/cmd/bl/bl.s
rename to src/cmd/bl.s
diff --git a/src/cmd/cas/cas.s b/src/cmd/cas.s
similarity index 100%
rename from src/cmd/cas/cas.s
rename to src/cmd/cas.s
diff --git a/src/cmd/cas/cas.x b/src/cmd/cas.x
similarity index 100%
rename from src/cmd/cas/cas.x
rename to src/cmd/cas.x
diff --git a/src/cmd/cat/cat.s b/src/cmd/cat.s
similarity index 100%
rename from src/cmd/cat/cat.s
rename to src/cmd/cat.s
diff --git a/src/cmd/check/check.s b/src/cmd/check.s
similarity index 100%
rename from src/cmd/check/check.s
rename to src/cmd/check.s
diff --git a/src/cmd/chmod/chmod.s b/src/cmd/chmod.s
similarity index 100%
rename from src/cmd/chmod/chmod.s
rename to src/cmd/chmod.s
diff --git a/src/cmd/chown/chown.s b/src/cmd/chown.s
similarity index 100%
rename from src/cmd/chown/chown.s
rename to src/cmd/chown.s
diff --git a/src/cmd/chrm/chrm.s b/src/cmd/chrm.s
similarity index 100%
rename from src/cmd/chrm/chrm.s
rename to src/cmd/chrm.s
diff --git a/src/cmd/cp/cp.s b/src/cmd/cp.s
similarity index 100%
rename from src/cmd/cp/cp.s
rename to src/cmd/cp.s
diff --git a/src/cmd/db/db.s b/src/cmd/db.s
similarity index 100%
rename from src/cmd/db/db.s
rename to src/cmd/db.s
diff --git a/src/cmd/dmabs/dmabs.s b/src/cmd/dmabs.s
similarity index 100%
rename from src/cmd/dmabs/dmabs.s
rename to src/cmd/dmabs.s
diff --git a/src/cmd/ds/ds.s b/src/cmd/ds.s
similarity index 100%
rename from src/cmd/ds/ds.s
rename to src/cmd/ds.s
diff --git a/src/cmd/dskres/dskres.s b/src/cmd/dskres.s
similarity index 100%
rename from src/cmd/dskres/dskres.s
rename to src/cmd/dskres.s
diff --git a/src/cmd/dsksav/dsksav.s b/src/cmd/dsksav.s
similarity index 100%
rename from src/cmd/dsksav/dsksav.s
rename to src/cmd/dsksav.s
diff --git a/src/cmd/dsw/dsw.s b/src/cmd/dsw.s
similarity index 100%
rename from src/cmd/dsw/dsw.s
rename to src/cmd/dsw.s
diff --git a/src/cmd/ed/ed1.s b/src/cmd/ed1.s
similarity index 100%
rename from src/cmd/ed/ed1.s
rename to src/cmd/ed1.s
diff --git a/src/cmd/ed/ed2.s b/src/cmd/ed2.s
similarity index 100%
rename from src/cmd/ed/ed2.s
rename to src/cmd/ed2.s
diff --git a/src/cmd/init/init.s b/src/cmd/init.s
similarity index 100%
rename from src/cmd/init/init.s
rename to src/cmd/init.s
diff --git a/src/cmd/pd/pd.s b/src/cmd/pd.s
similarity index 100%
rename from src/cmd/pd/pd.s
rename to src/cmd/pd.s
diff --git a/src/cmd/rm/rm.s b/src/cmd/rm.s
similarity index 100%
rename from src/cmd/rm/rm.s
rename to src/cmd/rm.s
diff --git a/src/cmd/rn/rn.s b/src/cmd/rn.s
similarity index 100%
rename from src/cmd/rn/rn.s
rename to src/cmd/rn.s
diff --git a/src/cmd/sh/sh.s b/src/cmd/sh.s
similarity index 100%
rename from src/cmd/sh/sh.s
rename to src/cmd/sh.s
diff --git a/src/cmd/stat/stat.s b/src/cmd/stat.s
similarity index 100%
rename from src/cmd/stat/stat.s
rename to src/cmd/stat.s
diff --git a/src/cmd/tm/tm.s b/src/cmd/tm.s
similarity index 100%
rename from src/cmd/tm/tm.s
rename to src/cmd/tm.s