diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c294ecb2..2b5631f81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,12 @@
 cmake_minimum_required(VERSION 2.6)
 project(GBAc)
 set(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wextra")
-file(GLOB SOURCES src/*.c third-party/linenoise/linenoise.c)
+file(GLOB ARM_SRC ${CMAKE_SOURCE_DIR}/src/arm/*.c)
+file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
+file(GLOB DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/*.c)
+file(GLOB THIRD_PARTY ${CMAKE_SOURCE_DIR}/third-party/linenoise/linenoise.c)
+include_directories(${CMAKE_SOURCE_DIR}/src/arm)
+include_directories(${CMAKE_SOURCE_DIR}/src/gba)
+include_directories(${CMAKE_SOURCE_DIR}/src/debugger)
 include_directories(${CMAKE_SOURCE_DIR}/third-party/linenoise)
-add_executable(gbac ${SOURCES})
+add_executable(gbac ${ARM_SRC} ${GBA_SRC} ${DEBUGGER_SRC} ${THIRD_PARTY} ${CMAKE_SOURCE_DIR}/src/main.c)
diff --git a/src/arm.c b/src/arm/arm.c
similarity index 100%
rename from src/arm.c
rename to src/arm/arm.c
diff --git a/src/arm.h b/src/arm/arm.h
similarity index 100%
rename from src/arm.h
rename to src/arm/arm.h
diff --git a/src/isa-arm.c b/src/arm/isa-arm.c
similarity index 100%
rename from src/isa-arm.c
rename to src/arm/isa-arm.c
diff --git a/src/isa-arm.h b/src/arm/isa-arm.h
similarity index 100%
rename from src/isa-arm.h
rename to src/arm/isa-arm.h
diff --git a/src/isa-inlines.h b/src/arm/isa-inlines.h
similarity index 100%
rename from src/isa-inlines.h
rename to src/arm/isa-inlines.h
diff --git a/src/isa-thumb.c b/src/arm/isa-thumb.c
similarity index 100%
rename from src/isa-thumb.c
rename to src/arm/isa-thumb.c
diff --git a/src/isa-thumb.h b/src/arm/isa-thumb.h
similarity index 100%
rename from src/isa-thumb.h
rename to src/arm/isa-thumb.h
diff --git a/src/debugger.c b/src/debugger/debugger.c
similarity index 100%
rename from src/debugger.c
rename to src/debugger/debugger.c
diff --git a/src/debugger.h b/src/debugger/debugger.h
similarity index 100%
rename from src/debugger.h
rename to src/debugger/debugger.h
diff --git a/src/gba.c b/src/gba/gba.c
similarity index 100%
rename from src/gba.c
rename to src/gba/gba.c
diff --git a/src/gba.h b/src/gba/gba.h
similarity index 100%
rename from src/gba.h
rename to src/gba/gba.h