diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..7fc4e4b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.10)
+project(svd2cpp)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(Src)
+include_directories(cxxopts/include)
+include_directories(tinyxml2)
+
+add_library(ClassBuilder Src/ClassBuilder.cpp)
+add_library(XmlParser Src/XmlParser.cpp)
+add_library(tinyxml2 tinyxml2/tinyxml2.cpp)
+
+add_executable(svd2cpp Src/main.cpp)
+target_link_libraries(svd2cpp ClassBuilder XmlParser tinyxml2)
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 18bd0ca..0000000
--- a/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-OBJS	= Build/main.o Build/XmlParser.o tinyxml2/libtinyxml2.a
-SOURCE	= Src/main.cpp tinyxml2/tinyxml2.cpp
-INCLUDE	= -I tinyxml2 -I cxxopts/include -I Src
-OUT		= svd2cpp
-CC 		= g++
-FLAGS 	= -g -c -Wall -std=c++17
-
-all: $(OBJS)
-	$(CC) -g $(OBJS) -o $(OUT) $(LFLAGS)
-
-Build/main.o: Src/main.cpp
-	mkdir -p Build
-	$(CC) $(FLAGS) Src/main.cpp $(INCLUDE) -o Build/main.o
-
-Build/XmlParser.o: Src/XmlParser.cpp
-	mkdir -p Build
-	$(CC) $(FLAGS) Src/XmlParser.cpp $(INCLUDE) -o Build/XmlParser.o
-
-tinyxml2/libtinyxml2.a:
-	$(MAKE) -C tinyxml2/ staticlib
-
-
-clean:
-	rm -f $(OBJS) $(OUT)
-
diff --git a/Src/ClassPrinter.cpp b/Src/ClassBuilder.cpp
similarity index 69%
rename from Src/ClassPrinter.cpp
rename to Src/ClassBuilder.cpp
index 1fb60ac..9ba502e 100644
--- a/Src/ClassPrinter.cpp
+++ b/Src/ClassBuilder.cpp
@@ -1,6 +1,6 @@
-#include <ClassPrinter.hpp>
+#include <ClassBuilder.hpp>
 
-ClassPrinter::ClassPrinter(const cxxopts::ParseResult& results,
+ClassBuilder::ClassBuilder(const cxxopts::ParseResult& results,
                            const DeviceInfo& deviceInfo,
                            const std::vector<Peripheral>& peripherals) :
         results(results),
diff --git a/Src/ClassPrinter.hpp b/Src/ClassBuilder.hpp
similarity index 80%
rename from Src/ClassPrinter.hpp
rename to Src/ClassBuilder.hpp
index 51ac055..c844c62 100644
--- a/Src/ClassPrinter.hpp
+++ b/Src/ClassBuilder.hpp
@@ -6,9 +6,9 @@
 #include <Peripheral.hpp>
 #include <vector>
 
-struct ClassPrinter
+struct ClassBuilder
 {
-    ClassPrinter(const cxxopts::ParseResult& results,
+    ClassBuilder(const cxxopts::ParseResult& results,
                  const DeviceInfo& deviceInfo,
                  const std::vector<Peripheral>& peripherals);
 
diff --git a/Src/ItemPrinter.hpp b/Src/ItemPrinter.hpp
new file mode 100644
index 0000000..238ed10
--- /dev/null
+++ b/Src/ItemPrinter.hpp
@@ -0,0 +1,11 @@
+#ifndef ITEM_PRINTER
+#define ITEM_PRINTER
+
+#include <vector>
+#include <Peripheral.hpp>
+
+
+struct ItemPrinter{
+};
+
+#endif