diff --git a/java_console/build.xml b/java_console/build.xml
index 8256b76945..0669e101f5 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -52,6 +52,7 @@
                 destdir="autoupdate_build/classes"
                 classpath="lib/annotations.jar"
         >
+            <src path="core_ui/src/main/java"/>
             <src path="autoupdate/src/main/java"/>
             <src path="shared_io/src/main/java"/>
         </javac>
@@ -102,6 +103,7 @@
             <src path="models/src/test/java"/>
             <src path="inifile/src/main/java"/>
             <src path="inifile/src/test/java"/>
+            <src path="core_ui/src/main/java"/>
             <src path="shared_ui/src/main/java"/>
             <src path="shared_io/src/main/java"/>
 <!--            <src path="shared_io/src/test/java"/>-->
diff --git a/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java b/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
index cae2a6fd1a..d6b6bc2a19 100644
--- a/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
+++ b/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
@@ -1,5 +1,6 @@
 package com.rusefi.core.ui;
 
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.autoupdate.ReportedIOException;
 import com.rusefi.core.net.ConnectionAndMeta;
 import org.jetbrains.annotations.NotNull;
diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
index fbdbcdcd93..0febd36cda 100644
--- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
+++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
@@ -16,6 +16,8 @@ import com.rusefi.ui.logview.LogViewer;
 import com.rusefi.ui.lua.LuaScriptPanel;
 import com.rusefi.ui.util.DefaultExceptionHandler;
 import com.rusefi.ui.util.JustOneInstance;
+import com.rusefi.core.ui.AutoupdateUtil;
+
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java b/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java
index e7a86979ac..c899d871bc 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java
@@ -1,11 +1,12 @@
 package com.rusefi.ui;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.autoupdate.Autoupdate;
+import com.rusefi.core.io.BundleUtil;
 import com.rusefi.core.rusEFIVersion;
 import com.rusefi.core.ui.FrameHelper;
 import com.rusefi.ui.util.UiUtils;
 import org.jetbrains.annotations.NotNull;
+import com.rusefi.core.ui.AutoupdateUtil;
 
 import javax.swing.*;
 import java.awt.*;
@@ -42,7 +43,7 @@ public class StatusWindow implements StatusConsumer {
 
         append("Console version " + rusEFIVersion.CONSOLE_VERSION);
         append("Windows " + System.getProperty("os.version"));
-        append("Bundle " + Autoupdate.readBundleFullNameNotNull());
+        append("Bundle " + BundleUtil.readBundleFullNameNotNull());
     }
 
     @NotNull
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/light/LightweightGUI.java b/java_console/ui/src/main/java/com/rusefi/ui/light/LightweightGUI.java
index 86626f08c4..4367391329 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/light/LightweightGUI.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/light/LightweightGUI.java
@@ -3,9 +3,9 @@ package com.rusefi.ui.light;
 import com.devexperts.logging.Logging;
 import com.rusefi.*;
 import com.rusefi.autodetect.PortDetector;
-import com.rusefi.autoupdate.Autoupdate;
 import com.rusefi.core.Sensor;
 import com.rusefi.core.SensorCentral;
+import com.rusefi.core.io.BundleUtil;
 import com.rusefi.core.rusEFIVersion;
 import com.rusefi.io.ConnectionStateListener;
 import com.rusefi.io.ConnectionStatusLogic;
@@ -41,7 +41,7 @@ public class LightweightGUI {
 
 
         JPanel leftPanel = new JPanel(new VerticalFlowLayout());
-        leftPanel.add(new JLabel(Autoupdate.readBundleFullName()));
+        leftPanel.add(new JLabel(BundleUtil.readBundleFullName()));
 
 
         JLabel firmwareVersion = new JLabel();
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
index a9df094edb..fc08502d04 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
@@ -3,6 +3,7 @@ package com.rusefi.ui.widgets;
 import com.rusefi.FileLog;
 import com.rusefi.NamedThreadFactory;
 import com.rusefi.core.MessagesCentral;
+import com.rusefi.functional_tests.EcuTestHelper;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.io.LinkManager;
 import com.rusefi.ui.RecentCommands;
diff --git a/java_console/ui/src/test/java/com/rusefi/test/MsgPanelSandbox.java b/java_console/ui/src/test/java/com/rusefi/test/MsgPanelSandbox.java
index f1d0d2c269..75bef04f92 100644
--- a/java_console/ui/src/test/java/com/rusefi/test/MsgPanelSandbox.java
+++ b/java_console/ui/src/test/java/com/rusefi/test/MsgPanelSandbox.java
@@ -2,7 +2,7 @@ package com.rusefi.test;
 
 import com.rusefi.core.ui.FrameHelper;
 import com.rusefi.ui.MessagesPane;
-import com.rusefi.ui.storage.PersistentConfiguration;
+import com.rusefi.core.preferences.storage.PersistentConfiguration;
 
 public class MsgPanelSandbox extends FrameHelper {
     public static void main(String[] args) {