diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 0599bd2b4..ca8ca9754 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,6 @@
+## 3.32.6
+* Refactoring | Create packages for each config data format module. #594
+
 ## 3.32.5
 * Structuring Domain Model config.Config as proposed in section "New Modeling Propose". #594
 
diff --git a/gradle.properties b/gradle.properties
index a0e634818..97c5bfb4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=3.32.5-snapshot
+version=3.32.6-snapshot
diff --git a/src/main/java/com/mageddo/dnsproxyserver/App.java b/src/main/java/com/mageddo/dnsproxyserver/App.java
index e372c8261..31ac24fb4 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/App.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/App.java
@@ -3,8 +3,8 @@
 import com.mageddo.dnsproxyserver.application.LogSettings;
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.dnsproxyserver.di.Context;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/Config.java b/src/main/java/com/mageddo/dnsproxyserver/config/Config.java
index 5971efce6..97b0123dd 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/Config.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/Config.java
@@ -10,17 +10,12 @@
 import lombok.Value;
 import org.apache.commons.lang3.Validate;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -33,28 +28,28 @@
 @Builder(toBuilder = true, builderClassName = "ConfigBuilder")
 public class Config {
 
-  private String version;
+  String version;
 
-  private Server server;
+  Server server;
 
-  private DefaultDns defaultDns;
+  DefaultDns defaultDns;
 
-  private Log log;
+  Log log;
 
-  private Path configPath;
+  Path configPath;
 
-  private SolverStub solverStub;
+  SolverStub solverStub;
 
-  private SolverRemote solverRemote;
+  SolverRemote solverRemote;
 
-  private SolverDocker solverDocker;
+  SolverDocker solverDocker;
 
-  private SolverSystem solverSystem;
+  SolverSystem solverSystem;
 
-  private SolverLocal solverLocal;
+  SolverLocal solverLocal;
 
   @NonNull
-  private Source source;
+  Source source;
 
   @JsonIgnore
   public Boolean isDefaultDnsActive() {
@@ -88,7 +83,6 @@ private DefaultDns.ResolvConf getDefaultDnsResolvConf() {
     return this.defaultDns.resolvConf;
   }
 
-  @Nonnull
   @JsonIgnore
   public List<IpAddr> getRemoteDnsServers() {
     if (this.solverRemote == null) {
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java
index f4c68f392..9bc6bfebd 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderService.java
@@ -1,9 +1,9 @@
 package com.mageddo.dnsproxyserver.config.application;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.dnsproxyserver.utils.ObjectUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +17,7 @@
 @RequiredArgsConstructor(onConstructor = @__({@Inject}))
 public class ConfigFileFinderService {
 
-  private final ConfigDAOEnv configDAOEnv;
+  private final ConfigDAOLegacyEnv configDAOEnv;
   private final ConfigDAOCmdArgs configDAOCmdArgs;
 
   public Path findPath(){
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java
index 19f3b600f..c5cc740ea 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapper.java
@@ -1,6 +1,6 @@
 package com.mageddo.dnsproxyserver.config.application;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.utils.Files;
 import com.mageddo.utils.Runtime;
 import com.mageddo.utils.Tests;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java
index edb732de9..4e63db25e 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/application/ConfigService.java
@@ -20,19 +20,21 @@
 public class ConfigService {
 
   private final List<ConfigDAO> configDAOS;
+  private final ConfigMapper configMapper;
 
   @Inject
-  public ConfigService(Instance<ConfigDAO> configDAOS) {
+  public ConfigService(Instance<ConfigDAO> configDAOS, ConfigMapper configMapper) {
     this.configDAOS = configDAOS
       .stream()
       .toList()
     ;
+    this.configMapper = configMapper;
   }
 
   public Config findCurrentConfig() {
     final var configs = this.findConfigs();
     log.trace("baseConfigs={}", configs);
-    final var config = ConfigMapper.mapFrom(configs);
+    final var config = this.configMapper.mapFrom(configs);
     return config;
   }
 
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java
deleted file mode 100644
index 8d6dd1adf..000000000
--- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/Context.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mageddo.dnsproxyserver.config.configurator;
-
-
-import com.mageddo.dnsproxyserver.config.application.ConfigService;
-import com.mageddo.dnsproxyserver.config.configurator.module.ModuleConfigDAO;
-import dagger.Component;
-
-import javax.inject.Singleton;
-
-@Singleton
-@Component(modules = ModuleConfigDAO.class)
-public interface Context {
-
-  static Context create() {
-    return DaggerContext.create();
-  }
-
-   ConfigService configService();
-}
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java
deleted file mode 100644
index 2d53bf365..000000000
--- a/src/main/java/com/mageddo/dnsproxyserver/config/configurator/module/ModuleConfigDAO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mageddo.dnsproxyserver.config.configurator.module;
-
-import com.mageddo.di.InstanceImpl;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.ElementsIntoSet;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Singleton;
-import java.util.Set;
-
-@Module
-public interface ModuleConfigDAO {
-  @Provides
-  static Instance<ConfigDAO> multiSourceConfigDAOInstance(Set<ConfigDAO> instances){
-    return new InstanceImpl<>(instances);
-  }
-
-  @Provides
-  @Singleton
-  @ElementsIntoSet
-  static Set<ConfigDAO> configDaos(
-      ConfigDAOEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3
-  ) {
-    return Set.of(o1, o2, o3);
-  }
-}
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java
deleted file mode 100644
index 8ee780915..000000000
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigPropDAO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
-
-import java.util.Properties;
-
-import static com.mageddo.commons.io.IoUtils.loadPropertiesFromResources;
-
-public class ConfigPropDAO {
-
-  private static final Properties resources = loadPropertiesFromResources("/application.properties");
-
-  public static String getVersion(){
-    return resources.getProperty("version", "unknown");
-  }
-
-}
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java
new file mode 100644
index 000000000..957609812
--- /dev/null
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/VersionDAO.java
@@ -0,0 +1,5 @@
+package com.mageddo.dnsproxyserver.config.dataprovider;
+
+public interface VersionDAO {
+  String findVersion();
+}
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java
index 7ea9d3954..e230db705 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/di/module/ModuleConfigDAO.java
@@ -2,9 +2,12 @@
 
 import com.mageddo.di.InstanceImpl;
 import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOJson;
+import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.ConfigDAOJson;
+import com.mageddo.dnsproxyserver.config.provider.prop.VersionDAOProp;
+import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.ElementsIntoSet;
@@ -24,8 +27,12 @@ static Instance<ConfigDAO> multiSourceConfigDAOInstance(Set<ConfigDAO> instances
   @Singleton
   @ElementsIntoSet
   static Set<ConfigDAO> configDaos(
-      ConfigDAOEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3
+          ConfigDAOLegacyEnv o1, ConfigDAOCmdArgs o2, ConfigDAOJson o3
   ) {
     return Set.of(o1, o2, o3);
   }
+
+  @Binds
+  @Singleton
+  VersionDAO versionDAO(VersionDAOProp impl);
 }
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java
index 004665e54..7186ffa54 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java
@@ -1,21 +1,16 @@
 package com.mageddo.dnsproxyserver.config.mapper;
 
-import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.Log;
-import com.mageddo.dnsproxyserver.config.Server;
-import com.mageddo.dnsproxyserver.config.SolverDocker;
-import com.mageddo.dnsproxyserver.config.SolverLocal;
-import com.mageddo.dnsproxyserver.config.SolverRemote;
-import com.mageddo.dnsproxyserver.config.SolverStub;
-import com.mageddo.dnsproxyserver.config.SolverSystem;
-import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigPropDAO;
+import com.mageddo.dnsproxyserver.config.*;
+import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO;
 import com.mageddo.dnsproxyserver.config.validator.ConfigValidator;
 import com.mageddo.dnsproxyserver.utils.Numbers;
 import com.mageddo.dnsserver.SimpleServer;
 import com.mageddo.net.IpAddr;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.SystemUtils;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.net.URI;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -23,18 +18,21 @@
 import java.util.List;
 
 import static com.mageddo.dnsproxyserver.utils.ListOfObjectUtils.mapField;
-import static com.mageddo.dnsproxyserver.utils.ObjectUtils.firstNonEmptyListRequiring;
-import static com.mageddo.dnsproxyserver.utils.ObjectUtils.firstNonNull;
-import static com.mageddo.dnsproxyserver.utils.ObjectUtils.firstNonNullRequiring;
+import static com.mageddo.dnsproxyserver.utils.ObjectUtils.*;
 
+@Singleton
+@RequiredArgsConstructor(onConstructor_ = @Inject)
 public class ConfigMapper {
-  public static Config mapFrom(List<Config> configs) {
+
+  private final VersionDAO versionDAO;
+
+  public Config mapFrom(List<Config> configs) {
     final var configsWithDefault = new ArrayList<>(configs);
     configsWithDefault.add(buildDefault());
     return mapFrom0(configsWithDefault);
   }
 
-  private static Config mapFrom0(List<Config> configs) {
+  private Config mapFrom0(List<Config> configs) {
     final var config = Config.builder()
       .server(Server
         .builder()
@@ -44,7 +42,7 @@ private static Config mapFrom0(List<Config> configs) {
         .dnsServerNoEntriesResponseCode(firstNonNullRequiring(mapField(Config::getNoEntriesResponseCode, configs)))
         .build()
       )
-      .version(ConfigPropDAO.getVersion())
+      .version(this.versionDAO.findVersion())
       .log(Log
         .builder()
         .level(firstNonNullRequiring(mapField(Config::getLogLevel, configs)))
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFieldsValuesMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/LogLevelMapper.java
similarity index 88%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFieldsValuesMapper.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/mapper/LogLevelMapper.java
index 5a6f33e5b..bd17f4592 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFieldsValuesMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/mapper/LogLevelMapper.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.mapper;
 
 import com.mageddo.dnsproxyserver.config.LogLevel;
 import lombok.extern.slf4j.Slf4j;
@@ -6,7 +6,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
-public class ConfigFieldsValuesMapper {
+public class LogLevelMapper {
   public static LogLevel mapLogLevelFrom(String logLevelName) {
     final var level = EnumUtils.getEnumIgnoreCase(LogLevel.class, logLevelName);
     if (StringUtils.isNotBlank(logLevelName) && level == null) {
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOCmdArgs.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/ConfigDAOCmdArgs.java
similarity index 70%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOCmdArgs.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/ConfigDAOCmdArgs.java
index e34053fc2..1510babb8 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOCmdArgs.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/ConfigDAOCmdArgs.java
@@ -1,8 +1,9 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
+package com.mageddo.dnsproxyserver.config.provider.cmdargs;
 
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFlagMapper;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper.ConfigFlagMapper;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import lombok.RequiredArgsConstructor;
 
 import javax.inject.Inject;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java
similarity index 89%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapper.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java
index eeec7c799..29c2e5500 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapper.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper;
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.Log;
@@ -7,7 +7,8 @@
 import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.SolverStub;
 import com.mageddo.dnsproxyserver.config.SolverSystem;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 import com.mageddo.dnsproxyserver.utils.Booleans;
 import com.mageddo.utils.Files;
 
@@ -25,7 +26,7 @@ public static Config toConfig(ConfigFlag config) {
       .log(Log
         .builder()
         .file(config.getLogToFile())
-        .level(ConfigFieldsValuesMapper.mapLogLevelFrom(config.getLogLevel()))
+        .level(LogLevelMapper.mapLogLevelFrom(config.getLogLevel()))
         .build()
       )
       .defaultDns(Config.DefaultDns.builder()
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigFlag.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java
similarity index 96%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigFlag.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java
index 17f803b39..7df2eff0d 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigFlag.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlag.java
@@ -1,7 +1,7 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.vo;
+package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigPropDAO;
+import com.mageddo.dnsproxyserver.config.application.Configs;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -15,7 +15,6 @@
 import java.nio.file.Paths;
 import java.util.concurrent.Callable;
 
-
 @Getter
 @NoArgsConstructor
 public class ConfigFlag implements Callable<Boolean> {
@@ -245,12 +244,17 @@ public static ConfigFlag parse(String[] args, PrintWriter writer) {
   @Override
   public Boolean call() {
     if (this.version) {
-      this.commandLine.getOut().write(ConfigPropDAO.getVersion());
+      this.commandLine.getOut().write(findVersion());
       return true;
     }
     return false;
   }
 
+  private static String findVersion() {
+    return Configs.getInstance()
+                  .getVersion();
+  }
+
   @JsonIgnore
   public Path getConfigFileAsPath() {
     if (StringUtils.isNotBlank(this.configFilePath)) {
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java
similarity index 61%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/package-info.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java
index 283c74d35..b399baacc 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/package-info.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/package-info.java
@@ -1,9 +1,9 @@
 @Reflection(
-  scanPackage = "com.mageddo.dnsproxyserver.config.dataprovider.vo",
+  scanPackage = "com.mageddo.dnsproxyserver.config.provider.cmdargs.vo",
   publicConstructors = true, constructors = true, declaredConstructors = true,
   publicMethods = true, declaredMethods = true,
   publicFields = true, declaredFields = true
 )
-package com.mageddo.dnsproxyserver.config.dataprovider.vo;
+package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo;
 
 import nativeimage.Reflection;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJson.java
similarity index 79%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJson.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJson.java
index ec518f0d1..74fbf1fa9 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJson.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJson.java
@@ -1,8 +1,9 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.application.ConfigFileFinderService;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2Mapper;
+import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigs.java
similarity index 87%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigs.java
index 2e1de3ba8..c36945110 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/JsonConfigs.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigs.java
@@ -1,14 +1,14 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2Mapper;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV1;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.Entry;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.Env;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV1;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.Entry;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.Env;
 import com.mageddo.json.JsonUtils;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJson.java
similarity index 91%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJson.java
index 247b3c674..aed323e86 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/PersistentConfigDAOJson.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJson.java
@@ -1,11 +1,12 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.predicate.EntryPredicate;
-import com.mageddo.dnsproxyserver.config.dataprovider.predicate.EnvPredicate;
-import com.mageddo.dnsproxyserver.config.dataprovider.predicate.JsonEnvPredicate;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate.EntryPredicate;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate.EnvPredicate;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate.JsonEnvPredicate;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
 import com.mageddo.dnsproxyserver.solver.HostnameQuery;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EntryPredicate.java
similarity index 78%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EntryPredicate.java
index f35dda3b0..408987cfc 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EntryPredicate.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EntryPredicate.java
@@ -1,7 +1,7 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.predicate;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate;
 
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
 
 import java.util.Objects;
 import java.util.function.Predicate;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EnvPredicate.java
similarity index 77%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EnvPredicate.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EnvPredicate.java
index 0e9a1b366..0ac307616 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/EnvPredicate.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/EnvPredicate.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.predicate;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate;
 
 import com.mageddo.dnsproxyserver.config.Config;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java
similarity index 69%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java
index ad947506f..5ebadc411 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/predicate/JsonEnvPredicate.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/predicate/JsonEnvPredicate.java
@@ -1,6 +1,6 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.predicate;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.predicate;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.function.Predicate;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV1EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java
similarity index 87%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV1EnvsMapper.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java
index 1ebbacc0a..34cc3d812 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV1EnvsMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV1EnvsMapper.java
@@ -1,7 +1,7 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper;
 
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV1;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV1;
 import com.mageddo.net.IpAddr;
 
 import java.util.List;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2EnvsMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java
similarity index 91%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2EnvsMapper.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java
index 2915ef4e1..6886d77f2 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2EnvsMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2EnvsMapper.java
@@ -1,7 +1,7 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper;
 
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
 import com.mageddo.net.IP;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java
similarity index 89%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java
index c4251c63b..3ffa5e89d 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2Mapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2Mapper.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper;
 
 import com.mageddo.dnsproxyserver.config.CanaryRateThresholdCircuitBreakerStrategyConfig;
 import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig;
@@ -10,10 +10,11 @@
 import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.SolverStub;
 import com.mageddo.dnsproxyserver.config.StaticThresholdCircuitBreakerStrategyConfig;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.StaticThresholdCircuitBreaker;
+import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker;
 import com.mageddo.dnsproxyserver.utils.Booleans;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -45,8 +46,8 @@ public static Config toConfig(ConfigJson json, Path configFileAbsolutePath) {
       )
       .log(Log
         .builder()
-        .level(ConfigFieldsValuesMapper.mapLogLevelFrom(json.getLogLevel()))
-        .file(ConfigFieldsValuesMapper.mapLogFileFrom(json.getLogFile()))
+        .level(LogLevelMapper.mapLogLevelFrom(json.getLogLevel()))
+        .file(LogLevelMapper.mapLogFileFrom(json.getLogFile()))
         .build()
       )
       .configPath(configFileAbsolutePath)
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJson.java
similarity index 94%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJson.java
index 540af52d1..e938ff7f1 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJson.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJson.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.vo;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo;
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsserver.SimpleServer;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV1.java
similarity index 95%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV1.java
index 52a9de0ba..419c51ca6 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV1.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV1.java
@@ -1,9 +1,9 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.vo;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV1EnvsMapper;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV1EnvsMapper;
 import com.mageddo.dnsserver.SimpleServer;
 import com.mageddo.net.IpAddr;
 import lombok.Data;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV2.java
similarity index 97%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV2.java
index 9b2149c52..d21d3e1db 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigJsonV2.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/ConfigJsonV2.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.vo;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -11,7 +11,7 @@
 import com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig;
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.Config.Entry.Type;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2EnvsMapper;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2EnvsMapper;
 import com.mageddo.dnsserver.SimpleServer;
 import com.mageddo.net.IP;
 import com.mageddo.net.IpAddr;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java
new file mode 100644
index 000000000..adc3bd8f4
--- /dev/null
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/vo/package-info.java
@@ -0,0 +1,9 @@
+@Reflection(
+  scanPackage = "com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo",
+  publicConstructors = true, constructors = true, declaredConstructors = true,
+  publicMethods = true, declaredMethods = true,
+  publicFields = true, declaredFields = true
+)
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo;
+
+import nativeimage.Reflection;
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigDAOLegacyEnv.java
similarity index 63%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOEnv.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigDAOLegacyEnv.java
index f3e5c8b7c..dd63a4f38 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOEnv.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigDAOLegacyEnv.java
@@ -1,8 +1,7 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
+package com.mageddo.dnsproxyserver.config.provider.legacyenv;
 
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigEnvMapper;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAO;
 import lombok.RequiredArgsConstructor;
 
 import javax.inject.Inject;
@@ -10,7 +9,7 @@
 
 @Singleton
 @RequiredArgsConstructor(onConstructor = @__({@Inject}))
-public class ConfigDAOEnv implements ConfigDAO {
+public class ConfigDAOLegacyEnv implements ConfigDAO {
 
   @Override
   public Config find() {
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigEnv.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnv.java
similarity index 93%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigEnv.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnv.java
index 4a451d998..b528d3364 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/vo/ConfigEnv.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnv.java
@@ -1,10 +1,9 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.vo;
+package com.mageddo.dnsproxyserver.config.provider.legacyenv;
 
 import com.mageddo.dnsproxyserver.utils.Envs;
 import com.mageddo.http.UriUtils;
 import lombok.Builder;
 import lombok.Value;
-import org.apache.commons.lang3.StringUtils;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -91,11 +90,7 @@ public static ConfigEnv fromEnv() {
   }
 
   static String findLogFilePath() {
-    final var logFile = System.getenv(MG_LOG_FILE);
-    if (StringUtils.isBlank(logFile)) {
-      return null;
-    }
-    return logFile;
+    return Envs.getStringOrNull(MG_LOG_FILE);
   }
 
 }
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapper.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java
similarity index 90%
rename from src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapper.java
rename to src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java
index 67da0684b..ced08a03e 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapper.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapper.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.legacyenv;
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.Log;
@@ -7,7 +7,7 @@
 import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.SolverStub;
 import com.mageddo.dnsproxyserver.config.SolverSystem;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper;
 import com.mageddo.dnsproxyserver.utils.Booleans;
 
 public class ConfigEnvMapper {
@@ -21,7 +21,7 @@ public static Config toConfig(ConfigEnv config) {
       .log(Log
         .builder()
         .file(config.getLogFile())
-        .level(ConfigFieldsValuesMapper.mapLogLevelFrom(config.getLogLevel()))
+        .level(LogLevelMapper.mapLogLevelFrom(config.getLogLevel()))
         .build()
       )
       .defaultDns(Config.DefaultDns
diff --git a/src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java b/src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java
new file mode 100644
index 000000000..128cf3f2f
--- /dev/null
+++ b/src/main/java/com/mageddo/dnsproxyserver/config/provider/prop/VersionDAOProp.java
@@ -0,0 +1,22 @@
+package com.mageddo.dnsproxyserver.config.provider.prop;
+
+import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO;
+import lombok.NoArgsConstructor;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Properties;
+
+import static com.mageddo.commons.io.IoUtils.loadPropertiesFromResources;
+
+@Singleton
+@NoArgsConstructor(onConstructor_ = @Inject)
+public class VersionDAOProp implements VersionDAO {
+
+  private static final Properties resources = loadPropertiesFromResources("/application.properties");
+
+  public String findVersion(){
+    return resources.getProperty("version", "unknown");
+  }
+
+}
diff --git a/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java b/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java
index 36b5b7553..aed1352db 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/dataprovider/LogSettingsDAOSlf4j.java
@@ -3,7 +3,7 @@
 import ch.qos.logback.classic.Level;
 import com.mageddo.commons.io.IoUtils;
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigFieldsValuesMapper;
+import com.mageddo.dnsproxyserver.config.mapper.LogLevelMapper;
 import com.mageddo.logback.LogbackUtils;
 import lombok.extern.slf4j.Slf4j;
 
@@ -19,7 +19,7 @@ public class LogSettingsDAOSlf4j implements LogSettingsDAO {
 
   @Override
   public void setupLogFile(Config config) {
-    final var logFile = ConfigFieldsValuesMapper.mapLogFileFrom(config.getLogFile());
+    final var logFile = LogLevelMapper.mapLogFileFrom(config.getLogFile());
     if (logFile == null) {
       disableLogging();
     } else if (isLogFileConfig(logFile)) {
diff --git a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java
index c0b2f6425..22cf7b766 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/di/module/ModuleDao.java
@@ -1,19 +1,14 @@
 package com.mageddo.dnsproxyserver.di.module;
 
 import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAO;
-import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAOJson;
+import com.mageddo.dnsproxyserver.config.dataprovider.VersionDAO;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.PersistentConfigDAOJson;
+import com.mageddo.dnsproxyserver.config.provider.prop.VersionDAOProp;
 import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacade;
 import com.mageddo.dnsproxyserver.docker.dataprovider.ContainerFacadeDefault;
 import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacade;
 import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacadeDefault;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.ContainerDAO;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.ContainerDAODefault;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAO;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAODefault;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.NetworkDAO;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.NetworkDAODefault;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DpsContainerDAO;
-import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DpsContainerDAODefault;
+import com.mageddo.dnsproxyserver.solver.docker.dataprovider.*;
 import dagger.Binds;
 import dagger.Module;
 
diff --git a/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java b/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java
index 6816a43ad..540f45c90 100644
--- a/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java
+++ b/src/main/java/com/mageddo/dnsproxyserver/sandbox/BinaryFromGradleTestsSandbox.java
@@ -3,7 +3,7 @@
 import com.mageddo.commons.exec.CommandLines;
 import com.mageddo.commons.exec.NopResultHandler;
 import com.mageddo.commons.exec.Request;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv;
 import lombok.extern.slf4j.Slf4j;
 
 import java.nio.file.Path;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java
index e28419962..e2f320359 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java
@@ -4,8 +4,8 @@
 import com.mageddo.commons.exec.ProcessesWatchDog;
 import com.mageddo.dns.utils.Messages;
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson;
 import com.mageddo.dnsproxyserver.sandbox.Instance;
 import com.mageddo.dnsproxyserver.sandbox.Sandbox;
 import com.mageddo.dnsproxyserver.server.Starter;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java
index 562dae8b2..e61409dc0 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigTest.java
@@ -1,8 +1,8 @@
 package com.mageddo.dnsproxyserver.config;
 
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs;
-import com.mageddo.dnsproxyserver.config.dataprovider.mapper.ConfigJsonV2Mapper;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper.ConfigJsonV2Mapper;
 import com.mageddo.utils.Files;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java
index 3b359e8be..063536b6f 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java
@@ -1,7 +1,7 @@
 package com.mageddo.dnsproxyserver.config.application;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOEnv;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigDAOLegacyEnv;
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,7 +22,7 @@
 class ConfigFileFinderServiceTest {
 
   @Mock
-  ConfigDAOEnv configDAOEnv;
+  ConfigDAOLegacyEnv configDAOEnv;
 
   @Mock
   ConfigDAOCmdArgs configDAOCmdArgs;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java
index 95b06db2c..5cc052dae 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java
@@ -1,6 +1,6 @@
 package com.mageddo.dnsproxyserver.config.application;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import testing.templates.ConfigFlagTemplates;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java
index 745afbb52..fa1fefff4 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigServiceCompTest.java
@@ -2,7 +2,7 @@
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.dnsproxyserver.config.LogLevel;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
 import com.mageddo.dnsproxyserver.config.di.Context;
 import dagger.sheath.junit.DaggerTest;
 import lombok.SneakyThrows;
@@ -42,7 +42,7 @@ void mustPutDaosInTheExpectedOrder() {
     final var names = this.service.findConfigNames();
 
     // assert
-    assertEquals("[ConfigDAOEnv, ConfigDAOJson, ConfigDAOCmdArgs]", names.toString());
+    assertEquals("[ConfigDAOLegacyEnv, ConfigDAOJson, ConfigDAOCmdArgs]", names.toString());
   }
 
   @Test
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java
similarity index 76%
rename from src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java
index ebb94f204..19dc3942f 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java
@@ -2,16 +2,23 @@
 
 import com.mageddo.dnsproxyserver.config.Config;
 import com.mageddo.net.IP;
+import dagger.sheath.junit.DaggerTest;
 import org.junit.jupiter.api.Test;
+import testing.ContextSupplier;
+import testing.Events;
 import testing.templates.ConfigTemplates;
 
+import javax.inject.Inject;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+@DaggerTest(initializer = ContextSupplier.class, eventsHandler = Events.class)
+class ConfigMapperCompTest {
 
-class ConfigMapperTest {
+  @Inject
+  ConfigMapper configMapper;
 
   @Test
   void mustMapFromDaoConfigsToCurrentConfig() {
@@ -19,7 +26,7 @@ void mustMapFromDaoConfigsToCurrentConfig() {
     final var config = ConfigTemplates.defaultWithoutId();
 
     // act
-    final var currentConfig = ConfigMapper.mapFrom(List.of(config));
+    final var currentConfig = this.configMapper.mapFrom(List.of(config));
 
     // assert
     assertNotNull(currentConfig);
@@ -32,7 +39,7 @@ void mustMapSolverStub() {
     final var another = ConfigTemplates.acmeSolverStub();
 
     // act
-    final var currentConfig = ConfigMapper.mapFrom(List.of(theDefault, another));
+    final var currentConfig = this.configMapper.mapFrom(List.of(theDefault, another));
 
     // assert
     assertNotNull(currentConfig);
@@ -48,7 +55,7 @@ void mustMapSolverLocal(){
     final var theDefault = ConfigTemplates.defaultWithoutId();
     final var another = ConfigTemplates.acmeSolverLocal();
 
-    final var currentConfig = ConfigMapper.mapFrom(List.of(theDefault, another));
+    final var currentConfig = this.configMapper.mapFrom(List.of(theDefault, another));
 
     assertNotNull(currentConfig);
 
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java
similarity index 86%
rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java
index 1e4500dba..ce8c98a05 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigFlagMapperTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper;
 
 import org.junit.jupiter.api.Test;
 import testing.templates.ConfigFlagTemplates;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java
similarity index 85%
rename from src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java
index 93d92a68f..d235e5d7d 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/flags/ConfigFlagTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java
@@ -1,16 +1,13 @@
-package com.mageddo.dnsproxyserver.config.flags;
+package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo;
 
 import com.mageddo.commons.regex.Regexes;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
 import org.junit.jupiter.api.Test;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.regex.Pattern;
 
-import static com.mageddo.utils.TestUtils.readAndSortJson;
-import static com.mageddo.utils.TestUtils.readString;
-import static com.mageddo.utils.TestUtils.sortJson;
+import static com.mageddo.utils.TestUtils.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java
similarity index 97%
rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java
index e586e22e1..d50dade61 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/ConfigDAOJsonTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java
similarity index 67%
rename from src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java
index 19c156b2a..81e8c3a1c 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/ConfigJsonV1Test.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java
@@ -1,15 +1,12 @@
-package com.mageddo.dnsproxyserver.config.entrypoint;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static com.mageddo.utils.TestUtils.readAndSortJson;
-import static com.mageddo.utils.TestUtils.readAsStream;
-import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields;
+import static com.mageddo.utils.TestUtils.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class ConfigJsonV1Test {
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java
similarity index 81%
rename from src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java
index e8772aa04..e8f49e16e 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/entrypoint/JsonConfigsTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java
@@ -1,9 +1,8 @@
-package com.mageddo.dnsproxyserver.config.entrypoint;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJsonV2.StaticThresholdCircuitBreaker;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker;
 import org.apache.commons.lang3.ClassUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -12,13 +11,9 @@
 import java.nio.file.Path;
 import java.time.Duration;
 
-import static com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs.findVersion;
-import static com.mageddo.utils.TestUtils.readAndSortJson;
-import static com.mageddo.utils.TestUtils.readAsStream;
-import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs.findVersion;
+import static com.mageddo.utils.TestUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 class JsonConfigsTest {
 
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJsonTest.java
similarity index 95%
rename from src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJsonTest.java
index 409ea3c78..b640f6b88 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/PersistentConfigDAOJsonTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/PersistentConfigDAOJsonTest.java
@@ -1,20 +1,19 @@
-package com.mageddo.dnsproxyserver.config;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
 import com.mageddo.dnsproxyserver.config.Config.Entry.Type;
-import com.mageddo.dnsproxyserver.config.dataprovider.PersistentConfigDAOJson;
 import com.mageddo.dnsproxyserver.solver.HostnameQuery;
-import testing.templates.EnvTemplates;
-import testing.templates.HostnameQueryTemplates;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
+import testing.templates.EnvTemplates;
+import testing.templates.HostnameQueryTemplates;
 
-import static testing.templates.EnvTemplates.MAGEDDO_COM_CAMEL_CASE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.doReturn;
+import static testing.templates.EnvTemplates.MAGEDDO_COM_CAMEL_CASE;
 
 @ExtendWith(MockitoExtension.class)
 class PersistentConfigDAOJsonTest {
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java
similarity index 85%
rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java
index 1a09bad95..4885135e4 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigJsonV2MapperTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java
@@ -1,7 +1,7 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper;
 
 import com.mageddo.dnsproxyserver.config.Config;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson;
 import org.junit.jupiter.api.Test;
 import testing.templates.ConfigJsonTemplates;
 
@@ -9,10 +9,7 @@
 import java.nio.file.Paths;
 
 import static com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig.Name.CANARY_RATE_THRESHOLD;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 class ConfigJsonV2MapperTest {
 
diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java
similarity index 90%
rename from src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java
rename to src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java
index ff97326fc..3298298ff 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/config/dataprovider/mapper/ConfigEnvMapperTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java
@@ -1,4 +1,4 @@
-package com.mageddo.dnsproxyserver.config.dataprovider.mapper;
+package com.mageddo.dnsproxyserver.config.provider.legacyenv;
 
 import org.junit.jupiter.api.Test;
 import testing.templates.config.ConfigEnvTemplates;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java
index 0898cf7c8..4b094e1dd 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java
@@ -1,6 +1,6 @@
 package com.mageddo.dnsproxyserver.dnsconfigurator.linux;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv;
 import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvFile.Type;
 import testing.templates.IpAddrTemplates;
 import org.apache.commons.exec.OS;
diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java
index 1e43596b4..ac4de5a9d 100644
--- a/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java
+++ b/src/test/java/com/mageddo/dnsproxyserver/server/rest/EnvResourceCompTest.java
@@ -1,7 +1,7 @@
 package com.mageddo.dnsproxyserver.server.rest;
 
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs;
 import dagger.sheath.junit.DaggerTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/testing/ContextSupplier.java b/src/test/java/testing/ContextSupplier.java
index b6f8d93af..874a2b917 100644
--- a/src/test/java/testing/ContextSupplier.java
+++ b/src/test/java/testing/ContextSupplier.java
@@ -1,7 +1,7 @@
 package testing;
 
 import com.mageddo.dnsproxyserver.config.application.Configs;
-import com.mageddo.dnsproxyserver.config.dataprovider.ConfigDAOCmdArgs;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.ConfigDAOCmdArgs;
 import com.mageddo.dnsproxyserver.di.Context;
 import com.mageddo.net.SocketUtils;
 
diff --git a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java
index 674b2f75a..efef01e3a 100644
--- a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java
+++ b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java
@@ -1,6 +1,6 @@
 package testing.templates;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson;
 import com.mageddo.net.IpAddr;
 import com.mageddo.net.SocketUtils;
 import lombok.Builder;
diff --git a/src/test/java/testing/templates/ConfigFlagTemplates.java b/src/test/java/testing/templates/ConfigFlagTemplates.java
index b96c71045..fd675f1a3 100644
--- a/src/test/java/testing/templates/ConfigFlagTemplates.java
+++ b/src/test/java/testing/templates/ConfigFlagTemplates.java
@@ -1,6 +1,6 @@
 package testing.templates;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigFlag;
+import com.mageddo.dnsproxyserver.config.provider.cmdargs.vo.ConfigFlag;
 
 import java.nio.file.Path;
 
diff --git a/src/test/java/testing/templates/ConfigJsonTemplates.java b/src/test/java/testing/templates/ConfigJsonTemplates.java
index b26c6dc6c..27f9b78d6 100644
--- a/src/test/java/testing/templates/ConfigJsonTemplates.java
+++ b/src/test/java/testing/templates/ConfigJsonTemplates.java
@@ -1,7 +1,7 @@
 package testing.templates;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.JsonConfigs;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigJson;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider.JsonConfigs;
+import com.mageddo.dnsproxyserver.config.provider.jsonv1v2.vo.ConfigJson;
 import com.mageddo.utils.TestUtils;
 
 public class ConfigJsonTemplates {
diff --git a/src/test/java/testing/templates/ConfigTemplates.java b/src/test/java/testing/templates/ConfigTemplates.java
index e4520850a..def3c3e90 100644
--- a/src/test/java/testing/templates/ConfigTemplates.java
+++ b/src/test/java/testing/templates/ConfigTemplates.java
@@ -9,7 +9,7 @@
 import com.mageddo.dnsproxyserver.config.SolverRemote;
 import com.mageddo.dnsproxyserver.config.SolverStub;
 import com.mageddo.dnsproxyserver.config.SolverSystem;
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv;
 import com.mageddo.dnsserver.SimpleServer;
 import com.mageddo.net.IP;
 
diff --git a/src/test/java/testing/templates/config/ConfigEnvTemplates.java b/src/test/java/testing/templates/config/ConfigEnvTemplates.java
index 79ba2e1ce..65105eb23 100644
--- a/src/test/java/testing/templates/config/ConfigEnvTemplates.java
+++ b/src/test/java/testing/templates/config/ConfigEnvTemplates.java
@@ -1,6 +1,6 @@
 package testing.templates.config;
 
-import com.mageddo.dnsproxyserver.config.dataprovider.vo.ConfigEnv;
+import com.mageddo.dnsproxyserver.config.provider.legacyenv.ConfigEnv;
 
 import java.nio.file.Paths;