diff --git a/Makefile b/Makefile
index 640e949..e5c327d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-PROG=		a1
-SRCS=		apple1/main.c apple1/pia.c v6502/v6502/log.c v6502/v6502/debugger.c v6502/v6502/breakpoint.c
+PROG=		apple1
+SRCS=		src/main.c src/pia.c v6502/v6502/log.c v6502/v6502/debugger.c v6502/v6502/breakpoint.c
 
 V6502_PREFIX= v6502
 LIBV6502_DIR=	$(V6502_PREFIX)/v6502
@@ -11,7 +11,7 @@ LIBDIS6502=   $(LIBDIS6502_DIR)/libdis6502.a
 
 AS=	$(LIBAS6502_DIR)/as6502
 ROM= apple1.rom
-ROMSRC= apple1/wozmon.s
+ROMSRC= src/wozmon.s
 
 CFLAGS+=	-I$(V6502_PREFIX) -std=c99
 LDFLAGS+=	-ledit -lcurses -ldis6502 -las6502 -lv6502 -L$(LIBV6502_DIR) -L$(LIBAS6502_DIR) -L $(LIBDIS6502_DIR)
diff --git a/apple1.xcodeproj/project.pbxproj b/apple1.xcodeproj/project.pbxproj
index 968376e..78a22b0 100644
--- a/apple1.xcodeproj/project.pbxproj
+++ b/apple1.xcodeproj/project.pbxproj
@@ -7,12 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		E668389E1BA4F51E008F0F06 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = E668389D1BA4F51E008F0F06 /* main.c */; };
 		E66839001BA4F75C008F0F06 /* liblibv6502.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E66838F61BA4F705008F0F06 /* liblibv6502.a */; };
-		E66839061BA53A82008F0F06 /* pia.c in Sources */ = {isa = PBXBuildFile; fileRef = E66839041BA53A82008F0F06 /* pia.c */; };
 		E668391B1BA64C5B008F0F06 /* liblibdis6502.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E66838FC1BA4F705008F0F06 /* liblibdis6502.a */; };
 		E668391E1BA64C61008F0F06 /* liblibas6502.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E66838F81BA4F705008F0F06 /* liblibas6502.a */; };
 		E66839201BA659A6008F0F06 /* libcurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E668391F1BA659A6008F0F06 /* libcurses.dylib */; };
+		E6CF366B1CB9D267008A8A43 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = E6CF36671CB9D267008A8A43 /* main.c */; };
+		E6CF366C1CB9D267008A8A43 /* pia.c in Sources */ = {isa = PBXBuildFile; fileRef = E6CF36681CB9D267008A8A43 /* pia.c */; };
+		E6CF366D1CB9D267008A8A43 /* wozmon.s in Sources */ = {isa = PBXBuildFile; fileRef = E6CF366A1CB9D267008A8A43 /* wozmon.s */; };
 		E6ECE7B91BABED0100D1812C /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E6ECE7B81BABED0100D1812C /* libedit.dylib */; };
 /* End PBXBuildFile section */
 
@@ -130,13 +131,14 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		E61FA7421BAA8AEF0022E2EB /* wozmon.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = wozmon.s; sourceTree = "<group>"; };
 		E668389A1BA4F51E008F0F06 /* apple1 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = apple1; sourceTree = BUILT_PRODUCTS_DIR; };
-		E668389D1BA4F51E008F0F06 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
 		E66838D31BA4F705008F0F06 /* v6502.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = v6502.xcodeproj; path = v6502/v6502.xcodeproj; sourceTree = SOURCE_ROOT; };
-		E66839041BA53A82008F0F06 /* pia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pia.c; sourceTree = "<group>"; };
-		E66839051BA53A82008F0F06 /* pia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pia.h; sourceTree = "<group>"; };
 		E668391F1BA659A6008F0F06 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = usr/lib/libcurses.dylib; sourceTree = SDKROOT; };
+		E6CF36661CB9D267008A8A43 /* apple1.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; name = apple1.1; path = src/apple1.1; sourceTree = SOURCE_ROOT; };
+		E6CF36671CB9D267008A8A43 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = src/main.c; sourceTree = SOURCE_ROOT; };
+		E6CF36681CB9D267008A8A43 /* pia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pia.c; path = src/pia.c; sourceTree = SOURCE_ROOT; };
+		E6CF36691CB9D267008A8A43 /* pia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pia.h; path = src/pia.h; sourceTree = SOURCE_ROOT; };
+		E6CF366A1CB9D267008A8A43 /* wozmon.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = wozmon.s; path = src/wozmon.s; sourceTree = SOURCE_ROOT; };
 		E6ECE7B81BABED0100D1812C /* libedit.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libedit.dylib; path = usr/lib/libedit.dylib; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -176,10 +178,11 @@
 		E668389C1BA4F51E008F0F06 /* apple1 */ = {
 			isa = PBXGroup;
 			children = (
-				E668389D1BA4F51E008F0F06 /* main.c */,
-				E66839051BA53A82008F0F06 /* pia.h */,
-				E66839041BA53A82008F0F06 /* pia.c */,
-				E61FA7421BAA8AEF0022E2EB /* wozmon.s */,
+				E6CF36661CB9D267008A8A43 /* apple1.1 */,
+				E6CF36671CB9D267008A8A43 /* main.c */,
+				E6CF36681CB9D267008A8A43 /* pia.c */,
+				E6CF36691CB9D267008A8A43 /* pia.h */,
+				E6CF366A1CB9D267008A8A43 /* wozmon.s */,
 			);
 			path = apple1;
 			sourceTree = "<group>";
@@ -357,8 +360,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E66839061BA53A82008F0F06 /* pia.c in Sources */,
-				E668389E1BA4F51E008F0F06 /* main.c in Sources */,
+				E6CF366C1CB9D267008A8A43 /* pia.c in Sources */,
+				E6CF366B1CB9D267008A8A43 /* main.c in Sources */,
+				E6CF366D1CB9D267008A8A43 /* wozmon.s in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/apple1/apple1.1 b/src/apple1.1
similarity index 100%
rename from apple1/apple1.1
rename to src/apple1.1
diff --git a/apple1/main.c b/src/main.c
similarity index 100%
rename from apple1/main.c
rename to src/main.c
diff --git a/apple1/pia.c b/src/pia.c
similarity index 100%
rename from apple1/pia.c
rename to src/pia.c
diff --git a/apple1/pia.h b/src/pia.h
similarity index 100%
rename from apple1/pia.h
rename to src/pia.h
diff --git a/apple1/wozmon.s b/src/wozmon.s
similarity index 100%
rename from apple1/wozmon.s
rename to src/wozmon.s