diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
index 9e3c35e605..0fc00123d5 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
@@ -109,7 +109,7 @@ public class LiveDataProcessor {
 
                 baseAddressCHeader.append("#define " + name.toUpperCase() + "_BASE_ADDRESS " + startingPosition + "\n");
 
-                ReaderStateImpl state = new ReaderStateImpl();
+                ReaderState state = new ReaderStateImpl();
                 state.setDefinitionInputFile(folder + File.separator + name + ".txt");
                 state.setWithC_Defines(withCDefines);
 
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
similarity index 91%
rename from java_tools/configuration_definition/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
index 2cc498485e..df1d89f19d 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
+++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
@@ -1,6 +1,6 @@
 package com.rusefi.output;
 
-import com.rusefi.ReaderStateImpl;
+import com.rusefi.ReaderState;
 import com.rusefi.ToolUtil;
 import com.rusefi.util.LazyFile;
 
@@ -18,7 +18,7 @@ public class FileJavaFieldsConsumer extends JavaFieldsConsumer {
     private final LazyFile javaFields;
     private final String className;
 
-    public FileJavaFieldsConsumer(ReaderStateImpl state, String javaDestination, int baseOffset) {
+    public FileJavaFieldsConsumer(ReaderState state, String javaDestination, int baseOffset) {
         super(state, baseOffset);
         javaFields = new LazyFile(javaDestination);
         String className = new File(javaDestination).getName();