diff --git a/java_tools/configuration_definition/build.gradle b/java_tools/configuration_definition/build.gradle
index 2f55b823b0..444c40b8a1 100644
--- a/java_tools/configuration_definition/build.gradle
+++ b/java_tools/configuration_definition/build.gradle
@@ -10,6 +10,7 @@ defaultTasks 'shadowJar'
 
 dependencies {
     implementation project(':logging')
+    api project(':config_definition_base')
     implementation project(':models')
     implementation project(':enum_to_string')
     antlr global_libs.antlr
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
index 1342e4ac23..4f312e8a3b 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
@@ -14,7 +14,7 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
 
     private final StringBuilder content = new StringBuilder();
     protected final StringBuffer allFields = new StringBuffer("\tpublic static final Field[] VALUES = {" + EOL);
-    protected final ReaderStateImpl state;
+    protected final ReaderState state;
     private final int baseOffset;
 
     public JavaFieldsConsumer(ReaderStateImpl state, int baseOffset) {
diff --git a/java_tools/configuration_definition_base/build.gradle b/java_tools/configuration_definition_base/build.gradle
new file mode 100644
index 0000000000..d06e223a37
--- /dev/null
+++ b/java_tools/configuration_definition_base/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java-library'
+    id 'antlr'
+}
+
+apply from: '../../java_tools/dependencies.gradle'
+
+dependencies {
+    implementation project(':logging')
+    api project(':inifile')
+    api global_libs.snakeyaml
+    implementation project(':enum_to_string')
+    antlr global_libs.antlr
+}
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigField.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ConfigField.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/ConfigField.java
rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/ConfigField.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderState.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java
rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderState.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/TypesHelper.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java
similarity index 97%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/TypesHelper.java
rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java
index 486a45654c..d00dae02e8 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/TypesHelper.java
+++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java
@@ -17,7 +17,7 @@ public class TypesHelper {
     private static final String UINT_32_T = "uint32_t";
     private static final String BOOLEAN_T = "boolean";
 
-    public static int getElementSize(ReaderStateImpl state, String type) {
+    public static int getElementSize(ReaderState state, String type) {
         Objects.requireNonNull(state);
         if (type == null)
             return 0;
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructure.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructure.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructure.java
rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructure.java
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigurationConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java
rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigurationConsumer.java
diff --git a/java_tools/settings.gradle b/java_tools/settings.gradle
index d72ffaee0b..42439119b6 100644
--- a/java_tools/settings.gradle
+++ b/java_tools/settings.gradle
@@ -16,6 +16,8 @@ include ':version2header'
 project(':version2header').projectDir = new File('version2header')
 include ':bin2header'
 project(':bin2header').projectDir = new File('bin2header')
+include ':config_definition_base'
+project(':config_definition_base').projectDir = new File('configuration_definition_base')
 include ':config_definition'
 project(':config_definition').projectDir = new File('configuration_definition')
 include ':ts_plugin_launcher'