diff --git a/Makefile b/src/Makefile
similarity index 93%
rename from Makefile
rename to src/Makefile
index 77bcbc0..100a2cb 100644
--- a/Makefile
+++ b/src/Makefile
@@ -41,7 +41,7 @@ install: all
 	cp -f dwm ${DESTDIR}${PREFIX}/bin
 	chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
 	mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
+	sed "s/VERSION/${VERSION}/g" < ../dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
 	chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 uninstall:
diff --git a/config.def.h b/src/config.def.h
similarity index 100%
rename from config.def.h
rename to src/config.def.h
diff --git a/config.h b/src/config.h
similarity index 100%
rename from config.h
rename to src/config.h
diff --git a/config.mk b/src/config.mk
similarity index 100%
rename from config.mk
rename to src/config.mk
diff --git a/drw.c b/src/drw.c
similarity index 100%
rename from drw.c
rename to src/drw.c
diff --git a/drw.h b/src/drw.h
similarity index 100%
rename from drw.h
rename to src/drw.h
diff --git a/dwm.c b/src/dwm.c
similarity index 100%
rename from dwm.c
rename to src/dwm.c
diff --git a/keys/keys.c b/src/keys/keys.c
similarity index 100%
rename from keys/keys.c
rename to src/keys/keys.c
diff --git a/keys/keys.h b/src/keys/keys.h
similarity index 100%
rename from keys/keys.h
rename to src/keys/keys.h
diff --git a/layouts/centeredmaster.c b/src/layouts/centeredmaster.c
similarity index 100%
rename from layouts/centeredmaster.c
rename to src/layouts/centeredmaster.c
diff --git a/layouts/centeredmaster.h b/src/layouts/centeredmaster.h
similarity index 100%
rename from layouts/centeredmaster.h
rename to src/layouts/centeredmaster.h
diff --git a/layouts/fibonacci.c b/src/layouts/fibonacci.c
similarity index 100%
rename from layouts/fibonacci.c
rename to src/layouts/fibonacci.c
diff --git a/layouts/grid.c b/src/layouts/grid.c
similarity index 100%
rename from layouts/grid.c
rename to src/layouts/grid.c
diff --git a/layouts/layouts.h b/src/layouts/layouts.h
similarity index 100%
rename from layouts/layouts.h
rename to src/layouts/layouts.h
diff --git a/layouts/monocle.c b/src/layouts/monocle.c
similarity index 100%
rename from layouts/monocle.c
rename to src/layouts/monocle.c
diff --git a/layouts/tile.c b/src/layouts/tile.c
similarity index 100%
rename from layouts/tile.c
rename to src/layouts/tile.c
diff --git a/movestack.c b/src/movestack.c
similarity index 100%
rename from movestack.c
rename to src/movestack.c
diff --git a/transient.c b/src/transient.c
similarity index 100%
rename from transient.c
rename to src/transient.c
diff --git a/util.c b/src/util.c
similarity index 100%
rename from util.c
rename to src/util.c
diff --git a/util.h b/src/util.h
similarity index 100%
rename from util.h
rename to src/util.h