diff --git a/README.md b/README.md
index 319adfa..480c637 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A Distributed approach to Authoritative DNS
 - LargeCamelCase
 
 #### Methods
-- LargeCammelCase
+- smallCammelCase
 
 #### Properties/Variables
 - smallCammelCase
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index d9a6ab5..e2f38ee 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,16 +1,12 @@
 
-add_library(Core OBJECT)
+add_library(Core OBJECT EventBus.cpp ConfigManager.cpp)
 
-target_sources(Core PRIVATE src)
-
-target_include_directories(Core
-    PUBLIC include
-    PRIVATE src)
+target_include_directories(Core PUBLIC include)
 
 #add_library(EventBus OBJECT EventBus.cpp EventBus.hpp)
 #target_link_libraries(Core INTERFACE EventBus)
 
 
-# Assemble:
-add_executable(Distrins src/main.cpp)
+# Build Executable:
+add_executable(Distrins main.cpp)
 target_link_libraries(Distrins PRIVATE Core Storage Resolver API Cluster)
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
new file mode 100644
index 0000000..f1e6f10
--- /dev/null
+++ b/src/core/ConfigManager.cpp
@@ -0,0 +1,6 @@
+#include "ConfigManager.hpp"
+
+ConfigManager::ConfigManager(int numParameters, char **parameters) {
+    //Process
+}
+
diff --git a/src/core/EventBus.cpp b/src/core/EventBus.cpp
new file mode 100644
index 0000000..07a930a
--- /dev/null
+++ b/src/core/EventBus.cpp
@@ -0,0 +1,9 @@
+#include "EventBus.hpp"
+#include <string>
+#include <iostream>
+
+EventBus::EventBus() {};
+
+void EventBus::test() {
+    std::cout << "Testing from within EventBus!" << std::endl;
+}
diff --git a/src/core/include/ConfigManager.hpp b/src/core/include/ConfigManager.hpp
new file mode 100644
index 0000000..ce1cd0a
--- /dev/null
+++ b/src/core/include/ConfigManager.hpp
@@ -0,0 +1,10 @@
+#ifndef CONFIG_MANAGER_HPP
+#define CONFIG_MANAGER_HPP
+
+class ConfigManager
+{
+    public:
+    ConfigManager(int numParameters, char **parameters);
+};
+
+#endif
diff --git a/src/core/include/EventBus.hpp b/src/core/include/EventBus.hpp
index 6a22de2..c68eaa4 100644
--- a/src/core/include/EventBus.hpp
+++ b/src/core/include/EventBus.hpp
@@ -4,6 +4,7 @@
 class EventBus {
     public:
     EventBus();
+    void test();
 };
 
 #endif
diff --git a/src/core/main.cpp b/src/core/main.cpp
new file mode 100644
index 0000000..ef37826
--- /dev/null
+++ b/src/core/main.cpp
@@ -0,0 +1,17 @@
+#include <iostream>
+#include "Resolver.hpp"
+#include "EventBus.hpp"
+#include "ConfigManager.hpp"
+
+int main(int args, char **argv) {
+    using std::cout;
+    using std::endl;
+ 
+    ConfigManager cfg(args, argv);
+    auto eventBus = EventBus();
+    Resolver resolver(eventBus);
+
+    cout << "Booting complete." << endl;
+
+    return 0;
+}
diff --git a/src/core/src/EventBus.cpp b/src/core/src/EventBus.cpp
deleted file mode 100644
index 0c45440..0000000
--- a/src/core/src/EventBus.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "EventBus.hpp"
-
-EventBus::EventBus() {};
diff --git a/src/core/src/main.cpp b/src/core/src/main.cpp
deleted file mode 100644
index 00e9727..0000000
--- a/src/core/src/main.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <iostream>
-#include "Resolver.hpp"
-#include "EventBus.hpp"
-
-int main(int args, char **argv) {
-    using std::cout;
-    using std::endl;
-
-    EventBus eventBus();
-    Resolver resolver();
-
-    cout << "Hello there!" << endl;
-
-    return 0;
-}
diff --git a/src/resolver/CMakeLists.txt b/src/resolver/CMakeLists.txt
index ed2b858..856c20d 100644
--- a/src/resolver/CMakeLists.txt
+++ b/src/resolver/CMakeLists.txt
@@ -1,10 +1,6 @@
 
-add_library(Resolver OBJECT)
+add_library(Resolver OBJECT Resolver.cpp)
 
-target_sources(Resolver PRIVATE src)
-
-target_include_directories(Resolver
-    PUBLIC include
-    PRIVATE src)
+target_include_directories(Resolver PUBLIC include)
 
 target_link_libraries(Resolver PRIVATE asio Core)
diff --git a/src/resolver/src/Resolver.cpp b/src/resolver/Resolver.cpp
similarity index 54%
rename from src/resolver/src/Resolver.cpp
rename to src/resolver/Resolver.cpp
index 4346dc1..78cf6cb 100644
--- a/src/resolver/src/Resolver.cpp
+++ b/src/resolver/Resolver.cpp
@@ -3,6 +3,8 @@
 #include <asio/ts/buffer.hpp>
 #include <asio/ts/internet.hpp>
 
-Resolver::Resolver() {
+Resolver::Resolver(EventBus &eventBus) : eventBus(eventBus) {
     // Code
-}
+    //test:
+    eventBus.test();
+};
diff --git a/src/resolver/include/Resolver.hpp b/src/resolver/include/Resolver.hpp
index 1892d8b..c2e25b5 100644
--- a/src/resolver/include/Resolver.hpp
+++ b/src/resolver/include/Resolver.hpp
@@ -4,8 +4,10 @@
 
 class Resolver
 {
+    const EventBus &eventBus;
+
     public:
-    Resolver();
+    Resolver(EventBus &eventBus);
 };
 
-#endif
\ No newline at end of file
+#endif