Changed directory structure.

CMakeLists.txt

@@ -14,15 +14,14 @@ include (cmake/cpu.cmake)
 set(HEADERS
     src/api/NetworkState.h
     src/App.h
+    src/common/config/CommonConfig.h
+    src/common/config/ConfigLoader.h
+    src/common/config/ConfigWatcher.h
+    src/common/utils/c_str.h
     src/Console.h
-    src/core/CommonConfig.h
     src/core/Config.cpp
-    src/core/ConfigLoader.cpp
-    src/core/ConfigLoader.h
     src/core/ConfigLoader_platform.h
-    src/core/ConfigWatcher.cpp
     src/core/Controller.h
-    src/core/utils/c_str.h
     src/Cpu.h
     src/interfaces/IClientListener.h
     src/interfaces/IConfig.h
@@ -89,11 +88,11 @@ endif()
 set(SOURCES
     src/api/NetworkState.cpp
     src/App.cpp
+    src/common/config/CommonConfig.cpp
+    src/common/config/ConfigLoader.cpp
+    src/common/config/ConfigWatcher.cpp
     src/Console.cpp
-    src/core/CommonConfig.cpp
     src/core/Config.cpp
-    src/core/ConfigLoader.cpp
-    src/core/ConfigWatcher.cpp
     src/core/Controller.cpp
     src/log/ConsoleLog.cpp
     src/log/FileLog.cpp

src/common/config/CommonConfig.cpp

@@ -29,7 +29,7 @@
 #include <uv.h>
 
 
-#include "core/CommonConfig.h"
+#include "common/config/CommonConfig.h"
 #include "donate.h"
 #include "log/Log.h"
 #include "net/Pool.h"

src/common/config/CommonConfig.h

@@ -28,7 +28,7 @@
 #include <vector>
 
 
-#include "core/utils/c_str.h"
+#include "common/utils/c_str.h"
 #include "interfaces/IConfig.h"
 #include "net/Pool.h"
 #include "xmrig.h"

src/common/config/ConfigLoader.cpp

@@ -32,10 +32,10 @@
 #endif
 
 
+#include "common/config/ConfigLoader.h"
+#include "common/config/ConfigWatcher.h"
 #include "core/ConfigCreator.h"
-#include "core/ConfigLoader.h"
 #include "core/ConfigLoader_platform.h"
-#include "core/ConfigWatcher.h"
 #include "interfaces/IConfig.h"
 #include "interfaces/IWatcherListener.h"
 #include "net/Pool.h"

src/common/config/ConfigWatcher.cpp

@@ -25,9 +25,9 @@
 #include <stdio.h>
 
 
+#include "common/config/ConfigLoader.h"
+#include "common/config/ConfigWatcher.h"
 #include "core/ConfigCreator.h"
-#include "core/ConfigLoader.h"
-#include "core/ConfigWatcher.h"
 #include "interfaces/IWatcherListener.h"
 #include "log/Log.h"
 

src/common/config/ConfigWatcher.h

@@ -29,7 +29,7 @@
 #include <uv.h>
 
 
-#include "core/utils/c_str.h"
+#include "common/utils/c_str.h"
 #include "rapidjson/fwd.h"
 
 

src/core/Config.cpp

@@ -26,9 +26,9 @@
 #include <inttypes.h>
 
 
+#include "common/config/ConfigLoader.h"
 #include "core/Config.h"
 #include "core/ConfigCreator.h"
-#include "core/ConfigLoader.h"
 #include "Cpu.h"
 #include "net/Pool.h"
 #include "rapidjson/document.h"

src/core/Config.h

@@ -29,7 +29,7 @@
 #include <vector>
 
 
-#include "core/CommonConfig.h"
+#include "common/config/CommonConfig.h"
 #include "rapidjson/fwd.h"
 #include "xmrig.h"
 

src/core/Controller.cpp

@@ -25,8 +25,8 @@
 #include <assert.h>
 
 
+#include "common/config/ConfigLoader.h"
 #include "core/Config.h"
-#include "core/ConfigLoader.h"
 #include "core/Controller.h"
 #include "Cpu.h"
 #include "interfaces/IControllerListener.h"

src/net/Pool.h

@@ -28,7 +28,7 @@
 #include <stdint.h>
 
 
-#include "core/utils/c_str.h"
+#include "common/utils/c_str.h"
 #include "xmrig.h"
 
 

src/workers/CpuThread.cpp

@@ -24,7 +24,7 @@
 #include <assert.h>
 
 
-#include "core/CommonConfig.h"
+#include "net/Pool.h"
 #include "rapidjson/document.h"
 #include "workers/CpuThread.h"