diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20ea2ac..7883fcb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,5 +4,7 @@ add_subdirectory(dhcp)
 add_subdirectory(api)
 add_subdirectory(cluster)
 add_subdirectory(ui)
+add_subdirectory(dns)
+add_subdirectory(storage)
 
 
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index 6cad066..4a205b0 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(DHCP OBJECT Server.cpp)
+add_library(API OBJECT Server.cpp)
 
-target_include_directories(DHCP PUBLIC include)
+target_include_directories(API PUBLIC include)
 
-target_link_libraries(DHCP PRIVATE Core)
+target_link_libraries(API PRIVATE Core)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8491ef0..8fbf1da 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -3,9 +3,9 @@ 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)
+#add_subdirectory(dns)
+#add_subdirectory(storage)
+#add_subdirectory(tests)
 
 # Build Executable:
 add_executable(Plains main.cpp)
diff --git a/src/dhcp/CMakeLists.txt b/src/dhcp/CMakeLists.txt
index 4a205b0..6cad066 100644
--- a/src/dhcp/CMakeLists.txt
+++ b/src/dhcp/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library(API OBJECT Server.cpp)
+add_library(DHCP OBJECT Server.cpp)
 
-target_include_directories(API PUBLIC include)
+target_include_directories(DHCP PUBLIC include)
 
-target_link_libraries(API PRIVATE Core)
+target_link_libraries(DHCP PRIVATE Core)
diff --git a/src/core/dns/CMakeLists.txt b/src/dns/CMakeLists.txt
similarity index 72%
rename from src/core/dns/CMakeLists.txt
rename to src/dns/CMakeLists.txt
index 36b3257..96d02f5 100644
--- a/src/core/dns/CMakeLists.txt
+++ b/src/dns/CMakeLists.txt
@@ -2,5 +2,6 @@
 add_library(DNS OBJECT ResourceRecord.cpp)
 
 target_include_directories(DNS PUBLIC include)
+#target_include_directories(Core PRIVATE include)
 
 target_link_libraries(DNS PRIVATE Core)
diff --git a/src/core/dns/ResourceRecord.cpp b/src/dns/ResourceRecord.cpp
similarity index 99%
rename from src/core/dns/ResourceRecord.cpp
rename to src/dns/ResourceRecord.cpp
index 48d6d7c..bad1fad 100644
--- a/src/core/dns/ResourceRecord.cpp
+++ b/src/dns/ResourceRecord.cpp
@@ -2,7 +2,6 @@
 
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 
@@ -69,4 +68,4 @@ HTTPSRecord::HTTPSRecord() : ResourceRecord(65) {}
 
 
 
-}}}
+}}
diff --git a/src/core/dns/Zone.cpp b/src/dns/Zone.cpp
similarity index 85%
rename from src/core/dns/Zone.cpp
rename to src/dns/Zone.cpp
index a8d4afe..b6a4c1e 100644
--- a/src/core/dns/Zone.cpp
+++ b/src/dns/Zone.cpp
@@ -1,7 +1,6 @@
 #include "Zone.hpp"
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 
@@ -9,4 +8,4 @@ string Zone::serialize() {
     return "Nothing implemented";
 }
 
-}}}
+}}
diff --git a/src/core/dns/include/DNS.hpp b/src/dns/include/DNS.hpp
similarity index 100%
rename from src/core/dns/include/DNS.hpp
rename to src/dns/include/DNS.hpp
diff --git a/src/core/include/Resource.hpp b/src/dns/include/Resource.hpp
similarity index 83%
rename from src/core/include/Resource.hpp
rename to src/dns/include/Resource.hpp
index 2dc90ca..e975054 100644
--- a/src/core/include/Resource.hpp
+++ b/src/dns/include/Resource.hpp
@@ -3,7 +3,9 @@
 
 #include "Serializable.hpp"
 namespace Plains {
-namespace Core {
+namespace DNS {
+
+using Core::Serializable;
 
 // Provides an abstract class for resources that may be stored in the ledger
 class Resource : public Serializable {};
diff --git a/src/core/dns/include/ResourceRecord.hpp b/src/dns/include/ResourceRecord.hpp
similarity index 99%
rename from src/core/dns/include/ResourceRecord.hpp
rename to src/dns/include/ResourceRecord.hpp
index f0e77b9..ef8f30b 100644
--- a/src/core/dns/include/ResourceRecord.hpp
+++ b/src/dns/include/ResourceRecord.hpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 using std::ostream;
@@ -77,5 +76,5 @@ class SVCBRecord : public ResourceRecord { SVCBRecord(); };
 class HTTPSRecord : public ResourceRecord { HTTPSRecord(); };
 
 
-}}}
+}}
 #endif
diff --git a/src/core/dns/include/Zone.hpp b/src/dns/include/Zone.hpp
similarity index 92%
rename from src/core/dns/include/Zone.hpp
rename to src/dns/include/Zone.hpp
index 5a0f4fc..87a4172 100644
--- a/src/core/dns/include/Zone.hpp
+++ b/src/dns/include/Zone.hpp
@@ -5,7 +5,6 @@
 #include "Resource.hpp"
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 using std::string;
@@ -17,5 +16,5 @@ class Zone : public Resource
     string serialize();
 };
 
-}}}
+}}
 #endif
diff --git a/src/resolver/include/Message.hpp b/src/resolver/include/Message.hpp
index 79690a1..5ced61e 100644
--- a/src/resolver/include/Message.hpp
+++ b/src/resolver/include/Message.hpp
@@ -10,7 +10,7 @@ namespace Resolver {
 
 using std::size_t;
 using std::unique_ptr;
-using Core::DNS::ResourceRecord;
+using DNS::ResourceRecord;
 
 class Message
 {
diff --git a/src/core/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
similarity index 100%
rename from src/core/storage/CMakeLists.txt
rename to src/storage/CMakeLists.txt
diff --git a/src/core/storage/Storage.cpp b/src/storage/Storage.cpp
similarity index 100%
rename from src/core/storage/Storage.cpp
rename to src/storage/Storage.cpp
diff --git a/src/core/storage/include/Storage.hpp b/src/storage/include/Storage.hpp
similarity index 100%
rename from src/core/storage/include/Storage.hpp
rename to src/storage/include/Storage.hpp
diff --git a/src/core/tests/.keep b/tests/.keep
similarity index 100%
rename from src/core/tests/.keep
rename to tests/.keep
diff --git a/src/core/tests/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from src/core/tests/CMakeLists.txt
rename to tests/CMakeLists.txt
diff --git a/src/core/tests/main.cpp b/tests/main.cpp
similarity index 100%
rename from src/core/tests/main.cpp
rename to tests/main.cpp