diff --git a/Makefile b/Makefile
index 5534f62..dfa1429 100644
--- a/Makefile
+++ b/Makefile
@@ -7,27 +7,27 @@ ifeq ($(LDFLAGS),)
   LDFLAGS := -lwayland-client -lm
 endif
 
-LIB_SRC := waymini.c xdg-shell-client-protocol.c
+LIB_SRC := waymini/waymini.c waymini/xdg-shell-client-protocol.c
 LIB_OBJ := $(LIB_SRC:.c=.o)
 
 .PHONY: all clean
 
-all: libwaymini.a example waymini
+all: waymini/libwaymini.a example waymini
 
-libwaymini.a: $(LIB_OBJ)
-	ar rcs $@ $^
+waymini/libwaymini.a: $(LIB_OBJ)
+	ar rcs -rpath=./waymini $@ $^
 
-example: example.cpp libwaymini.a
+example: example.cpp waymini/libwaymini.a
 	g++ $(CFLAGS) -o $@ example.cpp -L. -lwaymini $(LDFLAGS)
 
-waymini: waymini_standalone.c waymini.c xdg-shell-client-protocol.c
-	$(CC) $(CFLAGS) -o $@ waymini_standalone.c waymini.c xdg-shell-client-protocol.c $(LDFLAGS)
+waymini: waymini/waymini_standalone.c waymini/waymini.c waymini/xdg-shell-client-protocol.c
+	$(CC) $(CFLAGS) -o $@ waymini/waymini_standalone.c waymini/waymini.c waymini/xdg-shell-client-protocol.c $(LDFLAGS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -f $(LIB_OBJ) libwaymini.a example waymini
+	rm -f $(LIB_OBJ) waymini/libwaymini.a example waymini/waymini
 
 xdg-shell-client-protocol.c xdg-shell-client-protocol.h: gen-protocols.sh
-	bash gen-protocols.sh
+	bash waymini/gen-protocols.sh
diff --git a/bresenham.cpp b/bresenham.cpp
deleted file mode 100644
index 259a67a..0000000
--- a/bresenham.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <stdlib.h>
-
-namespace UwU {
-  
-  class Bresenham {
-    private:
-      int16_t x0;
-      int16_t y0;
-      int16_t x1;
-      int16_t y1;
-      int16_t d;
-      int16_t 
-
-    public:
-      Bresenham(int16_t x0, int16_t y0, int16_t x1, int16_t y1) {
-        this->x0 = x0;
-        this->y0 = y0;
-        this->x1 = x1;
-        this->y1 = y1;
-
-        if (abs(y1 - y0) < abs(x1 - x0)) {
-          if (x0 > x1) {
-            
-          }
-        }
-      }
-  };
-}
\ No newline at end of file
diff --git a/example b/example
deleted file mode 100755
index b09f128..0000000
Binary files a/example and /dev/null differ
diff --git a/example.cpp b/example.cpp
index 6e39cc0..2b12bf6 100644
--- a/example.cpp
+++ b/example.cpp
@@ -1,6 +1,6 @@
 // #pragma once
 
-#include "waymini.h"
+#include "waymini/waymini.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -9,13 +9,13 @@
 
 #include "datatypes.cpp"
 #include "helpers.cpp"
-#include "triangle.cpp"
 #include "buffer.cpp"
 #include "surface.cpp"
-#include "trapezoid.cpp"
-#include "line.cpp"
-#include "rectangle.cpp"
-#include "point.cpp"
+#include "primatives/line.cpp"
+#include "primatives/point.cpp"
+#include "primatives/rectangle.cpp"
+#include "primatives/trapezoid.cpp"
+#include "primatives/triangle.cpp"
 // #include "draw.cpp"
 #include "shaders/shader.cpp"
 
diff --git a/libwaymini.a b/libwaymini.a
deleted file mode 100644
index 131cff3..0000000
Binary files a/libwaymini.a and /dev/null differ
diff --git a/line.cpp b/primatives/line.cpp
similarity index 96%
rename from line.cpp
rename to primatives/line.cpp
index 5c889cf..09d1a74 100644
--- a/line.cpp
+++ b/primatives/line.cpp
@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-#include "datatypes.cpp"
-#include "helpers.cpp"
-#include "buffer.cpp"
+#include "../datatypes.cpp"
+#include "../helpers.cpp"
+#include "../buffer.cpp"
 
 namespace UwU {
   // line
diff --git a/point.cpp b/primatives/point.cpp
similarity index 85%
rename from point.cpp
rename to primatives/point.cpp
index 846b120..f043228 100644
--- a/point.cpp
+++ b/primatives/point.cpp
@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-#include "datatypes.cpp"
-#include "helpers.cpp"
-#include "buffer.cpp"
+#include "../datatypes.cpp"
+#include "../helpers.cpp"
+#include "../buffer.cpp"
 
 namespace UwU {
   // point
diff --git a/rectangle.cpp b/primatives/rectangle.cpp
similarity index 87%
rename from rectangle.cpp
rename to primatives/rectangle.cpp
index 7ee9e83..b038055 100644
--- a/rectangle.cpp
+++ b/primatives/rectangle.cpp
@@ -2,10 +2,10 @@
 
 #include <stdint.h>
 
-#include "datatypes.cpp"
-#include "helpers.cpp"
-#include "buffer.cpp"
-#include "shaders/shader.cpp"
+#include "../datatypes.cpp"
+#include "../helpers.cpp"
+#include "../buffer.cpp"
+#include "../shaders/shader.cpp"
 
 namespace UwU {
   // rectangle
diff --git a/trapezoid.cpp b/primatives/trapezoid.cpp
similarity index 95%
rename from trapezoid.cpp
rename to primatives/trapezoid.cpp
index 60d5972..ec58236 100644
--- a/trapezoid.cpp
+++ b/primatives/trapezoid.cpp
@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-#include "datatypes.cpp"
-#include "helpers.cpp"
-#include "buffer.cpp"
+#include "../datatypes.cpp"
+#include "../helpers.cpp"
+#include "../buffer.cpp"
 
 namespace UwU {
   // trapezoid (horizontally constrained)
diff --git a/triangle.cpp b/primatives/triangle.cpp
similarity index 97%
rename from triangle.cpp
rename to primatives/triangle.cpp
index fb7cf1e..73152ce 100644
--- a/triangle.cpp
+++ b/primatives/triangle.cpp
@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-#include "datatypes.cpp"
-#include "helpers.cpp"
-#include "buffer.cpp"
+#include "../datatypes.cpp"
+#include "../helpers.cpp"
+#include "../buffer.cpp"
 
 namespace UwU {
   class Triangle {
diff --git a/surface.cpp b/surface.cpp
index 02b504b..6cd999a 100644
--- a/surface.cpp
+++ b/surface.cpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "waymini.h"
+#include "waymini/waymini.h"
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/waymini b/waymini
deleted file mode 100755
index 84264c4..0000000
Binary files a/waymini and /dev/null differ
diff --git a/gen-protocols.sh b/waymini/gen-protocols.sh
similarity index 100%
rename from gen-protocols.sh
rename to waymini/gen-protocols.sh
diff --git a/waymini.c b/waymini/waymini.c
similarity index 100%
rename from waymini.c
rename to waymini/waymini.c
diff --git a/waymini.h b/waymini/waymini.h
similarity index 100%
rename from waymini.h
rename to waymini/waymini.h
diff --git a/waymini.o b/waymini/waymini.o
similarity index 100%
rename from waymini.o
rename to waymini/waymini.o
diff --git a/waymini_standalone.c b/waymini/waymini_standalone.c
similarity index 100%
rename from waymini_standalone.c
rename to waymini/waymini_standalone.c
diff --git a/xdg-shell-client-protocol.c b/waymini/xdg-shell-client-protocol.c
similarity index 100%
rename from xdg-shell-client-protocol.c
rename to waymini/xdg-shell-client-protocol.c
diff --git a/xdg-shell-client-protocol.h b/waymini/xdg-shell-client-protocol.h
similarity index 100%
rename from xdg-shell-client-protocol.h
rename to waymini/xdg-shell-client-protocol.h
diff --git a/xdg-shell-client-protocol.o b/waymini/xdg-shell-client-protocol.o
similarity index 100%
rename from xdg-shell-client-protocol.o
rename to waymini/xdg-shell-client-protocol.o