diff --git a/compile b/compile
index e6bf2a4..23050bf 100755
--- a/compile
+++ b/compile
@@ -3,9 +3,11 @@
 CC=clang
 WAPP_INCLUDE="$(find intern/wapp/src -type d | xargs -I{} echo -n "-I{} ")"
 WAPP_SRC="$(find intern/wapp/src -type f -name "*.c" | xargs -I{} echo -n "{} ")"
-CFLAGS="-g -Isrc $WAPP_INCLUDE"
+TINYRENDER_INCLUDE="$(find src -type d | xargs -I{} echo -n "-I{} ")"
+TINYRENDER_SRC="$(find src -type f -name "*.c" | xargs -I{} echo -n "{} ")"
+CFLAGS="-g $TINYRENDER_INCLUDE $WAPP_INCLUDE"
 LIBS="-lm"
-SRC="src/*.c $WAPP_SRC"
+SRC="$TINYRENDER_SRC $WAPP_SRC"
 OUT=tiny
 
 (set -x ; $CC $CFLAGS $LIBS $SRC -o $OUT)
diff --git a/src/img.c b/src/img/img.c
similarity index 100%
rename from src/img.c
rename to src/img/img.c
diff --git a/src/img.h b/src/img/img.h
similarity index 100%
rename from src/img.h
rename to src/img/img.h
diff --git a/src/typed_list.c b/src/list/typed_list.c
similarity index 100%
rename from src/typed_list.c
rename to src/list/typed_list.c
diff --git a/src/typed_list.h b/src/list/typed_list.h
similarity index 100%
rename from src/typed_list.h
rename to src/list/typed_list.h
diff --git a/src/obj.c b/src/obj/obj.c
similarity index 100%
rename from src/obj.c
rename to src/obj/obj.c
diff --git a/src/obj.h b/src/obj/obj.h
similarity index 100%
rename from src/obj.h
rename to src/obj/obj.h
diff --git a/src/pam.c b/src/pam/pam.c
similarity index 100%
rename from src/pam.c
rename to src/pam/pam.c
diff --git a/src/pam.h b/src/pam/pam.h
similarity index 100%
rename from src/pam.h
rename to src/pam/pam.h
diff --git a/src/shader.c b/src/shader/shader.c
similarity index 100%
rename from src/shader.c
rename to src/shader/shader.c
diff --git a/src/shader.h b/src/shader/shader.h
similarity index 100%
rename from src/shader.h
rename to src/shader/shader.h
diff --git a/src/shaders.c b/src/shader/shaders.c
similarity index 100%
rename from src/shaders.c
rename to src/shader/shaders.c
diff --git a/src/shaders.h b/src/shader/shaders.h
similarity index 100%
rename from src/shaders.h
rename to src/shader/shaders.h
diff --git a/src/utils.c b/src/utils/utils.c
similarity index 100%
rename from src/utils.c
rename to src/utils/utils.c
diff --git a/src/utils.h b/src/utils/utils.h
similarity index 100%
rename from src/utils.h
rename to src/utils/utils.h
diff --git a/src/vec.c b/src/vec/vec.c
similarity index 100%
rename from src/vec.c
rename to src/vec/vec.c
diff --git a/src/vec.h b/src/vec/vec.h
similarity index 100%
rename from src/vec.h
rename to src/vec/vec.h