diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aeddcc..757ea74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(distrins)
+project(Plains)
 
 add_library(Asio INTERFACE IMPORTED GLOBAL)
 target_compile_options(Asio INTERFACE -D ASIO_STANDALONE)
@@ -15,5 +15,13 @@ target_include_directories(Catch2 INTERFACE lib/catch2)
 find_package (Threads REQUIRED)
 target_link_libraries(Asio INTERFACE Threads::Threads)
 
+add_library(MiniYAML INTERFACE IMPORTED GLOBAL)
+target_include_directories(MiniYAML INTERFACE lib/mini-yaml)
+
 add_subdirectory(src)
 
+# Build Executable:
+add_executable(Plains src/main.cpp)
+#add_executable(Plains)
+target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b2d70f..7883fcb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,3 @@
-#cmake_minimum_required(VERSION 3.10)
-#project(Plains)
-#set(CMAKE_CXX_STANDARD 11)
-
 add_subdirectory(core)
 add_subdirectory(resolver)
 add_subdirectory(dhcp)
@@ -11,7 +7,4 @@ add_subdirectory(ui)
 add_subdirectory(dns)
 add_subdirectory(storage)
 
-# Build Executable:
-add_executable(Plains core/main.cpp)
-target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI)
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0f7139e..640b0f2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,15 +1,5 @@
 
-#add_library(Core OBJECT main.cpp EventBus.cpp ConfigManager.cpp Logger.cpp Exception.cpp)
 add_library(Core OBJECT EventBus.cpp ConfigManager.cpp Logger.cpp Exception.cpp)
 
 target_include_directories(Core PUBLIC include)
 
-#add_subdirectory(dns)
-#add_subdirectory(storage)
-#add_subdirectory(tests)
-
-## Build Executable:
-#add_executable(Plains main.cpp)
-#target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI)
-
-
diff --git a/src/core/main.cpp b/src/main.cpp
similarity index 100%
rename from src/core/main.cpp
rename to src/main.cpp