diff --git a/src/config/private/config.cpp b/src/config/private/config.cpp
index e7d15a3..61fda9f 100644
--- a/src/config/private/config.cpp
+++ b/src/config/private/config.cpp
@@ -29,6 +29,9 @@
 
 #include "config.h"
 
+namespace serif {
+namespace config {
+
 Config::Config() {}
 
 Config::~Config() {}
@@ -102,4 +105,7 @@ std::vector<std::string> Config::keys() const {
     YAML::Node node = YAML::Clone(yamlRoot);
     recurse_keys(node, keyList);
     return keyList;
-}
\ No newline at end of file
+}
+
+} // namespace config
+} // namespace serif
\ No newline at end of file
diff --git a/src/config/public/config.h b/src/config/public/config.h
index 4869e62..0e73436 100644
--- a/src/config/public/config.h
+++ b/src/config/public/config.h
@@ -34,7 +34,11 @@
 #include "yaml-cpp/yaml.h"
 
 // -- Forward Def of Resource manager to let it act as a friend of Config --
-class ResourceManager;
+namespace serif { namespace resource { class ResourceManager; } } // Forward declaration
+class configTestPrivateAccessor; // Forward declaration for test utility
+
+namespace serif {
+namespace config {
 
 /**
  * @class Config
@@ -230,9 +234,12 @@ public:
    }
 
    // Setup gTest class as a friend
-   friend class configTestPrivateAccessor;
+   friend class ::configTestPrivateAccessor; // Friend declaration for global test accessor
    // -- Resource Manager is a friend of config so it can create a seperate instance
-   friend class ResourceManager;
+   friend class serif::resource::ResourceManager; // Adjusted friend declaration
 };
 
-#endif
\ No newline at end of file
+} // namespace config
+} // namespace serif
+
+#endif