diff --git a/Makefile b/Makefile
index 0fa2868..d91dfbb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 compile:
-	g++ -g *.cpp -lSDL2 -o gb
+	g++ -g source/*.cpp -lSDL2 -o gb
 
 run: compile
 	./gb tetris.gb
@@ -11,7 +11,7 @@ debug1: compile
 	gdb -ex run gb
 
 release:
-	g++ -O3 *.cpp -lSDL2 -o gb
+	g++ -O3 source/*.cpp -lSDL2 -o gb
 
 profile:
-	g++ -g *.cpp -lSDL2 -o gb -pg
+	g++ -g source/*.cpp -lSDL2 -o gb -pg
diff --git a/lagueirtofile b/lagueirtofile
index d5fc4b8..640154e 100644
--- a/lagueirtofile
+++ b/lagueirtofile
@@ -2,5 +2,5 @@
 cppflags = -g
 libs = -lSDL2
 executable = gb
-sourcepath = .
+sourcepath = source
 buildpath = build
diff --git a/apu.cpp b/source/apu.cpp
similarity index 100%
rename from apu.cpp
rename to source/apu.cpp
diff --git a/apu.h b/source/apu.h
similarity index 100%
rename from apu.h
rename to source/apu.h
diff --git a/audio_viewer.cpp b/source/audio_viewer.cpp
similarity index 100%
rename from audio_viewer.cpp
rename to source/audio_viewer.cpp
diff --git a/audio_viewer.h b/source/audio_viewer.h
similarity index 100%
rename from audio_viewer.h
rename to source/audio_viewer.h
diff --git a/debug.cpp b/source/debug.cpp
similarity index 100%
rename from debug.cpp
rename to source/debug.cpp
diff --git a/debug.h b/source/debug.h
similarity index 100%
rename from debug.h
rename to source/debug.h
diff --git a/display.cpp b/source/display.cpp
similarity index 100%
rename from display.cpp
rename to source/display.cpp
diff --git a/display.h b/source/display.h
similarity index 100%
rename from display.h
rename to source/display.h
diff --git a/interrupts.h b/source/interrupts.h
similarity index 100%
rename from interrupts.h
rename to source/interrupts.h
diff --git a/main.cpp b/source/main.cpp
similarity index 100%
rename from main.cpp
rename to source/main.cpp
diff --git a/mbc1.cpp b/source/mbc1.cpp
similarity index 100%
rename from mbc1.cpp
rename to source/mbc1.cpp
diff --git a/mbc1.h b/source/mbc1.h
similarity index 100%
rename from mbc1.h
rename to source/mbc1.h
diff --git a/mbc3.cpp b/source/mbc3.cpp
similarity index 100%
rename from mbc3.cpp
rename to source/mbc3.cpp
diff --git a/mbc3.h b/source/mbc3.h
similarity index 100%
rename from mbc3.h
rename to source/mbc3.h
diff --git a/mbc_none.cpp b/source/mbc_none.cpp
similarity index 100%
rename from mbc_none.cpp
rename to source/mbc_none.cpp
diff --git a/mbc_none.h b/source/mbc_none.h
similarity index 100%
rename from mbc_none.h
rename to source/mbc_none.h
diff --git a/mem.cpp b/source/mem.cpp
similarity index 100%
rename from mem.cpp
rename to source/mem.cpp
diff --git a/mem.h b/source/mem.h
similarity index 100%
rename from mem.h
rename to source/mem.h
diff --git a/ppu.cpp b/source/ppu.cpp
similarity index 100%
rename from ppu.cpp
rename to source/ppu.cpp
diff --git a/ppu.h b/source/ppu.h
similarity index 100%
rename from ppu.h
rename to source/ppu.h
diff --git a/sm83.cpp b/source/sm83.cpp
similarity index 100%
rename from sm83.cpp
rename to source/sm83.cpp
diff --git a/sm83.h b/source/sm83.h
similarity index 100%
rename from sm83.h
rename to source/sm83.h
diff --git a/sm83dis.cpp b/source/sm83dis.cpp
similarity index 99%
rename from sm83dis.cpp
rename to source/sm83dis.cpp
index f5a288b..838c605 100644
--- a/sm83dis.cpp
+++ b/source/sm83dis.cpp
@@ -1,5 +1,4 @@
 #include "sm83dis.h"
-#include "sm83.h"
 #include "mem.h"
 #include <string.h>
 #include <stdio.h>
diff --git a/sm83dis.h b/source/sm83dis.h
similarity index 100%
rename from sm83dis.h
rename to source/sm83dis.h
diff --git a/ui.cpp b/source/ui.cpp
similarity index 100%
rename from ui.cpp
rename to source/ui.cpp
diff --git a/ui.h b/source/ui.h
similarity index 100%
rename from ui.h
rename to source/ui.h
diff --git a/ui_menu.cpp b/source/ui_menu.cpp
similarity index 100%
rename from ui_menu.cpp
rename to source/ui_menu.cpp
diff --git a/ui_menu.h b/source/ui_menu.h
similarity index 100%
rename from ui_menu.h
rename to source/ui_menu.h
diff --git a/ui_window.cpp b/source/ui_window.cpp
similarity index 100%
rename from ui_window.cpp
rename to source/ui_window.cpp
diff --git a/ui_window.h b/source/ui_window.h
similarity index 100%
rename from ui_window.h
rename to source/ui_window.h