diff --git a/makefile b/makefile
index 9a82c60..bde4833 100644
--- a/makefile
+++ b/makefile
@@ -1,10 +1,13 @@
-CXXFLAGS = -std=c++14 -Wall -O2
+CXXFLAGS = -Wall -O2 -std=c++14 
 
 lib:
-	$(CXX) $(CXXFLAGS) CUI.cpp -o CUI.o
-	$(CXX) $(CXXFLAGS) ColorUI.cpp -o ColorUI.o
-test:
-	$(CXX) $(CXXFLAGS) example.cpp -o test.exe
-	test.exe
+	mkdir obj
+	$(CXX) $(CXXFLAGS) -c ConsoleUI/CUI.cpp -o obj/CUI.o
+	$(CXX) $(CXXFLAGS) -c ConsoleUI/ColorUI.cpp -o obj/ColorUI.o
+test: lib
+	$(CXX) $(CXXFLAGS) -c example.cpp -o obj/example.o
+	mkdir bin
+	$(CXX) $(CXXFLAGS) -o bin/test.exe obj/CUI.o obj/ColorUI.o obj/example.o -s
 clean: 
-	rm -f CUI.o ColorUI.o test.exe
\ No newline at end of file
+	rm -rf obj
+	rm -rf bin
\ No newline at end of file