diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f466a2e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+CXX=g++
+CXXFLAGS= -std=c++17 -Wall -Wpedantic -Wextra
+SOURCES= *.cpp
+OBJECTS =  $(SOURCES:.cpp)
+INCLUDES= includes/*.hpp
+include_dirs= -Iincludes
+all_target= debug release
+
+.PHONY: all
+	all: $(all_target)
+
+debug: $(SOURCES) $(INCLUDES)
+	$(CXX) $< $(CXXFLAGS) -g -o nazwa $(include_dir)
+
+release: $(SOURCES) $(INCLUDES)
+	$(CXX) $< $(CXXFLAGS) -O3 -o nazwa $(include_dir)
+
+
+.PHONY: clean
+clean:
+	rm $(all_target) 
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