diff --git a/Makefile b/Makefile
index 398222b..514710d 100644
--- a/Makefile
+++ b/Makefile
@@ -38,11 +38,11 @@ MODULES_SRC = \
 	src/xbase.c
 
 DWM_SRC = \
-	src/dwm/bar.c \
-	src/dwm/handlers.c \
-	src/dwm/layouts.c \
-	src/dwm/wmcheckwin.c \
-	src/dwm/xerror.c
+	src/dwm/spaghetti/bar.c \
+	src/dwm/spaghetti/handlers.c \
+	src/dwm/spaghetti/layouts.c \
+	src/dwm/spaghetti/wmcheckwin.c \
+	src/dwm/spaghetti/xerror.c
 
 TEST_SRC = \
 	tests/geom_basic_geom.c \
diff --git a/src/dwm.c b/src/dwm.c
index 5ff9ce7..b2f6d68 100644
--- a/src/dwm.c
+++ b/src/dwm.c
@@ -195,12 +195,12 @@ static Monitor *wintomon(Window w);
 
 extern const Layout layouts[];
 
-#include "dwm/bar.h"
-#include "dwm/handlers.h"
-#include "dwm/interaction.h"
-#include "dwm/layouts.h"
-#include "dwm/wmcheckwin.h"
-#include "dwm/xerror.h"
+#include "dwm/spaghetti/bar.h"
+#include "dwm/spaghetti/handlers.h"
+#include "dwm/spaghetti/interaction.h"
+#include "dwm/spaghetti/layouts.h"
+#include "dwm/spaghetti/wmcheckwin.h"
+#include "dwm/spaghetti/xerror.h"
 
 /*************
  * variables *
@@ -260,12 +260,12 @@ const Layout layouts[] = {
  * Private function implementations *
  ************************************/
 
-#include "dwm/bar.c"
-#include "dwm/handlers.c"
-#include "dwm/interaction.c"
-#include "dwm/layouts.c"
-#include "dwm/wmcheckwin.c"
-#include "dwm/xerror.c"
+#include "dwm/spaghetti/bar.c"
+#include "dwm/spaghetti/handlers.c"
+#include "dwm/spaghetti/interaction.c"
+#include "dwm/spaghetti/layouts.c"
+#include "dwm/spaghetti/wmcheckwin.c"
+#include "dwm/spaghetti/xerror.c"
 
 /***********************************
  * Public function implementations *
diff --git a/src/dwm/bar.c b/src/dwm/spaghetti/bar.c
similarity index 100%
rename from src/dwm/bar.c
rename to src/dwm/spaghetti/bar.c
diff --git a/src/dwm/bar.h b/src/dwm/spaghetti/bar.h
similarity index 100%
rename from src/dwm/bar.h
rename to src/dwm/spaghetti/bar.h
diff --git a/src/dwm/handlers.c b/src/dwm/spaghetti/handlers.c
similarity index 100%
rename from src/dwm/handlers.c
rename to src/dwm/spaghetti/handlers.c
diff --git a/src/dwm/handlers.h b/src/dwm/spaghetti/handlers.h
similarity index 100%
rename from src/dwm/handlers.h
rename to src/dwm/spaghetti/handlers.h
diff --git a/src/dwm/interaction.c b/src/dwm/spaghetti/interaction.c
similarity index 100%
rename from src/dwm/interaction.c
rename to src/dwm/spaghetti/interaction.c
diff --git a/src/dwm/interaction.h b/src/dwm/spaghetti/interaction.h
similarity index 100%
rename from src/dwm/interaction.h
rename to src/dwm/spaghetti/interaction.h
diff --git a/src/dwm/layouts.c b/src/dwm/spaghetti/layouts.c
similarity index 100%
rename from src/dwm/layouts.c
rename to src/dwm/spaghetti/layouts.c
diff --git a/src/dwm/layouts.h b/src/dwm/spaghetti/layouts.h
similarity index 100%
rename from src/dwm/layouts.h
rename to src/dwm/spaghetti/layouts.h
diff --git a/src/dwm/wmcheckwin.c b/src/dwm/spaghetti/wmcheckwin.c
similarity index 100%
rename from src/dwm/wmcheckwin.c
rename to src/dwm/spaghetti/wmcheckwin.c
diff --git a/src/dwm/wmcheckwin.h b/src/dwm/spaghetti/wmcheckwin.h
similarity index 100%
rename from src/dwm/wmcheckwin.h
rename to src/dwm/spaghetti/wmcheckwin.h
diff --git a/src/dwm/xerror.c b/src/dwm/spaghetti/xerror.c
similarity index 100%
rename from src/dwm/xerror.c
rename to src/dwm/spaghetti/xerror.c
diff --git a/src/dwm/xerror.h b/src/dwm/spaghetti/xerror.h
similarity index 100%
rename from src/dwm/xerror.h
rename to src/dwm/spaghetti/xerror.h