diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3797e7b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+CXX=g++
+CXXFLAGS=-Wall -Wextra -Wpedantic -Werror -Iincludes -std=c++17
+SOURCES=*.cpp
+INCLUDES=includes/*.hpp
+
+.PHONY: all
+all: $<
+
+debug: $(SOURCE) $(INCLUDES)
+	$(CXX) $(SOURCES) $(CXXFLAGS) -g -o $@
+
+release: $(SOURCE) $(INCLUDES)
+	$(CXX) $(SOURCES) $(CXXFLAGS) -O3 -o $@
+
+.PHONY: clean
+clean:
+	rm $<
diff --git a/Circle.hpp b/includes/Circle.hpp
similarity index 100%
rename from Circle.hpp
rename to includes/Circle.hpp
diff --git a/Rectangle.hpp b/includes/Rectangle.hpp
similarity index 100%
rename from Rectangle.hpp
rename to includes/Rectangle.hpp
diff --git a/Shape.hpp b/includes/Shape.hpp
similarity index 100%
rename from Shape.hpp
rename to includes/Shape.hpp
diff --git a/Square.hpp b/includes/Square.hpp
similarity index 100%
rename from Square.hpp
rename to includes/Square.hpp