diff --git a/debugger.cpp b/debugger/debugger.cpp
similarity index 98%
rename from debugger.cpp
rename to debugger/debugger.cpp
index 9fd916c..251bf56 100644
--- a/debugger.cpp
+++ b/debugger/debugger.cpp
@@ -3,8 +3,8 @@
 #include <sstream>
 #include <iostream>
 #include <map>
-#include "ppcemumain.h"
-#include "ppcmemory.h"
+#include "../ppcemumain.h"
+#include "../ppcmemory.h"
 
 
 using namespace std;
diff --git a/debugger.h b/debugger/debugger.h
similarity index 100%
rename from debugger.h
rename to debugger/debugger.h
diff --git a/main.cpp b/main.cpp
index 2e84365..ec96d6c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,7 +22,7 @@
 #include "ppcemumain.h"
 #include "ppcmemory.h"
 #include "devices/mpc106.h"
-#include "debugger.h"
+#include "debugger/debugger.h"
 #include "devices/machineid.h"
 #include "devices/macio.h"
 #include "devices/mpc106.h"
diff --git a/makefile b/makefile
index 0978439..48613c6 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 EXE	 := dingusppc
-MODULES := . devices
+MODULES := . devices debugger
 SRCS := $(foreach sdir,$(MODULES),$(wildcard $(sdir)/*.cpp))
 #SRCS = $(wildcard *.cpp)
 OBJS := $(patsubst %.cpp, %.o, $(SRCS))
@@ -22,5 +22,6 @@ $(EXE) : $(OBJS)
 
 clean:
 	rm -rf *.o *.d devices/*.o devices/*.d $(EXE)
+	rm -rf *.o *.d debugger/*.o debugger/*.d $(EXE)
 
 -include $(DEPS)