diff --git a/Makefile b/Makefile
index 4c9e7d68..b12c1de5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,17 @@ PREFIX = /usr
 MANDIR = $(PREFIX)/share/man/man1
 OBJS = compton.o
 
-.c.o:
-	$(CC) $(CFLAGS) $(INCS) -c $*.c
+%.o: src/%.c src/%.h
+	$(CC) $(CFLAGS) $(INCS) -c src/$*.c
 
 compton: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
 
-$(OBJS): compton.h
-
 install: compton
 	@cp -t $(PREFIX)/bin compton
 	@[ -d "$(MANDIR)" ] \
-	  && cp -t "$(MANDIR)" compton.1
-	@cp -t $(PREFIX)/bin settrans
+	  && cp -t "$(MANDIR)" man/compton.1
+	@cp -t $(PREFIX)/bin bin/settrans
 
 uninstall:
 	@rm -f $(PREFIX)/bin/compton
diff --git a/settrans b/bin/settrans
similarity index 100%
rename from settrans
rename to bin/settrans
diff --git a/compton.1 b/man/compton.1
similarity index 100%
rename from compton.1
rename to man/compton.1
diff --git a/compton.c b/src/compton.c
similarity index 100%
rename from compton.c
rename to src/compton.c
diff --git a/compton.h b/src/compton.h
similarity index 100%
rename from compton.h
rename to src/compton.h