diff --git a/CMakeLists.txt b/CMakeLists.txt
index edc3c1c..e2c1c0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,12 @@ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-c -Wall -O3 -s")
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 
 include_directories("${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/devices"
-                    "${PROJECT_SOURCE_DIR}/debugger")
+                    "${PROJECT_SOURCE_DIR}/debugger"
+                    "${PROJECT_SOURCE_DIR}/cpu/ppc")
 
 file(GLOB SOURCES "${PROJECT_SOURCE_DIR}/*.cpp" "${PROJECT_SOURCE_DIR}/devices/*.cpp"
-                  "${PROJECT_SOURCE_DIR}/debugger/*.cpp")
+                  "${PROJECT_SOURCE_DIR}/debugger/*.cpp"
+                  "${PROJECT_SOURCE_DIR}/cpu/ppc/*.cpp")
 
 add_executable(dingusppc ${SOURCES})
 install (TARGETS dingusppc DESTINATION ${EXECUTABLE_OUTPUT_PATH})
diff --git a/poweropcodes.cpp b/cpu/ppc/poweropcodes.cpp
similarity index 100%
rename from poweropcodes.cpp
rename to cpu/ppc/poweropcodes.cpp
diff --git a/ppcfpopcodes.cpp b/cpu/ppc/ppcfpopcodes.cpp
similarity index 100%
rename from ppcfpopcodes.cpp
rename to cpu/ppc/ppcfpopcodes.cpp
diff --git a/ppcgekkoopcodes.cpp b/cpu/ppc/ppcgekkoopcodes.cpp
similarity index 100%
rename from ppcgekkoopcodes.cpp
rename to cpu/ppc/ppcgekkoopcodes.cpp
diff --git a/ppcmemory.cpp b/cpu/ppc/ppcmemory.cpp
similarity index 100%
rename from ppcmemory.cpp
rename to cpu/ppc/ppcmemory.cpp
diff --git a/ppcmemory.h b/cpu/ppc/ppcmemory.h
similarity index 100%
rename from ppcmemory.h
rename to cpu/ppc/ppcmemory.h
diff --git a/ppcopcodes.cpp b/cpu/ppc/ppcopcodes.cpp
similarity index 100%
rename from ppcopcodes.cpp
rename to cpu/ppc/ppcopcodes.cpp
diff --git a/debugger/debugger.cpp b/debugger/debugger.cpp
index 251bf56..624c180 100644
--- a/debugger/debugger.cpp
+++ b/debugger/debugger.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <map>
 #include "../ppcemumain.h"
-#include "../ppcmemory.h"
+#include "../cpu/ppc/ppcmemory.h"
 
 
 using namespace std;