diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..fadb409
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(distrins)
+
+add_subdirectory(src)
+
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e1a09d2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-distrins: main.cpp core/ api/ resolver/ cluster/
-	g++ main.cpp -o distrins
diff --git a/api/.keep b/src/API/API.cpp
similarity index 100%
rename from api/.keep
rename to src/API/API.cpp
diff --git a/cluster/.keep b/src/API/API.hpp
similarity index 100%
rename from cluster/.keep
rename to src/API/API.hpp
diff --git a/src/API/CMakeLists.txt b/src/API/CMakeLists.txt
new file mode 100644
index 0000000..21f03e7
--- /dev/null
+++ b/src/API/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(API OBJECT API.cpp API.hpp)
+
diff --git a/src/API/Makefile b/src/API/Makefile
new file mode 100644
index 0000000..1dc3d80
--- /dev/null
+++ b/src/API/Makefile
@@ -0,0 +1,180 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.16
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/sven/Desktop/Projects/distrins
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/sven/Desktop/Projects/distrins
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles /home/sven/Desktop/Projects/distrins/src/API/CMakeFiles/progress.marks
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/API/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/API/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/API/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/API/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+src/API/CMakeFiles/API.dir/rule:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/API/CMakeFiles/API.dir/rule
+.PHONY : src/API/CMakeFiles/API.dir/rule
+
+# Convenience name for target.
+API: src/API/CMakeFiles/API.dir/rule
+
+.PHONY : API
+
+# fast build rule for target.
+API/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/API/CMakeFiles/API.dir/build.make src/API/CMakeFiles/API.dir/build
+.PHONY : API/fast
+
+API.o: API.cpp.o
+
+.PHONY : API.o
+
+# target to build an object file
+API.cpp.o:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/API/CMakeFiles/API.dir/build.make src/API/CMakeFiles/API.dir/API.cpp.o
+.PHONY : API.cpp.o
+
+API.i: API.cpp.i
+
+.PHONY : API.i
+
+# target to preprocess a source file
+API.cpp.i:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/API/CMakeFiles/API.dir/build.make src/API/CMakeFiles/API.dir/API.cpp.i
+.PHONY : API.cpp.i
+
+API.s: API.cpp.s
+
+.PHONY : API.s
+
+# target to generate assembly for a file
+API.cpp.s:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/API/CMakeFiles/API.dir/build.make src/API/CMakeFiles/API.dir/API.cpp.s
+.PHONY : API.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... rebuild_cache"
+	@echo "... edit_cache"
+	@echo "... API"
+	@echo "... API.o"
+	@echo "... API.i"
+	@echo "... API.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..ba68753
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_subdirectory(Core)
+add_subdirectory(Resolver)
+add_subdirectory(API)
+add_subdirectory(Cluster)
+
+#find_package (Threads REQUIRED) #find pthreads package
+
+#target_link_libraries (distrins ${CMAKE_THREAD_LIBS_INIT}) #link against pthreads
+
+add_executable(Distrins main.cpp)
+
+#install(TARGETS myapp DESTINATION bin)
+
+
+
diff --git a/src/Cluster/CMakeLists.txt b/src/Cluster/CMakeLists.txt
new file mode 100644
index 0000000..f0e2ebe
--- /dev/null
+++ b/src/Cluster/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(Cluster OBJECT Cluster.cpp Cluster.hpp)
+
diff --git a/core/.keep b/src/Cluster/Cluster.cpp
similarity index 100%
rename from core/.keep
rename to src/Cluster/Cluster.cpp
diff --git a/core/Makefile b/src/Cluster/Cluster.hpp
similarity index 100%
rename from core/Makefile
rename to src/Cluster/Cluster.hpp
diff --git a/src/Cluster/Makefile b/src/Cluster/Makefile
new file mode 100644
index 0000000..6749bf8
--- /dev/null
+++ b/src/Cluster/Makefile
@@ -0,0 +1,180 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.16
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/sven/Desktop/Projects/distrins
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/sven/Desktop/Projects/distrins
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles /home/sven/Desktop/Projects/distrins/src/Cluster/CMakeFiles/progress.marks
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Cluster/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Cluster/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Cluster/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Cluster/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+src/Cluster/CMakeFiles/Cluster.dir/rule:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Cluster/CMakeFiles/Cluster.dir/rule
+.PHONY : src/Cluster/CMakeFiles/Cluster.dir/rule
+
+# Convenience name for target.
+Cluster: src/Cluster/CMakeFiles/Cluster.dir/rule
+
+.PHONY : Cluster
+
+# fast build rule for target.
+Cluster/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Cluster/CMakeFiles/Cluster.dir/build.make src/Cluster/CMakeFiles/Cluster.dir/build
+.PHONY : Cluster/fast
+
+Cluster.o: Cluster.cpp.o
+
+.PHONY : Cluster.o
+
+# target to build an object file
+Cluster.cpp.o:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Cluster/CMakeFiles/Cluster.dir/build.make src/Cluster/CMakeFiles/Cluster.dir/Cluster.cpp.o
+.PHONY : Cluster.cpp.o
+
+Cluster.i: Cluster.cpp.i
+
+.PHONY : Cluster.i
+
+# target to preprocess a source file
+Cluster.cpp.i:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Cluster/CMakeFiles/Cluster.dir/build.make src/Cluster/CMakeFiles/Cluster.dir/Cluster.cpp.i
+.PHONY : Cluster.cpp.i
+
+Cluster.s: Cluster.cpp.s
+
+.PHONY : Cluster.s
+
+# target to generate assembly for a file
+Cluster.cpp.s:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Cluster/CMakeFiles/Cluster.dir/build.make src/Cluster/CMakeFiles/Cluster.dir/Cluster.cpp.s
+.PHONY : Cluster.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... rebuild_cache"
+	@echo "... edit_cache"
+	@echo "... Cluster"
+	@echo "... Cluster.o"
+	@echo "... Cluster.i"
+	@echo "... Cluster.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
new file mode 100644
index 0000000..0df90bc
--- /dev/null
+++ b/src/Core/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(Core OBJECT Core.cpp Core.hpp)
+
diff --git a/main.cpp b/src/Core/Core.cpp
similarity index 100%
rename from main.cpp
rename to src/Core/Core.cpp
diff --git a/resolver/.keep b/src/Core/Core.hpp
similarity index 100%
rename from resolver/.keep
rename to src/Core/Core.hpp
diff --git a/src/Core/Makefile b/src/Core/Makefile
new file mode 100644
index 0000000..a35106c
--- /dev/null
+++ b/src/Core/Makefile
@@ -0,0 +1,180 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.16
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/sven/Desktop/Projects/distrins
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/sven/Desktop/Projects/distrins
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles /home/sven/Desktop/Projects/distrins/src/Core/CMakeFiles/progress.marks
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Core/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Core/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Core/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Core/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+src/Core/CMakeFiles/Core.dir/rule:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Core/CMakeFiles/Core.dir/rule
+.PHONY : src/Core/CMakeFiles/Core.dir/rule
+
+# Convenience name for target.
+Core: src/Core/CMakeFiles/Core.dir/rule
+
+.PHONY : Core
+
+# fast build rule for target.
+Core/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Core/CMakeFiles/Core.dir/build.make src/Core/CMakeFiles/Core.dir/build
+.PHONY : Core/fast
+
+Core.o: Core.cpp.o
+
+.PHONY : Core.o
+
+# target to build an object file
+Core.cpp.o:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Core/CMakeFiles/Core.dir/build.make src/Core/CMakeFiles/Core.dir/Core.cpp.o
+.PHONY : Core.cpp.o
+
+Core.i: Core.cpp.i
+
+.PHONY : Core.i
+
+# target to preprocess a source file
+Core.cpp.i:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Core/CMakeFiles/Core.dir/build.make src/Core/CMakeFiles/Core.dir/Core.cpp.i
+.PHONY : Core.cpp.i
+
+Core.s: Core.cpp.s
+
+.PHONY : Core.s
+
+# target to generate assembly for a file
+Core.cpp.s:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Core/CMakeFiles/Core.dir/build.make src/Core/CMakeFiles/Core.dir/Core.cpp.s
+.PHONY : Core.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... rebuild_cache"
+	@echo "... edit_cache"
+	@echo "... Core"
+	@echo "... Core.o"
+	@echo "... Core.i"
+	@echo "... Core.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..2e30593
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,180 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.16
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/sven/Desktop/Projects/distrins
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/sven/Desktop/Projects/distrins
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles /home/sven/Desktop/Projects/distrins/src/CMakeFiles/progress.marks
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+src/CMakeFiles/Distrins.dir/rule:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/Distrins.dir/rule
+.PHONY : src/CMakeFiles/Distrins.dir/rule
+
+# Convenience name for target.
+Distrins: src/CMakeFiles/Distrins.dir/rule
+
+.PHONY : Distrins
+
+# fast build rule for target.
+Distrins/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/CMakeFiles/Distrins.dir/build.make src/CMakeFiles/Distrins.dir/build
+.PHONY : Distrins/fast
+
+main.o: main.cpp.o
+
+.PHONY : main.o
+
+# target to build an object file
+main.cpp.o:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/CMakeFiles/Distrins.dir/build.make src/CMakeFiles/Distrins.dir/main.cpp.o
+.PHONY : main.cpp.o
+
+main.i: main.cpp.i
+
+.PHONY : main.i
+
+# target to preprocess a source file
+main.cpp.i:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/CMakeFiles/Distrins.dir/build.make src/CMakeFiles/Distrins.dir/main.cpp.i
+.PHONY : main.cpp.i
+
+main.s: main.cpp.s
+
+.PHONY : main.s
+
+# target to generate assembly for a file
+main.cpp.s:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/CMakeFiles/Distrins.dir/build.make src/CMakeFiles/Distrins.dir/main.cpp.s
+.PHONY : main.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... rebuild_cache"
+	@echo "... edit_cache"
+	@echo "... Distrins"
+	@echo "... main.o"
+	@echo "... main.i"
+	@echo "... main.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/Resolver/CMakeLists.txt b/src/Resolver/CMakeLists.txt
new file mode 100644
index 0000000..e8dc9b9
--- /dev/null
+++ b/src/Resolver/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(Resolver OBJECT Resolver.cpp Resolver.hpp)
+
diff --git a/src/Resolver/Makefile b/src/Resolver/Makefile
new file mode 100644
index 0000000..2d02843
--- /dev/null
+++ b/src/Resolver/Makefile
@@ -0,0 +1,180 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.16
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/sven/Desktop/Projects/distrins
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/sven/Desktop/Projects/distrins
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles /home/sven/Desktop/Projects/distrins/src/Resolver/CMakeFiles/progress.marks
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Resolver/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/sven/Desktop/Projects/distrins/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Resolver/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Resolver/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Resolver/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+src/Resolver/CMakeFiles/Resolver.dir/rule:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f CMakeFiles/Makefile2 src/Resolver/CMakeFiles/Resolver.dir/rule
+.PHONY : src/Resolver/CMakeFiles/Resolver.dir/rule
+
+# Convenience name for target.
+Resolver: src/Resolver/CMakeFiles/Resolver.dir/rule
+
+.PHONY : Resolver
+
+# fast build rule for target.
+Resolver/fast:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Resolver/CMakeFiles/Resolver.dir/build.make src/Resolver/CMakeFiles/Resolver.dir/build
+.PHONY : Resolver/fast
+
+Resolver.o: Resolver.cpp.o
+
+.PHONY : Resolver.o
+
+# target to build an object file
+Resolver.cpp.o:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Resolver/CMakeFiles/Resolver.dir/build.make src/Resolver/CMakeFiles/Resolver.dir/Resolver.cpp.o
+.PHONY : Resolver.cpp.o
+
+Resolver.i: Resolver.cpp.i
+
+.PHONY : Resolver.i
+
+# target to preprocess a source file
+Resolver.cpp.i:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Resolver/CMakeFiles/Resolver.dir/build.make src/Resolver/CMakeFiles/Resolver.dir/Resolver.cpp.i
+.PHONY : Resolver.cpp.i
+
+Resolver.s: Resolver.cpp.s
+
+.PHONY : Resolver.s
+
+# target to generate assembly for a file
+Resolver.cpp.s:
+	cd /home/sven/Desktop/Projects/distrins && $(MAKE) -f src/Resolver/CMakeFiles/Resolver.dir/build.make src/Resolver/CMakeFiles/Resolver.dir/Resolver.cpp.s
+.PHONY : Resolver.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... rebuild_cache"
+	@echo "... edit_cache"
+	@echo "... Resolver"
+	@echo "... Resolver.o"
+	@echo "... Resolver.i"
+	@echo "... Resolver.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/sven/Desktop/Projects/distrins && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/Resolver/Resolver.cpp b/src/Resolver/Resolver.cpp
new file mode 100644
index 0000000..368656c
--- /dev/null
+++ b/src/Resolver/Resolver.cpp
@@ -0,0 +1,5 @@
+#include <Resolver.hpp>
+
+Resolver::Resolver() {
+    // Code
+}
diff --git a/src/Resolver/Resolver.hpp b/src/Resolver/Resolver.hpp
new file mode 100644
index 0000000..4517254
--- /dev/null
+++ b/src/Resolver/Resolver.hpp
@@ -0,0 +1,5 @@
+class Resolver
+{
+    public:
+    Resolver();
+};
diff --git a/src/distrins b/src/distrins
new file mode 100755
index 0000000..59431a6
Binary files /dev/null and b/src/distrins differ
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..5599901
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+#include <Resolve.hpp>
+
+int main(int args, char **argv) {
+    using std::cout;
+    using std::endl;
+
+    Resolver resolver();
+
+    cout << "Hello there!" << endl;
+
+    return 0;
+}
diff --git a/tests/.keep b/tests/.keep
new file mode 100644
index 0000000..e69de29