diff --git a/Makefile b/Makefile
index 749de69..d4b4f85 100644
--- a/Makefile
+++ b/Makefile
@@ -25,43 +25,56 @@ all: $(BIN)
 $(BIN): $(OBJ)
 	$(CC) $(CFLAGS) $(OBJ) -o $@
 
-$(BUILDDIR)/audioextract.o: audioextract.c audioextract.h ogg.h riff.h aiff.h mpg123.h mp4.h id3.h midi.h mod.h s3m.h it.h asf.h bink.h
+$(BUILDDIR)/audioextract.o: src/audioextract.c \
+		src/audioextract.h \
+		src/ogg.h \
+		src/riff.h \
+		src/aiff.h \
+		src/mpg123.h \
+		src/mp4.h \
+		src/id3.h \
+		src/midi.h \
+		src/mod.h \
+		src/s3m.h \
+		src/it.h \
+		src/asf.h \
+		src/bink.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/riff.o: riff.c audioextract.h riff.h
+$(BUILDDIR)/riff.o: src/riff.c src/audioextract.h src/riff.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/aiff.o: aiff.c audioextract.h aiff.h
+$(BUILDDIR)/aiff.o: src/aiff.c src/audioextract.h src/aiff.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/ogg.o: ogg.c audioextract.h ogg.h
+$(BUILDDIR)/ogg.o: src/ogg.c src/audioextract.h src/ogg.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/mpg123.o: mpg123.c audioextract.h mpg123.h
+$(BUILDDIR)/mpg123.o: src/mpg123.c src/audioextract.h src/mpg123.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/mp4.o: mp4.c audioextract.h mp4.h
+$(BUILDDIR)/mp4.o: src/mp4.c src/audioextract.h src/mp4.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/id3.o: id3.c audioextract.h id3.h
+$(BUILDDIR)/id3.o: src/id3.c src/audioextract.h src/id3.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/midi.o: midi.c audioextract.h midi.h
+$(BUILDDIR)/midi.o: src/midi.c src/audioextract.h src/midi.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/mod.o: mod.c audioextract.h mod.h
+$(BUILDDIR)/mod.o: src/mod.c src/audioextract.h src/mod.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/s3m.o: s3m.c audioextract.h s3m.h
+$(BUILDDIR)/s3m.o: src/s3m.c src/audioextract.h src/s3m.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/it.o: it.c audioextract.h it.h
+$(BUILDDIR)/it.o: src/it.c src/audioextract.h src/it.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/asf.o: asf.c audioextract.h asf.h
+$(BUILDDIR)/asf.o: src/asf.c src/audioextract.h src/asf.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
-$(BUILDDIR)/bink.o: bink.c audioextract.h bink.h
+$(BUILDDIR)/bink.o: src/bink.c src/audioextract.h src/bink.h
 	$(CC) $(CFLAGS) $< -o $@ -c
 
 install: $(PREFIX)/bin/audioextract
diff --git a/aiff.c b/src/aiff.c
similarity index 100%
rename from aiff.c
rename to src/aiff.c
diff --git a/aiff.h b/src/aiff.h
similarity index 100%
rename from aiff.h
rename to src/aiff.h
diff --git a/asf.c b/src/asf.c
similarity index 100%
rename from asf.c
rename to src/asf.c
diff --git a/asf.h b/src/asf.h
similarity index 100%
rename from asf.h
rename to src/asf.h
diff --git a/audioextract.c b/src/audioextract.c
similarity index 100%
rename from audioextract.c
rename to src/audioextract.c
diff --git a/audioextract.h b/src/audioextract.h
similarity index 100%
rename from audioextract.h
rename to src/audioextract.h
diff --git a/bink.c b/src/bink.c
similarity index 100%
rename from bink.c
rename to src/bink.c
diff --git a/bink.h b/src/bink.h
similarity index 100%
rename from bink.h
rename to src/bink.h
diff --git a/id3.c b/src/id3.c
similarity index 100%
rename from id3.c
rename to src/id3.c
diff --git a/id3.h b/src/id3.h
similarity index 100%
rename from id3.h
rename to src/id3.h
diff --git a/it.c b/src/it.c
similarity index 100%
rename from it.c
rename to src/it.c
diff --git a/it.h b/src/it.h
similarity index 100%
rename from it.h
rename to src/it.h
diff --git a/midi.c b/src/midi.c
similarity index 100%
rename from midi.c
rename to src/midi.c
diff --git a/midi.h b/src/midi.h
similarity index 100%
rename from midi.h
rename to src/midi.h
diff --git a/mod.c b/src/mod.c
similarity index 100%
rename from mod.c
rename to src/mod.c
diff --git a/mod.h b/src/mod.h
similarity index 100%
rename from mod.h
rename to src/mod.h
diff --git a/mp4.c b/src/mp4.c
similarity index 100%
rename from mp4.c
rename to src/mp4.c
diff --git a/mp4.h b/src/mp4.h
similarity index 100%
rename from mp4.h
rename to src/mp4.h
diff --git a/mpg123.c b/src/mpg123.c
similarity index 100%
rename from mpg123.c
rename to src/mpg123.c
diff --git a/mpg123.h b/src/mpg123.h
similarity index 100%
rename from mpg123.h
rename to src/mpg123.h
diff --git a/ogg.c b/src/ogg.c
similarity index 100%
rename from ogg.c
rename to src/ogg.c
diff --git a/ogg.h b/src/ogg.h
similarity index 100%
rename from ogg.h
rename to src/ogg.h
diff --git a/riff.c b/src/riff.c
similarity index 100%
rename from riff.c
rename to src/riff.c
diff --git a/riff.h b/src/riff.h
similarity index 100%
rename from riff.h
rename to src/riff.h
diff --git a/s3m.c b/src/s3m.c
similarity index 100%
rename from s3m.c
rename to src/s3m.c
diff --git a/s3m.h b/src/s3m.h
similarity index 100%
rename from s3m.h
rename to src/s3m.h