diff --git a/.gitignore b/.gitignore
index dfb1cf9..36f9d86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-test
-test.exe
 minio
diff --git a/Makefile b/Makefile
index a941057..cae706f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,4 +5,4 @@ else
 endif
 
 all:
-	cc s3.c test.c -o test -Wall -Wextra $(LFLAGS) -ggdb
+	cc s3.c test/generate_test_url.c -o test/generate_test_url -Wall -Wextra $(LFLAGS) -ggdb
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ecfb1ff
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# S3
+This is a small library for generating presigned URLs for AWS S3.
diff --git a/test.c b/test/generate_test_url.c
similarity index 96%
rename from test.c
rename to test/generate_test_url.c
index 5d7587a..6fc14ce 100644
--- a/test.c
+++ b/test/generate_test_url.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "s3.h"
+#include "../s3.h"
 
 int main(void)
 {
diff --git a/test/generate_test_url.exe b/test/generate_test_url.exe
new file mode 100644
index 0000000..32f73a0
Binary files /dev/null and b/test/generate_test_url.exe differ
diff --git a/test.sh b/test/spawn_mock_server.sh
similarity index 100%
rename from test.sh
rename to test/spawn_mock_server.sh