diff --git a/compile b/compile
index 51d2ff9..c5dac7f 100755
--- a/compile
+++ b/compile
@@ -2,15 +2,10 @@
 
 CC=clang
 INCLUDE="\
-	-Ialiases \
-	-Icpath/include \
-	-Idstr/include \
-	$(find mem/include -type d | xargs -I{} echo -n "-I{} ") \
+	$(find src -type d | xargs -I{} echo -n "-I{} ") \
 "
 SRC="\
-	cpath/src/*.c \
-	dstr/src/*.c \
-	mem/src/*/*.c \
+	$(find src -type f -name *.c | xargs -I{} echo -n "{} ") \
 "
 CFLAGS="-O3 -shared -fPIC -Wall -Werror -pedantic"
 OUT="libwapp.so"
diff --git a/aliases/aliases.h b/src/aliases/aliases.h
similarity index 100%
rename from aliases/aliases.h
rename to src/aliases/aliases.h
diff --git a/cpath/src/cpath.c b/src/cpath/cpath.c
similarity index 100%
rename from cpath/src/cpath.c
rename to src/cpath/cpath.c
diff --git a/cpath/include/cpath.h b/src/cpath/cpath.h
similarity index 100%
rename from cpath/include/cpath.h
rename to src/cpath/cpath.h
diff --git a/dstr/src/dstr.c b/src/dstr/dstr.c
similarity index 100%
rename from dstr/src/dstr.c
rename to src/dstr/dstr.c
diff --git a/dstr/include/dstr.h b/src/dstr/dstr.h
similarity index 100%
rename from dstr/include/dstr.h
rename to src/dstr/dstr.h
diff --git a/mem/src/arena/mem_arena.c b/src/mem/arena/mem_arena.c
similarity index 100%
rename from mem/src/arena/mem_arena.c
rename to src/mem/arena/mem_arena.c
diff --git a/mem/include/arena/mem_arena.h b/src/mem/arena/mem_arena.h
similarity index 100%
rename from mem/include/arena/mem_arena.h
rename to src/mem/arena/mem_arena.h
diff --git a/mem/src/util/mem_utils.c b/src/mem/util/mem_utils.c
similarity index 100%
rename from mem/src/util/mem_utils.c
rename to src/mem/util/mem_utils.c
diff --git a/mem/include/util/mem_utils.h b/src/mem/util/mem_utils.h
similarity index 100%
rename from mem/include/util/mem_utils.h
rename to src/mem/util/mem_utils.h