diff --git a/Makefile b/Makefile
index e3bd263..f619f98 100644
--- a/Makefile
+++ b/Makefile
@@ -12,21 +12,27 @@ S+=comp.c wayland.c glfw.c
 S+=vulkan.c kitty.c
 S+=gpu_allocator.c hashmap.c util.c io.c matrix.c dynarray.c image.c types.c allocator.c log.c
 S+=object.c register.c
+S+=Wayland/xdg-shell-protocol.c
 SO=$(addprefix build/,$(S:.c=.o))
-# SC=$(addprefix src/,$(S))
-SC=$S
+SC=$(addprefix src/,$(S))
 
 clean:
-	rm -f build/*
+	rm -rf build/
+	mkdir  build
+	mkdir build/Wayland
 
 install:
 	./main
 
+.c.o:
+	gcc $(FLAGS) -c -o $@ $<
 build/%.o: %.c
 	gcc -c $(FLAGS) -o $@ $<
+build/%.o: src/%.c
+	gcc -c $(FLAGS) -o $@ $<
 
-main: $(SO) Wayland/xdg-shell-protocol.c
-	gcc $(FLAGS) -o $@ $(SO) Wayland/xdg-shell-protocol.c
+main: $(SO)
+	gcc $(FLAGS) -o $@ $(SO)
 
 .DEFAULT_GOAL=main
 .PHONY: clean
diff --git a/main.c b/main.c
index e114391..68c6fc0 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
-#include "comp.h"
-#include "object.h"
-#include "register.h"
+#include "src/comp.h"
+#include "src/object.h"
+#include "src/register.h"
 #include "trig.c"
 
 #include <stdbool.h>
diff --git a/Wayland/xdg-shell-client-protocol.h b/src/Wayland/xdg-shell-client-protocol.h
similarity index 100%
rename from Wayland/xdg-shell-client-protocol.h
rename to src/Wayland/xdg-shell-client-protocol.h
diff --git a/Wayland/xdg-shell-protocol.c b/src/Wayland/xdg-shell-protocol.c
similarity index 100%
rename from Wayland/xdg-shell-protocol.c
rename to src/Wayland/xdg-shell-protocol.c
diff --git a/allocator.c b/src/allocator.c
similarity index 100%
rename from allocator.c
rename to src/allocator.c
diff --git a/allocator.h b/src/allocator.h
similarity index 100%
rename from allocator.h
rename to src/allocator.h
diff --git a/comp.c b/src/comp.c
similarity index 100%
rename from comp.c
rename to src/comp.c
diff --git a/comp.h b/src/comp.h
similarity index 100%
rename from comp.h
rename to src/comp.h
diff --git a/dynarray.c b/src/dynarray.c
similarity index 100%
rename from dynarray.c
rename to src/dynarray.c
diff --git a/dynarray.h b/src/dynarray.h
similarity index 99%
rename from dynarray.h
rename to src/dynarray.h
index 8c31a70..4146738 100644
--- a/dynarray.h
+++ b/src/dynarray.h
@@ -61,6 +61,7 @@
   }
 
 dyn_array_define(da_uint32_t, uint32_t);
+dyn_array_define(da_string, char *);
 
 void *dyn_array_create();
 void *dyn_array_create_mem(struct Mem *mem);
diff --git a/glfw.c b/src/glfw.c
similarity index 100%
rename from glfw.c
rename to src/glfw.c
diff --git a/glfw.h b/src/glfw.h
similarity index 100%
rename from glfw.h
rename to src/glfw.h
diff --git a/gpu_allocator.c b/src/gpu_allocator.c
similarity index 100%
rename from gpu_allocator.c
rename to src/gpu_allocator.c
diff --git a/hashmap.c b/src/hashmap.c
similarity index 100%
rename from hashmap.c
rename to src/hashmap.c
diff --git a/hashmap.h b/src/hashmap.h
similarity index 100%
rename from hashmap.h
rename to src/hashmap.h
diff --git a/image.c b/src/image.c
similarity index 100%
rename from image.c
rename to src/image.c
diff --git a/image.h b/src/image.h
similarity index 100%
rename from image.h
rename to src/image.h
diff --git a/io.c b/src/io.c
similarity index 100%
rename from io.c
rename to src/io.c
diff --git a/io.h b/src/io.h
similarity index 100%
rename from io.h
rename to src/io.h
diff --git a/kitty.c b/src/kitty.c
similarity index 99%
rename from kitty.c
rename to src/kitty.c
index b2f44b5..c1474c8 100644
--- a/kitty.c
+++ b/src/kitty.c
@@ -600,6 +600,7 @@ void kitty_create_image_attatchments(struct Kitty *kitty, struct Vk *state) {
     sampler_info.maxLod = 0.0;
     CHECK_VK_RESULT(vkCreateSampler(state->device, &sampler_info, NULL,
                                     &atch->image.sampler));
+    free(atch->image.pixels);
   }
 }
 
diff --git a/kitty.h b/src/kitty.h
similarity index 100%
rename from kitty.h
rename to src/kitty.h
diff --git a/log.c b/src/log.c
similarity index 100%
rename from log.c
rename to src/log.c
diff --git a/log.h b/src/log.h
similarity index 100%
rename from log.h
rename to src/log.h
diff --git a/matrix.c b/src/matrix.c
similarity index 100%
rename from matrix.c
rename to src/matrix.c
diff --git a/matrix.h b/src/matrix.h
similarity index 100%
rename from matrix.h
rename to src/matrix.h
diff --git a/object.c b/src/object.c
similarity index 100%
rename from object.c
rename to src/object.c
diff --git a/object.h b/src/object.h
similarity index 100%
rename from object.h
rename to src/object.h
diff --git a/register.c b/src/register.c
similarity index 100%
rename from register.c
rename to src/register.c
diff --git a/register.h b/src/register.h
similarity index 100%
rename from register.h
rename to src/register.h
diff --git a/stb_image.h b/src/stb_image.h
similarity index 100%
rename from stb_image.h
rename to src/stb_image.h
diff --git a/types.c b/src/types.c
similarity index 100%
rename from types.c
rename to src/types.c
diff --git a/types.h b/src/types.h
similarity index 100%
rename from types.h
rename to src/types.h
diff --git a/util.c b/src/util.c
similarity index 100%
rename from util.c
rename to src/util.c
diff --git a/util.h b/src/util.h
similarity index 100%
rename from util.h
rename to src/util.h
diff --git a/vulkan.c b/src/vulkan.c
similarity index 100%
rename from vulkan.c
rename to src/vulkan.c
diff --git a/vulkan.h b/src/vulkan.h
similarity index 100%
rename from vulkan.h
rename to src/vulkan.h
diff --git a/vulkan_helpers.c b/src/vulkan_helpers.c
similarity index 100%
rename from vulkan_helpers.c
rename to src/vulkan_helpers.c
diff --git a/wayland.c b/src/wayland.c
similarity index 100%
rename from wayland.c
rename to src/wayland.c
diff --git a/wayland.h b/src/wayland.h
similarity index 100%
rename from wayland.h
rename to src/wayland.h
diff --git a/trig.c b/trig.c
index 0dc3fdd..d50defc 100644
--- a/trig.c
+++ b/trig.c
@@ -1,10 +1,10 @@
-#include "allocator.h"
-#include "kitty.h"
-#include "log.h"
-#include "matrix.h"
-#include "object.h"
-#include "types.h"
-#include "util.h"
+#include "src/allocator.h"
+#include "src/kitty.h"
+#include "src/log.h"
+#include "src/matrix.h"
+#include "src/object.h"
+#include "src/types.h"
+#include "src/util.h"
 
 #define INSTANCE_COUNT 1000