diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c
index 01ab2fe2..09525439 100644
--- a/AltairZ80/altairz80_cpu.c
+++ b/AltairZ80/altairz80_cpu.c
@@ -27,7 +27,7 @@
     Code for Z80 CPU from Frank D. Cringle ((c) 1995 under GNU license)
 */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 #include <ctype.h>
 
 #define SWITCHCPU_DEFAULT 0xfd
diff --git a/AltairZ80/altairz80_hdsk.c b/AltairZ80/altairz80_hdsk.c
index fb86e726..ea0eae57 100644
--- a/AltairZ80/altairz80_hdsk.c
+++ b/AltairZ80/altairz80_hdsk.c
@@ -26,7 +26,7 @@
     Contains code from Howard M. Harte for defining and changing disk geometry.
 */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 #include "sim_imd.h"
 
 /* Debug flags */
diff --git a/AltairZ80/altairz80_sys.c b/AltairZ80/altairz80_sys.c
index ff523051..ed73eb46 100644
--- a/AltairZ80/altairz80_sys.c
+++ b/AltairZ80/altairz80_sys.c
@@ -29,7 +29,7 @@
     03/27/14 -- MWD Add MITS Hard Disk device (mhdsk_dev)
 */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 #include <ctype.h>
 
 #define SIM_EMAX 6
diff --git a/AltairZ80/m68k.h b/AltairZ80/m68k/m68k.h
similarity index 100%
rename from AltairZ80/m68k.h
rename to AltairZ80/m68k/m68k.h
diff --git a/AltairZ80/m68kasm.c b/AltairZ80/m68k/m68kasm.c
similarity index 100%
rename from AltairZ80/m68kasm.c
rename to AltairZ80/m68k/m68kasm.c
diff --git a/AltairZ80/m68kasm.y.txt b/AltairZ80/m68k/m68kasm.y.txt
similarity index 100%
rename from AltairZ80/m68kasm.y.txt
rename to AltairZ80/m68k/m68kasm.y.txt
diff --git a/AltairZ80/m68kconf.h b/AltairZ80/m68k/m68kconf.h
similarity index 100%
rename from AltairZ80/m68kconf.h
rename to AltairZ80/m68k/m68kconf.h
diff --git a/AltairZ80/m68kcpu.c b/AltairZ80/m68k/m68kcpu.c
similarity index 100%
rename from AltairZ80/m68kcpu.c
rename to AltairZ80/m68k/m68kcpu.c
diff --git a/AltairZ80/m68kcpu.h b/AltairZ80/m68k/m68kcpu.h
similarity index 100%
rename from AltairZ80/m68kcpu.h
rename to AltairZ80/m68k/m68kcpu.h
diff --git a/AltairZ80/m68kdasm.c b/AltairZ80/m68k/m68kdasm.c
similarity index 100%
rename from AltairZ80/m68kdasm.c
rename to AltairZ80/m68k/m68kdasm.c
diff --git a/AltairZ80/m68kopac.c b/AltairZ80/m68k/m68kopac.c
similarity index 100%
rename from AltairZ80/m68kopac.c
rename to AltairZ80/m68k/m68kopac.c
diff --git a/AltairZ80/m68kopdm.c b/AltairZ80/m68k/m68kopdm.c
similarity index 100%
rename from AltairZ80/m68kopdm.c
rename to AltairZ80/m68k/m68kopdm.c
diff --git a/AltairZ80/m68kopnz.c b/AltairZ80/m68k/m68kopnz.c
similarity index 100%
rename from AltairZ80/m68kopnz.c
rename to AltairZ80/m68k/m68kopnz.c
diff --git a/AltairZ80/m68kops.c b/AltairZ80/m68k/m68kops.c
similarity index 100%
rename from AltairZ80/m68kops.c
rename to AltairZ80/m68k/m68kops.c
diff --git a/AltairZ80/m68kops.h b/AltairZ80/m68k/m68kops.h
similarity index 100%
rename from AltairZ80/m68kops.h
rename to AltairZ80/m68k/m68kops.h
diff --git a/AltairZ80/m68ksim.c b/AltairZ80/m68ksim.c
index cfb5a04d..1006febd 100644
--- a/AltairZ80/m68ksim.c
+++ b/AltairZ80/m68ksim.c
@@ -77,7 +77,7 @@
 
  */
 
-#include "m68k.h"
+#include "m68k/m68k.h"
 
 /* Read/write macros */
 #define READ_BYTE(BASE, ADDR) (BASE)[ADDR]
diff --git a/Visual Studio Projects/AltairZ80.vcproj b/Visual Studio Projects/AltairZ80.vcproj
index 4dc234f9..6bbab8f3 100644
--- a/Visual Studio Projects/AltairZ80.vcproj	
+++ b/Visual Studio Projects/AltairZ80.vcproj	
@@ -252,31 +252,31 @@
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kasm.c"
+				RelativePath="..\AltairZ80\m68k\m68kasm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kcpu.c"
+				RelativePath="..\AltairZ80\m68k\m68kcpu.c"
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kdasm.c"
+				RelativePath="..\AltairZ80\m68k\m68kdasm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kopac.c"
+				RelativePath="..\AltairZ80\m68k\m68kopac.c"
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kopdm.c"
+				RelativePath="..\AltairZ80\m68k\m68kopdm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kopnz.c"
+				RelativePath="..\AltairZ80\m68k\m68kopnz.c"
 				>
 			</File>
 			<File
-				RelativePath="..\AltairZ80\m68kops.c"
+				RelativePath="..\AltairZ80\m68k\m68kops.c"
 				>
 			</File>
 			<File
diff --git a/makefile b/makefile
index a055314e..8bbf0345 100644
--- a/makefile
+++ b/makefile
@@ -1851,9 +1851,9 @@ ALTAIRZ80 = ${ALTAIRZ80D}/altairz80_cpu.c ${ALTAIRZ80D}/altairz80_cpu_nommu.c \
 	${ALTAIRZ80D}/s100_tarbell.c \
 	${ALTAIRZ80D}/wd179x.c ${ALTAIRZ80D}/s100_hdc1001.c \
 	${ALTAIRZ80D}/s100_if3.c ${ALTAIRZ80D}/s100_adcs6.c \
-	${ALTAIRZ80D}/m68kcpu.c ${ALTAIRZ80D}/m68kdasm.c ${ALTAIRZ80D}/m68kasm.c \
-	${ALTAIRZ80D}/m68kopac.c ${ALTAIRZ80D}/m68kopdm.c \
-	${ALTAIRZ80D}/m68kopnz.c ${ALTAIRZ80D}/m68kops.c ${ALTAIRZ80D}/m68ksim.c
+	${ALTAIRZ80D}/m68k/m68kcpu.c ${ALTAIRZ80D}/m68k/m68kdasm.c ${ALTAIRZ80D}/m68k/m68kasm.c \
+	${ALTAIRZ80D}/m68k/m68kopac.c ${ALTAIRZ80D}/m68k/m68kopdm.c \
+	${ALTAIRZ80D}/m68k/m68kopnz.c ${ALTAIRZ80D}/m68k/m68kops.c ${ALTAIRZ80D}/m68ksim.c
 ALTAIRZ80_OPT = -I ${ALTAIRZ80D}