diff --git a/Makefile b/Makefile
index 224493a..4c3c4db 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = atoms.c drw.c dwm.c services/datetime.c services/status.c settings.c util.c
+SRC = atoms.c datetime.c drw.c dwm.c settings.c status.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dwm
@@ -17,7 +17,7 @@ options:
 %.o: %.c
 	${CC} -c $< -o $@ ${CFLAGS}
 
-${OBJ}: atoms.h drw.h config.def.h config.mk services/datetime.h services/status.h settings.h util.h
+${OBJ}: atoms.h datetime.h drw.h config.def.h config.mk settings.h status.h util.h
 
 dwm: ${OBJ}
 	${CC} -o $@ ${OBJ} ${LDFLAGS}
diff --git a/services/datetime.c b/datetime.c
similarity index 98%
rename from services/datetime.c
rename to datetime.c
index 9171aca..7de4b78 100644
--- a/services/datetime.c
+++ b/datetime.c
@@ -1,6 +1,6 @@
 #include "datetime.h"
 
-#include "../atoms.h"
+#include "atoms.h"
 #include "status.h"
 
 #include <pthread.h>
diff --git a/services/datetime.h b/datetime.h
similarity index 100%
rename from services/datetime.h
rename to datetime.h
diff --git a/dwm.c b/dwm.c
index 42b9eda..6802ca8 100644
--- a/dwm.c
+++ b/dwm.c
@@ -42,10 +42,10 @@
 #include <X11/Xft/Xft.h>
 
 #include "atoms.h"
+#include "datetime.h"
 #include "drw.h"
-#include "services/datetime.h"
-#include "services/status.h"
 #include "settings.h"
+#include "status.h"
 #include "util.h"
 
 /* macros */
diff --git a/services/status.c b/status.c
similarity index 99%
rename from services/status.c
rename to status.c
index 7200126..13f23dc 100644
--- a/services/status.c
+++ b/status.c
@@ -1,6 +1,6 @@
 #include "status.h"
 
-#include "../atoms.h"
+#include "atoms.h"
 #include "datetime.h"
 
 #include <pthread.h>
diff --git a/services/status.h b/status.h
similarity index 100%
rename from services/status.h
rename to status.h