diff --git a/src/base/base.cmake b/src/base/base.cmake
index 6d478b39e..c17183167 100644
--- a/src/base/base.cmake
+++ b/src/base/base.cmake
@@ -1,7 +1,7 @@
 set(HEADERS_BASE
     src/base/io/Console.h
-    src/base/io/Json.h
-    src/base/io/JsonChain.h
+    src/base/io/json/Json.h
+    src/base/io/json/JsonChain.h
     src/base/io/log/backends/ConsoleLog.h
     src/base/io/log/backends/FileLog.h
     src/base/io/log/Log.h
@@ -51,8 +51,8 @@ set(HEADERS_BASE
 
 set(SOURCES_BASE
     src/base/io/Console.cpp
-    src/base/io/Json.cpp
-    src/base/io/JsonChain.cpp
+    src/base/io/json/Json.cpp
+    src/base/io/json/JsonChain.cpp
     src/base/io/log/backends/ConsoleLog.cpp
     src/base/io/log/backends/FileLog.cpp
     src/base/io/log/Log.cpp
@@ -81,9 +81,9 @@ set(SOURCES_BASE
 
 
 if (WIN32)
-    set(SOURCES_OS src/base/io/Json_win.cpp)
+    set(SOURCES_OS src/base/io/json/Json_win.cpp)
 else()
-    set(SOURCES_OS src/base/io/Json_unix.cpp)
+    set(SOURCES_OS src/base/io/json/Json_unix.cpp)
 endif()
 
 
diff --git a/src/base/io/Json.cpp b/src/base/io/json/Json.cpp
similarity index 99%
rename from src/base/io/Json.cpp
rename to src/base/io/json/Json.cpp
index 916464531..07986c4af 100644
--- a/src/base/io/Json.cpp
+++ b/src/base/io/json/Json.cpp
@@ -23,7 +23,7 @@
  */
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "rapidjson/document.h"
 
 
diff --git a/src/base/io/Json.h b/src/base/io/json/Json.h
similarity index 100%
rename from src/base/io/Json.h
rename to src/base/io/json/Json.h
diff --git a/src/base/io/JsonChain.cpp b/src/base/io/json/JsonChain.cpp
similarity index 98%
rename from src/base/io/JsonChain.cpp
rename to src/base/io/json/JsonChain.cpp
index 4dd75f0b2..bbaabbde9 100644
--- a/src/base/io/JsonChain.cpp
+++ b/src/base/io/json/JsonChain.cpp
@@ -23,8 +23,8 @@
  */
 
 
-#include "base/io/Json.h"
-#include "base/io/JsonChain.h"
+#include "base/io/json/Json.h"
+#include "base/io/json/JsonChain.h"
 #include "base/io/log/Log.h"
 #include "rapidjson/error/en.h"
 
diff --git a/src/base/io/JsonChain.h b/src/base/io/json/JsonChain.h
similarity index 100%
rename from src/base/io/JsonChain.h
rename to src/base/io/json/JsonChain.h
diff --git a/src/base/io/Json_unix.cpp b/src/base/io/json/Json_unix.cpp
similarity index 100%
rename from src/base/io/Json_unix.cpp
rename to src/base/io/json/Json_unix.cpp
diff --git a/src/base/io/Json_win.cpp b/src/base/io/json/Json_win.cpp
similarity index 99%
rename from src/base/io/Json_win.cpp
rename to src/base/io/json/Json_win.cpp
index 58ee26b79..0faccdea0 100644
--- a/src/base/io/Json_win.cpp
+++ b/src/base/io/json/Json_win.cpp
@@ -35,7 +35,7 @@
 #include <fstream>
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "rapidjson/document.h"
 #include "rapidjson/istreamwrapper.h"
 #include "rapidjson/ostreamwrapper.h"
diff --git a/src/base/kernel/Base.cpp b/src/base/kernel/Base.cpp
index 157363f0b..1083efe94 100644
--- a/src/base/kernel/Base.cpp
+++ b/src/base/kernel/Base.cpp
@@ -27,8 +27,8 @@
 #include <memory>
 
 
-#include "base/io/Json.h"
-#include "base/io/JsonChain.h"
+#include "base/io/json/Json.h"
+#include "base/io/json/JsonChain.h"
 #include "base/io/log/backends/ConsoleLog.h"
 #include "base/io/log/backends/FileLog.h"
 #include "base/io/log/Log.h"
diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp
index e5fa72935..b21662409 100644
--- a/src/base/kernel/config/BaseConfig.cpp
+++ b/src/base/kernel/config/BaseConfig.cpp
@@ -49,7 +49,7 @@
 #endif
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/config/BaseConfig.h"
 #include "base/kernel/interfaces/IJsonReader.h"
diff --git a/src/base/kernel/config/BaseTransform.cpp b/src/base/kernel/config/BaseTransform.cpp
index e4165a4c1..615342b96 100644
--- a/src/base/kernel/config/BaseTransform.cpp
+++ b/src/base/kernel/config/BaseTransform.cpp
@@ -37,7 +37,7 @@
 #include "base/kernel/Process.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IConfig.h"
-#include "base/io/JsonChain.h"
+#include "base/io/json/JsonChain.h"
 #include "core/config/Config_platform.h"
 
 
diff --git a/src/base/net/http/Http.cpp b/src/base/net/http/Http.cpp
index 597260cfc..3c275824d 100644
--- a/src/base/net/http/Http.cpp
+++ b/src/base/net/http/Http.cpp
@@ -24,7 +24,7 @@
 
 
 #include "3rdparty/rapidjson/document.h"
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/net/http/Http.h"
 
 
diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
index 0944b6e68..0b2a2ec18 100644
--- a/src/base/net/stratum/DaemonClient.cpp
+++ b/src/base/net/stratum/DaemonClient.cpp
@@ -29,7 +29,7 @@
 
 
 #include "3rdparty/http-parser/http_parser.h"
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IClientListener.h"
 #include "base/net/http/HttpClient.h"
diff --git a/src/base/net/stratum/Pool.cpp b/src/base/net/stratum/Pool.cpp
index d23781ad0..f441ba636 100644
--- a/src/base/net/stratum/Pool.cpp
+++ b/src/base/net/stratum/Pool.cpp
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/net/stratum/Pool.h"
 #include "rapidjson/document.h"