diff --git a/Makefile b/Makefile
index dee6348..fa7a27f 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ all: bspwm bspc
 debug: CFLAGS += -O0 -g
 debug: bspwm bspc
 
+VPATH=src
+
 include Sourcedeps
 
 $(WM_OBJ) $(CLI_OBJ): Makefile
diff --git a/Sourcedeps b/Sourcedeps
index 286d5b7..ddc1030 100644
--- a/Sourcedeps
+++ b/Sourcedeps
@@ -1,20 +1,21 @@
 bspc.o: bspc.c common.h helpers.h
-bspwm.o: bspwm.c bspwm.h common.h desktop.h events.h ewmh.h helpers.h history.h messages.h monitor.h rule.h settings.h subscribe.h types.h window.h
+bspwm.o: bspwm.c bspwm.h common.h desktop.h events.h ewmh.h helpers.h history.h messages.h monitor.h pointer.h rule.h settings.h subscribe.h types.h window.h
 desktop.o: desktop.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h settings.h subscribe.h tree.h types.h window.h
-events.o: events.c bspwm.h events.h ewmh.h helpers.h monitor.h query.h settings.h subscribe.h tree.h types.h window.h
+events.o: events.c bspwm.h events.h ewmh.h helpers.h monitor.h pointer.h query.h settings.h subscribe.h tree.h types.h window.h
 ewmh.o: ewmh.c bspwm.h ewmh.h helpers.h settings.h tree.h types.h
+geometry.o: geometry.c geometry.h helpers.h types.h
 helpers.o: helpers.c bspwm.h helpers.h types.h
 history.o: history.c bspwm.h helpers.h query.h tree.h types.h
 jsmn.o: jsmn.c jsmn.h
 messages.o: messages.c bspwm.h common.h desktop.h helpers.h jsmn.h messages.h monitor.h parse.h pointer.h query.h restore.h rule.h settings.h subscribe.h tree.h types.h window.h
-monitor.o: monitor.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h settings.h subscribe.h tree.h types.h window.h
+monitor.o: monitor.c bspwm.h desktop.h ewmh.h geometry.h helpers.h monitor.h pointer.h query.h settings.h subscribe.h tree.h types.h window.h
 parse.o: parse.c helpers.h parse.h subscribe.h types.h
-pointer.o: pointer.c bspwm.h helpers.h monitor.h query.h settings.h stack.h subscribe.h tree.h types.h window.h
-query.o: query.c bspwm.h desktop.h helpers.h history.h monitor.h parse.h query.h subscribe.h tree.h types.h
-restore.o: restore.c bspwm.h desktop.h ewmh.h helpers.h history.h jsmn.h monitor.h parse.h query.h restore.h settings.h stack.h subscribe.h tree.h types.h
+pointer.o: pointer.c bspwm.h events.h helpers.h monitor.h pointer.h query.h settings.h stack.h subscribe.h tree.h types.h window.h
+query.o: query.c bspwm.h desktop.h helpers.h history.h monitor.h parse.h query.h subscribe.h tree.h types.h window.h
+restore.o: restore.c bspwm.h desktop.h ewmh.h helpers.h history.h jsmn.h monitor.h parse.h pointer.h query.h restore.h settings.h stack.h subscribe.h tree.h types.h window.h
 rule.o: rule.c bspwm.h ewmh.h helpers.h parse.h rule.h settings.h subscribe.h types.h window.h
 settings.o: settings.c bspwm.h helpers.h settings.h types.h
 stack.o: stack.c bspwm.h ewmh.h helpers.h stack.h subscribe.h tree.h types.h window.h
