diff --git a/src/base/api/Api.cpp b/src/base/api/Api.cpp
index fc207c31a..dfccb28cf 100644
--- a/src/base/api/Api.cpp
+++ b/src/base/api/Api.cpp
@@ -25,7 +25,6 @@
 #include "base/crypto/keccak.h"
 #include "base/io/Env.h"
 #include "base/io/json/Json.h"
-#include "base/kernel/Base.h"
 #include "base/kernel/OS.h"
 #include "base/tools/Chrono.h"
 #include "base/tools/Cvt.h"
diff --git a/src/base/base.cmake b/src/base/base.cmake
index 5f53f139a..bee7f252f 100644
--- a/src/base/base.cmake
+++ b/src/base/base.cmake
@@ -18,9 +18,9 @@ set(HEADERS_BASE
     src/base/io/log/Tags.h
     src/base/io/Signals.h
     src/base/io/Watcher.h
-    src/base/kernel/Base.h
-    src/base/kernel/config/BaseConfig.h
-    src/base/kernel/config/BaseTransform.h
+    src/base/kernel/v6/Base.h
+    src/base/kernel/v6/config/BaseConfig.h
+    src/base/kernel/v6/config/BaseTransform.h
     src/base/kernel/constants.h
     src/base/kernel/Entry.h
     src/base/kernel/interfaces/IAsyncListener.h
@@ -107,9 +107,9 @@ set(SOURCES_BASE
     src/base/io/log/Tags.cpp
     src/base/io/Signals.cpp
     src/base/io/Watcher.cpp
-    src/base/kernel/Base.cpp
-    src/base/kernel/config/BaseConfig.cpp
-    src/base/kernel/config/BaseTransform.cpp
+    src/base/kernel/v6/Base.cpp
+    src/base/kernel/v6/config/BaseConfig.cpp
+    src/base/kernel/v6/config/BaseTransform.cpp
     src/base/kernel/Entry.cpp
     src/base/kernel/Lib.cpp
     src/base/kernel/OS.cpp
diff --git a/src/base/kernel/Base.cpp b/src/base/kernel/v6/Base.cpp
similarity index 99%
rename from src/base/kernel/Base.cpp
rename to src/base/kernel/v6/Base.cpp
index 76a9deb83..aedae8712 100644
--- a/src/base/kernel/Base.cpp
+++ b/src/base/kernel/v6/Base.cpp
@@ -20,7 +20,7 @@
 #include <memory>
 
 
-#include "base/kernel/Base.h"
+#include "base/kernel/v6/Base.h"
 #include "base/io/json/Json.h"
 #include "base/io/json/JsonChain.h"
 #include "base/io/log/backends/ConsoleLog.h"
diff --git a/src/base/kernel/Base.h b/src/base/kernel/v6/Base.h
similarity index 100%
rename from src/base/kernel/Base.h
rename to src/base/kernel/v6/Base.h
diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/v6/config/BaseConfig.cpp
similarity index 99%
rename from src/base/kernel/config/BaseConfig.cpp
rename to src/base/kernel/v6/config/BaseConfig.cpp
index e045ef15d..ea6559dd7 100644
--- a/src/base/kernel/config/BaseConfig.cpp
+++ b/src/base/kernel/v6/config/BaseConfig.cpp
@@ -23,7 +23,7 @@
   * of this Program grant you additional permission to convey the resulting work.
  */
 
-#include "base/kernel/config/BaseConfig.h"
+#include "base/kernel/v6/config/BaseConfig.h"
 #include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
diff --git a/src/base/kernel/config/BaseConfig.h b/src/base/kernel/v6/config/BaseConfig.h
similarity index 100%
rename from src/base/kernel/config/BaseConfig.h
rename to src/base/kernel/v6/config/BaseConfig.h
diff --git a/src/base/kernel/config/BaseTransform.cpp b/src/base/kernel/v6/config/BaseTransform.cpp
similarity index 99%
rename from src/base/kernel/config/BaseTransform.cpp
rename to src/base/kernel/v6/config/BaseTransform.cpp
index 1e900b97a..f6a412769 100644
--- a/src/base/kernel/config/BaseTransform.cpp
+++ b/src/base/kernel/v6/config/BaseTransform.cpp
@@ -26,13 +26,13 @@
 #endif
 
 
-#include "base/kernel/config/BaseTransform.h"
+#include "base/kernel/v6/config/BaseTransform.h"
 #include "base/io/json/JsonChain.h"
 #include "base/io/log/Log.h"
-#include "base/kernel/config/BaseConfig.h"
 #include "base/kernel/interfaces/IConfig.h"
 #include "base/kernel/private/DnsConfig.h"
 #include "base/kernel/Process.h"
+#include "base/kernel/v6/config/BaseConfig.h"
 #include "base/net/stratum/Pool.h"
 #include "base/net/stratum/Pools.h"
 #include "base/tools/Arguments.h"
diff --git a/src/base/kernel/config/BaseTransform.h b/src/base/kernel/v6/config/BaseTransform.h
similarity index 100%
rename from src/base/kernel/config/BaseTransform.h
rename to src/base/kernel/v6/config/BaseTransform.h
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index 626175aeb..c712f730a 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/core/Controller.h b/src/core/Controller.h
index 42ae04ff5..ac444ffc9 100644
--- a/src/core/Controller.h
+++ b/src/core/Controller.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #define XMRIG_CONTROLLER_H
 
 
-#include "base/kernel/Base.h"
+#include "base/kernel/v6/Base.h"
 
 
 #include <memory>
diff --git a/src/core/config/Config.h b/src/core/config/Config.h
index 0f9cf54da..e2b495d83 100644
--- a/src/core/config/Config.h
+++ b/src/core/config/Config.h
@@ -25,8 +25,7 @@
 
 #include "3rdparty/rapidjson/fwd.h"
 #include "backend/cpu/CpuConfig.h"
-#include "base/kernel/config/BaseConfig.h"
-#include "base/tools/Object.h"
+#include "base/kernel/v6/config/BaseConfig.h"
 
 
 namespace xmrig {
diff --git a/src/core/config/ConfigTransform.cpp b/src/core/config/ConfigTransform.cpp
index 9d24f19ca..3f0a0b9c9 100644
--- a/src/core/config/ConfigTransform.cpp
+++ b/src/core/config/ConfigTransform.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/core/config/ConfigTransform.h b/src/core/config/ConfigTransform.h
index db25b0a08..22627a544 100644
--- a/src/core/config/ConfigTransform.h
+++ b/src/core/config/ConfigTransform.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #define XMRIG_CONFIGTRANSFORM_H
 
 
-#include "base/kernel/config/BaseTransform.h"
+#include "base/kernel/v6/config/BaseTransform.h"
 
 
 namespace xmrig {