diff --git a/src/6502.cc b/6502/6502.cc
similarity index 100%
rename from src/6502.cc
rename to 6502/6502.cc
diff --git a/src/6502.h b/6502/6502.h
similarity index 100%
rename from src/6502.h
rename to 6502/6502.h
diff --git a/src/CMakeLists.txt b/6502/CMakeLists.txt
similarity index 94%
rename from src/CMakeLists.txt
rename to 6502/CMakeLists.txt
index afa4cf4..146816b 100644
--- a/src/CMakeLists.txt
+++ b/6502/CMakeLists.txt
@@ -18,8 +18,6 @@ project( lib6502 )
 
 set (SOURCES
   "6502.h"
-  "clock.h"
-  "memory.h"
   "6502.cc"
   "debug.cc"
   "opcode_map.cc"
diff --git a/src/debug.cc b/6502/debug.cc
similarity index 100%
rename from src/debug.cc
rename to 6502/debug.cc
diff --git a/src/instructions.cc b/6502/instructions.cc
similarity index 100%
rename from src/instructions.cc
rename to 6502/instructions.cc
diff --git a/src/opcode_map.cc b/6502/opcode_map.cc
similarity index 100%
rename from src/opcode_map.cc
rename to 6502/opcode_map.cc
diff --git a/src/opcodes_6502.txt b/6502/opcodes_6502.txt
similarity index 100%
rename from src/opcodes_6502.txt
rename to 6502/opcodes_6502.txt
diff --git a/src/process_opcodes.pl b/6502/process_opcodes.pl
similarity index 100%
rename from src/process_opcodes.pl
rename to 6502/process_opcodes.pl
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32bfebe..9933bbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,11 +55,11 @@ else()
 endif()
 
 add_definitions(-DBINFILE_PATH=\"${CMAKE_SOURCE_DIR}/binfiles\")
-include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_SOURCE_DIR}/clock ${CMAKE_SOURCE_DIR}/memory ${CMAKE_SOURCE_DIR}/6502)
 
 set(BINDIR "${CMAKE_BINARY_DIR}/bin")
 
-add_subdirectory(src)
+add_subdirectory(6502)
 add_subdirectory(tests)
 add_subdirectory(apple1)
 add_subdirectory(tools)
diff --git a/src/clock.h b/clock/clock.h
similarity index 100%
rename from src/clock.h
rename to clock/clock.h
diff --git a/src/memory.h b/memory/memory.h
similarity index 100%
rename from src/memory.h
rename to memory/memory.h