-subscribe.o: subscribe.c bspwm.h helpers.h settings.h subscribe.h tree.h types.h
-tree.o: tree.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h settings.h stack.h subscribe.h tree.h types.h window.h
-window.o: window.c bspwm.h ewmh.h helpers.h monitor.h parse.h query.h rule.h settings.h stack.h subscribe.h tree.h types.h window.h
+subscribe.o: subscribe.c bspwm.h desktop.h helpers.h settings.h subscribe.h types.h
+tree.o: tree.c bspwm.h desktop.h ewmh.h geometry.h helpers.h history.h monitor.h pointer.h query.h settings.h stack.h subscribe.h tree.h types.h window.h
+window.o: window.c bspwm.h ewmh.h geometry.h helpers.h monitor.h parse.h pointer.h query.h rule.h settings.h stack.h subscribe.h tree.h types.h window.h
diff --git a/bspc.c b/src/bspc.c
similarity index 100%
rename from bspc.c
rename to src/bspc.c
diff --git a/bspwm.c b/src/bspwm.c
similarity index 100%
rename from bspwm.c
rename to src/bspwm.c
diff --git a/bspwm.h b/src/bspwm.h
similarity index 100%
rename from bspwm.h
rename to src/bspwm.h
diff --git a/common.h b/src/common.h
similarity index 100%
rename from common.h
rename to src/common.h
diff --git a/desktop.c b/src/desktop.c
similarity index 100%
rename from desktop.c
rename to src/desktop.c
diff --git a/desktop.h b/src/desktop.h
similarity index 100%
rename from desktop.h
rename to src/desktop.h
diff --git a/events.c b/src/events.c
similarity index 100%
rename from events.c
rename to src/events.c
diff --git a/events.h b/src/events.h
similarity index 100%
rename from events.h
rename to src/events.h
diff --git a/ewmh.c b/src/ewmh.c
similarity index 100%
rename from ewmh.c
rename to src/ewmh.c
diff --git a/ewmh.h b/src/ewmh.h
similarity index 100%
rename from ewmh.h
rename to src/ewmh.h
diff --git a/geometry.c b/src/geometry.c
similarity index 100%
rename from geometry.c
rename to src/geometry.c
diff --git a/geometry.h b/src/geometry.h
similarity index 100%
rename from geometry.h
rename to src/geometry.h
diff --git a/helpers.c b/src/helpers.c
similarity index 100%
rename from helpers.c
rename to src/helpers.c
diff --git a/helpers.h b/src/helpers.h
similarity index 100%
rename from helpers.h
rename to src/helpers.h
diff --git a/history.c b/src/history.c
similarity index 100%
rename from history.c
rename to src/history.c
diff --git a/history.h b/src/history.h
similarity index 100%
rename from history.h
rename to src/history.h
diff --git a/jsmn.c b/src/jsmn.c
similarity index 100%
rename from jsmn.c
rename to src/jsmn.c
diff --git a/jsmn.h b/src/jsmn.h
similarity index 100%
rename from jsmn.h
rename to src/jsmn.h
diff --git a/messages.c b/src/messages.c
similarity index 100%
rename from messages.c
rename to src/messages.c
diff --git a/messages.h b/src/messages.h
similarity index 100%
rename from messages.h
rename to src/messages.h
diff --git a/monitor.c b/src/monitor.c
similarity index 100%
rename from monitor.c
rename to src/monitor.c
diff --git a/monitor.h b/src/monitor.h
similarity index 100%
rename from monitor.h
rename to src/monitor.h
diff --git a/parse.c b/src/parse.c
similarity index 100%
rename from parse.c
rename to src/parse.c
diff --git a/parse.h b/src/parse.h
similarity index 100%
rename from parse.h
rename to src/parse.h
diff --git a/pointer.c b/src/pointer.c
similarity index 100%
rename from pointer.c
rename to src/pointer.c
diff --git a/pointer.h b/src/pointer.h
similarity index 100%
rename from pointer.h
rename to src/pointer.h
diff --git a/query.c b/src/query.c
similarity index 100%
rename from query.c
rename to src/query.c
diff --git a/query.h b/src/query.h
similarity index 100%
rename from query.h
rename to src/query.h
diff --git a/restore.c b/src/restore.c
similarity index 100%
rename from restore.c
rename to src/restore.c
diff --git a/restore.h b/src/restore.h
similarity index 100%
rename from restore.h
rename to src/restore.h
diff --git a/rule.c b/src/rule.c
similarity index 100%
rename from rule.c
rename to src/rule.c
diff --git a/rule.h b/src/rule.h
similarity index 100%
rename from rule.h
rename to src/rule.h
diff --git a/settings.c b/src/settings.c
similarity index 100%
rename from settings.c
rename to src/settings.c
diff --git a/settings.h b/src/settings.h
similarity index 100%
rename from settings.h
rename to src/settings.h
diff --git a/stack.c b/src/stack.c
similarity index 100%
rename from stack.c
rename to src/stack.c
diff --git a/stack.h b/src/stack.h
similarity index 100%
rename from stack.h
rename to src/stack.h
diff --git a/subscribe.c b/src/subscribe.c
similarity index 100%
rename from subscribe.c
rename to src/subscribe.c
diff --git a/subscribe.h b/src/subscribe.h
similarity index 100%
rename from subscribe.h
rename to src/subscribe.h
diff --git a/tree.c b/src/tree.c
similarity index 100%
rename from tree.c
rename to src/tree.c
diff --git a/tree.h b/src/tree.h
similarity index 100%
rename from tree.h
rename to src/tree.h
diff --git a/types.h b/src/types.h
similarity index 100%
rename from types.h
rename to src/types.h
diff --git a/window.c b/src/window.c
similarity index 100%
rename from window.c
rename to src/window.c
diff --git a/window.h b/src/window.h
similarity index 100%
rename from window.h
rename to src/window.h