diff --git a/Makefile b/Makefile
index 62edf8d..78e1807 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: tests
+all: tests/tests
 
-tests: test.m XMPPConnection.m XMPPStanza.m
-	objfw-compile -o $@ $^ -lidn -Wall -Werror
+tests/tests: tests/test.m src/XMPPConnection.m src/XMPPStanza.m
+	objfw-compile -o $@ $^ -lidn -Wall -Werror -Isrc
diff --git a/XMPPStanza.o b/XMPPStanza.o
deleted file mode 100644
index 648bbe8..0000000
Binary files a/XMPPStanza.o and /dev/null differ
diff --git a/XMPPConnection.h b/src/XMPPConnection.h
similarity index 100%
rename from XMPPConnection.h
rename to src/XMPPConnection.h
diff --git a/XMPPConnection.m b/src/XMPPConnection.m
similarity index 100%
rename from XMPPConnection.m
rename to src/XMPPConnection.m
diff --git a/XMPPStanza.h b/src/XMPPStanza.h
similarity index 100%
rename from XMPPStanza.h
rename to src/XMPPStanza.h
diff --git a/XMPPStanza.m b/src/XMPPStanza.m
similarity index 100%
rename from XMPPStanza.m
rename to src/XMPPStanza.m
diff --git a/test.m b/tests/test.m
similarity index 100%
rename from test.m
rename to tests/test.m