diff --git a/android/app/src/main/java/com/rusefi/app/DfuUpload.java b/android/app/src/main/java/com/rusefi/app/DfuUpload.java
index 914f736772..e9dce6f950 100644
--- a/android/app/src/main/java/com/rusefi/app/DfuUpload.java
+++ b/android/app/src/main/java/com/rusefi/app/DfuUpload.java
@@ -5,8 +5,8 @@ import android.widget.TextView;
 
 import com.rusefi.Listener;
 import com.rusefi.dfu.DfuImage;
-import com.rusefi.shared.ConnectionAndMeta;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.net.ConnectionAndMeta;
+import com.rusefi.core.FileUtil;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/android/dependencies.gradle b/android/dependencies.gradle
index 538b7eccaf..c8168497ac 100644
--- a/android/dependencies.gradle
+++ b/android/dependencies.gradle
@@ -7,7 +7,6 @@ ext {
           snakeyaml      : "org.yaml:snakeyaml:1.26",
           jsr305         : "com.google.code.findbugs:jsr305:3.0.2",
           commons_logging: "commons-logging:commons-logging:1.2",
-          antlr          : "org.antlr:antlr4:4.9.3", // use ANTLR version 4
           json           : "com.googlecode.json-simple:json-simple:1.1.1",
   ]
 
diff --git a/android/settings.gradle b/android/settings.gradle
index d3528707ba..ddda6d7623 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,4 +1,8 @@
 include ':app'
+include ':core_io'
+project(':core_io').projectDir = new File('../java_console/shared_io')
+include ':core_ui'
+project(':core_ui').projectDir = new File('../java_console/core_ui')
 include ':shared_io'
 project(':shared_io').projectDir = new File('../java_console/shared_io')
 include ':shared_ui'
diff --git a/java_console/core_ui/build.gradle b/java_console/core_ui/build.gradle
new file mode 100644
index 0000000000..08c1db6bb3
--- /dev/null
+++ b/java_console/core_ui/build.gradle
@@ -0,0 +1,10 @@
+plugins {
+    id 'java-library'
+    id 'java'
+}
+
+// this CORE module cannot depend on model/ini!
+
+dependencies {
+    api project(':core_io')
+}
\ No newline at end of file
diff --git a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/ReportedIOException.java b/java_console/core_ui/src/main/java/com/rusefi/autoupdate/ReportedIOException.java
similarity index 100%
rename from java_console/autoupdate/src/main/java/com/rusefi/autoupdate/ReportedIOException.java
rename to java_console/core_ui/src/main/java/com/rusefi/autoupdate/ReportedIOException.java
diff --git a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/AutoupdateUtil.java b/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
similarity index 96%
rename from java_console/autoupdate/src/main/java/com/rusefi/autoupdate/AutoupdateUtil.java
rename to java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
index 3f47d6cb74..cae2a6fd1a 100644
--- a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/AutoupdateUtil.java
+++ b/java_console/core_ui/src/main/java/com/rusefi/core/ui/AutoupdateUtil.java
@@ -1,7 +1,7 @@
-package com.rusefi.autoupdate;
+package com.rusefi.core.ui;
 
-import com.rusefi.shared.ConnectionAndMeta;
-import com.rusefi.ui.util.FrameHelper;
+import com.rusefi.autoupdate.ReportedIOException;
+import com.rusefi.core.net.ConnectionAndMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -13,7 +13,6 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLStreamHandlerFactory;
 import java.util.Date;
-import java.util.concurrent.atomic.AtomicReference;
 
 public class AutoupdateUtil {
     public static final boolean runHeadless = Boolean.getBoolean("run_headless") || GraphicsEnvironment.isHeadless();
@@ -30,7 +29,7 @@ public class AutoupdateUtil {
 
     static class ProgressView {
         private final FrameHelper frameHelper;
-        private JProgressBar progressBar;
+        private final JProgressBar progressBar;
 
         ProgressView(FrameHelper frameHelper, JProgressBar progressBar) {
             this.frameHelper = frameHelper;
diff --git a/java_console/autoupdate/src/main/java/com/rusefi/ui/util/FrameHelper.java b/java_console/core_ui/src/main/java/com/rusefi/core/ui/FrameHelper.java
similarity index 98%
rename from java_console/autoupdate/src/main/java/com/rusefi/ui/util/FrameHelper.java
rename to java_console/core_ui/src/main/java/com/rusefi/core/ui/FrameHelper.java
index aa046b5cbb..e003851166 100644
--- a/java_console/autoupdate/src/main/java/com/rusefi/ui/util/FrameHelper.java
+++ b/java_console/core_ui/src/main/java/com/rusefi/core/ui/FrameHelper.java
@@ -1,4 +1,4 @@
-package com.rusefi.ui.util;
+package com.rusefi.core.ui;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/java_console/inifile/build.gradle b/java_console/inifile/build.gradle
index fc76aa506b..7d97771a52 100644
--- a/java_console/inifile/build.gradle
+++ b/java_console/inifile/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     api project(':logging-api')
-    api project(':shared_io')
+    api project(':core_io')
 }
diff --git a/java_console/inifile/src/main/java/com/opensr5/ConfigurationImage.java b/java_console/inifile/src/main/java/com/opensr5/ConfigurationImage.java
index c7a078d374..a33390ffc6 100644
--- a/java_console/inifile/src/main/java/com/opensr5/ConfigurationImage.java
+++ b/java_console/inifile/src/main/java/com/opensr5/ConfigurationImage.java
@@ -1,10 +1,9 @@
 package com.opensr5;
 
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 /**
  * Andrey Belomutskiy, (c) 2013-2020
diff --git a/java_console/inifile/src/main/java/com/rusefi/config/Field.java b/java_console/inifile/src/main/java/com/rusefi/config/Field.java
index 39542a1a7c..626eb2dd9b 100644
--- a/java_console/inifile/src/main/java/com/rusefi/config/Field.java
+++ b/java_console/inifile/src/main/java/com/rusefi/config/Field.java
@@ -2,7 +2,7 @@ package com.rusefi.config;
 
 import com.macfaq.io.LittleEndianOutputStream;
 import com.opensr5.ConfigurationImage;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.ByteArrayOutputStream;
diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Bibliography.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Bibliography.java
index 3012a67ced..3c50eb1285 100644
--- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Bibliography.java
+++ b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Bibliography.java
@@ -1,6 +1,6 @@
 package com.rusefi.tune.xml;
 
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 
 import javax.xml.bind.annotation.XmlAttribute;
 
diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java
index 3c1bef180e..dac9310961 100644
--- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java
+++ b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java
@@ -5,7 +5,7 @@ import com.opensr5.ConfigurationImage;
 import com.opensr5.ini.IniFileModel;
 import com.opensr5.ini.field.ArrayIniField;
 import com.opensr5.ini.field.IniField;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.xml.XmlUtil;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle
index 583baf5844..14aa757cbc 100644
--- a/java_console/io/build.gradle
+++ b/java_console/io/build.gradle
@@ -16,7 +16,7 @@ tasks.withType(Test) {
 dependencies {
     implementation libs.javaxJson
     api project(':models')
-    api project(':shared_io')
+    api project(':core_io')
     api project(':logging')
 
     implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.9.2'
diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
index 2f308f8c6a..3c3c18016e 100644
--- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
+++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
@@ -6,7 +6,7 @@ import com.opensr5.io.ConfigurationImageFile;
 import com.opensr5.io.DataListener;
 import com.rusefi.ConfigurationImageDiff;
 import com.rusefi.NamedThreadFactory;
-import com.rusefi.SignatureHelper;
+import com.rusefi.core.SignatureHelper;
 import com.rusefi.Timeouts;
 import com.rusefi.binaryprotocol.test.Bug3923;
 import com.rusefi.config.generated.Fields;
@@ -15,7 +15,7 @@ import com.rusefi.core.SensorCentral;
 import com.rusefi.io.*;
 import com.rusefi.io.commands.GetOutputsCommand;
 import com.rusefi.io.commands.HelloCommand;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import com.rusefi.tune.xml.Msq;
 import com.rusefi.ui.livedocs.LiveDocsRegistry;
 import org.jetbrains.annotations.Nullable;
diff --git a/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java b/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java
index 333af63323..dbc00e7c92 100644
--- a/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java
+++ b/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java
@@ -1,9 +1,9 @@
 package com.rusefi.io;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.RusEfiSignature;
-import com.rusefi.SignatureHelper;
-import com.rusefi.autoupdate.BundleUtil;
+import com.rusefi.core.RusEfiSignature;
+import com.rusefi.core.SignatureHelper;
+import com.rusefi.core.io.BundleUtil;
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.ui.StatusConsumer;
diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java
index 132b5a23f8..6b5d7dc135 100644
--- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java
+++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java
@@ -20,7 +20,7 @@ import java.net.Socket;
 
 import static com.devexperts.logging.Logging.getLogging;
 import static com.rusefi.config.generated.Fields.TS_PROTOCOL;
-import static com.rusefi.shared.FileUtil.close;
+import static com.rusefi.core.FileUtil.close;
 
 /**
  * Takes any IoStream and exposes it as local TCP/IP server socket
diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/ServerSocketReference.java b/java_console/io/src/main/java/com/rusefi/io/tcp/ServerSocketReference.java
index caac6887f8..45d78ee882 100644
--- a/java_console/io/src/main/java/com/rusefi/io/tcp/ServerSocketReference.java
+++ b/java_console/io/src/main/java/com/rusefi/io/tcp/ServerSocketReference.java
@@ -1,6 +1,6 @@
 package com.rusefi.io.tcp;
 
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 
 import java.io.Closeable;
 import java.net.ServerSocket;
diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
index b90ae20795..ab0a63f22e 100644
--- a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
+++ b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
@@ -4,7 +4,7 @@ import com.opensr5.io.DataListener;
 import com.rusefi.binaryprotocol.IncomingDataBuffer;
 import com.rusefi.io.ByteReader;
 import com.rusefi.io.serial.AbstractIoStream;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
diff --git a/java_console/io/src/main/java/com/rusefi/proxy/BaseBroadcastingThread.java b/java_console/io/src/main/java/com/rusefi/proxy/BaseBroadcastingThread.java
index 99cba50024..9c34f4b6da 100644
--- a/java_console/io/src/main/java/com/rusefi/proxy/BaseBroadcastingThread.java
+++ b/java_console/io/src/main/java/com/rusefi/proxy/BaseBroadcastingThread.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 import java.net.Socket;
 
 import static com.devexperts.logging.Logging.getLogging;
-import static com.rusefi.shared.FileUtil.close;
+import static com.rusefi.core.FileUtil.close;
 
 public class BaseBroadcastingThread {
     private static final Logging log = getLogging(BaseBroadcastingThread.class);
diff --git a/java_console/io/src/main/java/com/rusefi/proxy/NetworkConnector.java b/java_console/io/src/main/java/com/rusefi/proxy/NetworkConnector.java
index 756e7e3b44..571f83838a 100644
--- a/java_console/io/src/main/java/com/rusefi/proxy/NetworkConnector.java
+++ b/java_console/io/src/main/java/com/rusefi/proxy/NetworkConnector.java
@@ -11,7 +11,7 @@ import com.rusefi.io.LinkManager;
 import com.rusefi.io.commands.HelloCommand;
 import com.rusefi.io.tcp.BinaryProtocolServer;
 import com.rusefi.io.tcp.TcpIoStream;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.server.ControllerInfo;
 import com.rusefi.server.SessionDetails;
 import com.rusefi.server.rusEFISSLContext;
diff --git a/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java b/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java
index 5eaa669070..f87df8e54a 100644
--- a/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java
+++ b/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java
@@ -1,10 +1,10 @@
 package com.rusefi.tools;
 
 import com.rusefi.server.SessionDetails;
-import com.rusefi.preferences.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import org.jetbrains.annotations.NotNull;
 
-import static com.rusefi.preferences.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 public class VehicleToken {
     private static final String VEHICLE_TOKEN = "VEHICLE_TOKEN";
diff --git a/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java b/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java
index 5d4d2a1ec9..1bbed886a5 100644
--- a/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java
+++ b/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java
@@ -1,5 +1,7 @@
 package com.rusefi;
 
+import com.rusefi.core.RusEfiSignature;
+import com.rusefi.core.SignatureHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/java_console/io/src/test/java/com/rusefi/TestHelper.java b/java_console/io/src/test/java/com/rusefi/TestHelper.java
index 3fd84f137b..34cc9d67c2 100644
--- a/java_console/io/src/test/java/com/rusefi/TestHelper.java
+++ b/java_console/io/src/test/java/com/rusefi/TestHelper.java
@@ -6,6 +6,7 @@ import com.opensr5.ini.field.ScalarIniField;
 import com.rusefi.binaryprotocol.BinaryProtocolState;
 import com.rusefi.config.Field;
 import com.rusefi.config.generated.Fields;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.io.IoStream;
 import com.rusefi.io.LinkConnector;
 import com.rusefi.io.LinkManager;
@@ -15,7 +16,7 @@ import com.rusefi.proxy.NetworkConnector;
 import com.rusefi.server.ControllerInfo;
 import com.rusefi.server.SessionDetails;
 import com.rusefi.server.rusEFISSLContext;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import com.rusefi.tune.xml.Constant;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java
index b1c868bee8..c920695e59 100644
--- a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java
+++ b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java
@@ -11,7 +11,7 @@ import java.nio.ByteBuffer;
 
 import static com.rusefi.config.generated.Fields.TS_FILE_VERSION;
 import static com.rusefi.config.generated.Fields.engine_type_e_MRE_MIATA_NB2_MAP;
-import static com.rusefi.shared.FileUtil.littleEndianWrap;
+import static com.rusefi.core.FileUtil.littleEndianWrap;
 import static junit.framework.Assert.*;
 
 public class JniUnitTest {
diff --git a/java_console/models/src/main/java/com/rusefi/core/ISensorHolder.java b/java_console/models/src/main/java/com/rusefi/core/ISensorHolder.java
index 3b21eb2541..0df2c87d99 100644
--- a/java_console/models/src/main/java/com/rusefi/core/ISensorHolder.java
+++ b/java_console/models/src/main/java/com/rusefi/core/ISensorHolder.java
@@ -2,7 +2,7 @@ package com.rusefi.core;
 
 import java.nio.ByteBuffer;
 
-import static com.rusefi.shared.FileUtil.littleEndianWrap;
+import static com.rusefi.core.FileUtil.littleEndianWrap;
 
 public interface ISensorHolder {
     default void grabSensorValues(byte[] response) {
diff --git a/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java b/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java
index f01eb976de..c52b7e45b5 100644
--- a/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java
+++ b/java_console/models/src/main/java/com/rusefi/stream/TSHighSpeedLog.java
@@ -1,7 +1,7 @@
 package com.rusefi.stream;
 
 import com.rusefi.composite.CompositeEvent;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 
 import java.io.*;
 import java.util.List;
diff --git a/java_console/shared_io/build.gradle b/java_console/shared_io/build.gradle
index c5fc4ba0d4..bfda3b8ed0 100644
--- a/java_console/shared_io/build.gradle
+++ b/java_console/shared_io/build.gradle
@@ -1,3 +1,6 @@
 plugins {
     id 'java'
-}
\ No newline at end of file
+}
+
+// TODO: rename folder to core_io
+// this CORE module cannot depend on model/ini!
\ No newline at end of file
diff --git a/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java b/java_console/shared_io/src/main/java/com/rusefi/core/FileUtil.java
similarity index 99%
rename from java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/FileUtil.java
index 91a25f4e1e..6b84ad957e 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/FileUtil.java
@@ -1,4 +1,4 @@
-package com.rusefi.shared;
+package com.rusefi.core;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java_console/shared_io/src/main/java/com/rusefi/RusEfiSignature.java b/java_console/shared_io/src/main/java/com/rusefi/core/RusEfiSignature.java
similarity index 96%
rename from java_console/shared_io/src/main/java/com/rusefi/RusEfiSignature.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/RusEfiSignature.java
index d23e4c5181..d158d6d2ab 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/RusEfiSignature.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/RusEfiSignature.java
@@ -1,4 +1,4 @@
-package com.rusefi;
+package com.rusefi.core;
 
 public class RusEfiSignature {
     private final String year;
diff --git a/java_console/shared_io/src/main/java/com/rusefi/SignatureHelper.java b/java_console/shared_io/src/main/java/com/rusefi/core/SignatureHelper.java
similarity index 95%
rename from java_console/shared_io/src/main/java/com/rusefi/SignatureHelper.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/SignatureHelper.java
index cfd973740a..43f0e61a58 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/SignatureHelper.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/SignatureHelper.java
@@ -1,6 +1,4 @@
-package com.rusefi;
-
-import com.rusefi.core.Pair;
+package com.rusefi.core;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -8,7 +6,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
 
-import static com.rusefi.shared.FileUtil.RUSEFI_SETTINGS_FOLDER;
+import static com.rusefi.core.FileUtil.RUSEFI_SETTINGS_FOLDER;
 
 public class SignatureHelper {
     private final static String LOCAL_INI = RUSEFI_SETTINGS_FOLDER + File.separator + "ini_database";
diff --git a/java_console/shared_io/src/main/java/com/rusefi/autoupdate/BundleUtil.java b/java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java
similarity index 97%
rename from java_console/shared_io/src/main/java/com/rusefi/autoupdate/BundleUtil.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java
index 8d91b6d248..b3b1d09925 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/autoupdate/BundleUtil.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/io/BundleUtil.java
@@ -1,4 +1,4 @@
-package com.rusefi.autoupdate;
+package com.rusefi.core.io;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/java_console/shared_io/src/main/java/com/rusefi/shared/ConnectionAndMeta.java b/java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java
similarity index 99%
rename from java_console/shared_io/src/main/java/com/rusefi/shared/ConnectionAndMeta.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java
index 5e5afc4723..af24d0c4d4 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/shared/ConnectionAndMeta.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java
@@ -1,4 +1,4 @@
-package com.rusefi.shared;
+package com.rusefi.core.net;
 
 import javax.net.ssl.*;
 import java.io.*;
diff --git a/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/Node.java b/java_console/shared_io/src/main/java/com/rusefi/core/preferences/storage/Node.java
similarity index 98%
rename from java_console/shared_io/src/main/java/com/rusefi/preferences/storage/Node.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/preferences/storage/Node.java
index 3e14f0254b..48e30bdf04 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/Node.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/preferences/storage/Node.java
@@ -1,4 +1,4 @@
-package com.rusefi.preferences.storage;
+package com.rusefi.core.preferences.storage;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/PersistentConfiguration.java b/java_console/shared_io/src/main/java/com/rusefi/core/preferences/storage/PersistentConfiguration.java
similarity index 97%
rename from java_console/shared_io/src/main/java/com/rusefi/preferences/storage/PersistentConfiguration.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/preferences/storage/PersistentConfiguration.java
index 770b6a2c69..4c65e2e887 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/PersistentConfiguration.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/preferences/storage/PersistentConfiguration.java
@@ -1,6 +1,6 @@
-package com.rusefi.preferences.storage;
+package com.rusefi.core.preferences.storage;
 
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
diff --git a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
similarity index 98%
rename from java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
rename to java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
index 98704c50b1..15f62c4001 100644
--- a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
+++ b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
@@ -1,4 +1,4 @@
-package com.rusefi;
+package com.rusefi.core;
 
 import java.io.File;
 import java.net.URISyntaxException;
diff --git a/java_console/shared_ui/build.gradle b/java_console/shared_ui/build.gradle
index fdb84654aa..91701193f4 100644
--- a/java_console/shared_ui/build.gradle
+++ b/java_console/shared_ui/build.gradle
@@ -5,6 +5,7 @@ plugins {
 apply from: '../../android/dependencies.gradle'
 
 dependencies {
+    api project(':core_ui')
     api project(':ecu_io')
     api project(':models')
     api ts_plugin_libs.httpclient
diff --git a/java_console/shared_ui/src/main/java/com/rusefi/tools/online/Online.java b/java_console/shared_ui/src/main/java/com/rusefi/tools/online/Online.java
index f136976a68..9bd32c94a9 100644
--- a/java_console/shared_ui/src/main/java/com/rusefi/tools/online/Online.java
+++ b/java_console/shared_ui/src/main/java/com/rusefi/tools/online/Online.java
@@ -1,7 +1,7 @@
 package com.rusefi.tools.online;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import com.rusefi.tune.xml.Msq;
 import com.rusefi.ui.AuthTokenPanel;
 import org.apache.http.HttpResponse;
diff --git a/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java b/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java
index 87984c16c0..d938edcb14 100644
--- a/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java
+++ b/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java
@@ -2,7 +2,7 @@ package com.rusefi.ui;
 
 import com.devexperts.logging.Logging;
 import com.rusefi.auth.AuthTokenUtil;
-import com.rusefi.preferences.storage.PersistentConfiguration;
+import com.rusefi.core.preferences.storage.PersistentConfiguration;
 import com.rusefi.ui.util.URLLabel;
 import org.jetbrains.annotations.NotNull;
 
@@ -14,7 +14,7 @@ import java.awt.datatransfer.*;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
 
-import static com.rusefi.preferences.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 public class AuthTokenPanel {
     private final static Logging log = Logging.getLogging(AuthTokenPanel.class);
diff --git a/java_console/ui/build.gradle b/java_console/ui/build.gradle
new file mode 100644
index 0000000000..617fc561cf
--- /dev/null
+++ b/java_console/ui/build.gradle
@@ -0,0 +1,13 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+    implementation project(':shared_ui')
+    implementation global_libs.antlr
+    implementation 'com.miglayout:miglayout-swing:4.1'
+}
+
+//compileJava {
+//    dependsOn(':config_definition:generateGrammarSource')
+//}
diff --git a/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java b/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java
index d3aa51856b..faa502c46d 100644
--- a/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java
+++ b/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java
@@ -2,9 +2,9 @@ package com.rusefi;
 
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.config.generated.Fields;
+import com.rusefi.core.preferences.storage.PersistentConfiguration;
 import com.rusefi.ui.MessagesView;
 import com.rusefi.ui.UIContext;
-import com.rusefi.ui.storage.PersistentConfiguration;
 import com.rusefi.ui.util.UiUtils;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java_console/ui/src/main/java/com/rusefi/CommandControl.java b/java_console/ui/src/main/java/com/rusefi/CommandControl.java
index d40d929922..af07a2a014 100644
--- a/java_console/ui/src/main/java/com/rusefi/CommandControl.java
+++ b/java_console/ui/src/main/java/com/rusefi/CommandControl.java
@@ -1,6 +1,6 @@
 package com.rusefi;
 
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.ui.UIContext;
 import com.rusefi.ui.util.UiUtils;
 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 a6ed7535e4..fbdbcdcd93 100644
--- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
+++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
@@ -2,7 +2,6 @@ package com.rusefi;
 
 import com.devexperts.logging.Logging;
 import com.rusefi.autodetect.PortDetector;
-import com.rusefi.autoupdate.AutoupdateUtil;
 import com.rusefi.binaryprotocol.BinaryProtocolLogger;
 import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.LinkManager;
@@ -29,8 +28,9 @@ import java.util.Map;
 
 import static com.devexperts.logging.Logging.getLogging;
 import static com.rusefi.StartupFrame.setFrameIcon;
-import static com.rusefi.rusEFIVersion.CONSOLE_VERSION;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.rusEFIVersion.CONSOLE_VERSION;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 /**
  * @see StartupFrame
diff --git a/java_console/ui/src/main/java/com/rusefi/Launcher.java b/java_console/ui/src/main/java/com/rusefi/Launcher.java
index 9d3c298577..eb1c7ea77b 100644
--- a/java_console/ui/src/main/java/com/rusefi/Launcher.java
+++ b/java_console/ui/src/main/java/com/rusefi/Launcher.java
@@ -1,6 +1,7 @@
 package com.rusefi;
 
 import com.devexperts.logging.Logging;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.tools.ConsoleTools;
 import com.rusefi.ui.engine.EngineSnifferPanel;
 import com.rusefi.ui.storage.PersistentConfiguration;
diff --git a/java_console/ui/src/main/java/com/rusefi/PaneSettings.java b/java_console/ui/src/main/java/com/rusefi/PaneSettings.java
index 9c226dfeef..fd1a9cf126 100644
--- a/java_console/ui/src/main/java/com/rusefi/PaneSettings.java
+++ b/java_console/ui/src/main/java/com/rusefi/PaneSettings.java
@@ -1,6 +1,6 @@
 package com.rusefi;
 
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 
 public class PaneSettings {
     private static final String SHOW_ETB = "show_etb_pane";
diff --git a/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java b/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java
index 5e2b72e94a..5a29ed69a5 100644
--- a/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java
+++ b/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java
@@ -8,7 +8,7 @@ import com.rusefi.ui.UIContext;
 import com.rusefi.ui.config.ConfigField;
 import com.rusefi.ui.config.EnumConfigField;
 import com.rusefi.ui.engine.EngineSnifferPanel;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.URLLabel;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.widgets.AnyCommand;
diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
index c147b4ae44..5e5e25a13e 100644
--- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
+++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
@@ -3,8 +3,8 @@ package com.rusefi;
 import com.devexperts.logging.Logging;
 import com.rusefi.autodetect.PortDetector;
 import com.rusefi.autodetect.SerialAutoChecker;
-import com.rusefi.autoupdate.Autoupdate;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.io.BundleUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.io.LinkManager;
 import com.rusefi.io.serial.BaudRateHolder;
 import com.rusefi.maintenance.DriverInstall;
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.devexperts.logging.Logging.getLogging;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 import static com.rusefi.ui.util.UiUtils.*;
 import static javax.swing.JOptionPane.YES_NO_OPTION;
 
@@ -94,7 +94,7 @@ public class StartupFrame {
 
     @NotNull
     public static String appendBundleName(String title) {
-        String bundleName = Autoupdate.readBundleFullNameNotNull();
+        String bundleName = BundleUtil.readBundleFullNameNotNull();
         return title + " " + bundleName;
     }
 
@@ -191,7 +191,7 @@ public class StartupFrame {
 
         JPanel rightPanel = new JPanel(new VerticalFlowLayout());
 
-        if (Autoupdate.readBundleFullNameNotNull().contains("proteus_f7")) {
+        if (BundleUtil.readBundleFullNameNotNull().contains("proteus_f7")) {
             String text = "WARNING: Proteus F7";
             URLLabel urlLabel = new URLLabel(text, "https://github.com/rusefi/rusefi/wiki/F7-requires-full-erase");
             Color originalColor = urlLabel.getForeground();
@@ -257,7 +257,7 @@ public class StartupFrame {
 
     @Nullable
     private static ImageIcon getBundleIcon() {
-        String bundle = Autoupdate.readBundleFullNameNotNull();
+        String bundle = BundleUtil.readBundleFullNameNotNull();
         String logoName;
         // these should be about 213px wide
         if (bundle.contains("proteus")) {
diff --git a/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java b/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java
index cf5bd2ef80..8cbf96ee89 100644
--- a/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java
+++ b/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java
@@ -1,14 +1,12 @@
 package com.rusefi.autodetect;
 
-import com.rusefi.IoUtil;
-
 public class PortDetectorSandbox {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         while (true) {
             String port = PortDetector.autoDetectSerial(null).getSerialPort();
             System.out.println("Detected " + port);
 
-            IoUtil.sleepSeconds(1);
+            Thread.sleep(1000);
         }
     }
 }
diff --git a/java_console/ui/src/main/java/com/rusefi/autodetect/ReconnectSandbox.java b/java_console/ui/src/main/java/com/rusefi/autodetect/ReconnectSandbox.java
index 0728090650..3fd2af6ccd 100644
--- a/java_console/ui/src/main/java/com/rusefi/autodetect/ReconnectSandbox.java
+++ b/java_console/ui/src/main/java/com/rusefi/autodetect/ReconnectSandbox.java
@@ -1,6 +1,5 @@
 package com.rusefi.autodetect;
 
-import com.rusefi.IoUtil;
 import com.rusefi.io.ConnectionStatusLogic;
 import com.rusefi.io.LinkManager;
 import com.rusefi.ui.light.LightweightGUI;
@@ -8,7 +7,7 @@ import com.rusefi.ui.light.LightweightGUI;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class ReconnectSandbox {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
 
         LinkManager linkManager = new LinkManager();
 
@@ -20,7 +19,7 @@ public class ReconnectSandbox {
 
         while (true) {
             System.out.println("Hello " + status);
-            IoUtil.sleepSeconds(1);
+            Thread.sleep(1000);
         }
     }
 
diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java b/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java
index d56dd02d72..cf98e5a839 100644
--- a/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java
+++ b/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java
@@ -1,6 +1,6 @@
 package com.rusefi.maintenance;
 
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.ui.StatusWindow;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/FirmwareFlasher.java
index 622bfd3238..20b976da86 100644
--- a/java_console/ui/src/main/java/com/rusefi/maintenance/FirmwareFlasher.java
+++ b/java_console/ui/src/main/java/com/rusefi/maintenance/FirmwareFlasher.java
@@ -8,7 +8,7 @@ import javax.swing.*;
 import java.io.File;
 
 import static com.rusefi.Launcher.INPUT_FILES_PATH;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 /**
  * @see DfuFlasher
diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
index b408cd7f01..743cd5f8bd 100644
--- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
+++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
@@ -3,7 +3,7 @@ package com.rusefi.maintenance;
 import com.rusefi.Launcher;
 import com.rusefi.SerialPortScanner;
 import com.rusefi.autodetect.PortDetector;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.ui.StatusWindow;
 import com.rusefi.ui.util.URLLabel;
 import com.rusefi.ui.util.UiUtils;
@@ -18,7 +18,7 @@ import java.util.Arrays;
 import java.util.Objects;
 
 import static com.rusefi.StartupFrame.appendBundleName;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 import static com.rusefi.ui.util.UiUtils.trueLayout;
 
 public class ProgramSelector {
diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/VersionChecker.java b/java_console/ui/src/main/java/com/rusefi/maintenance/VersionChecker.java
index afab5f3a42..31a9b86011 100644
--- a/java_console/ui/src/main/java/com/rusefi/maintenance/VersionChecker.java
+++ b/java_console/ui/src/main/java/com/rusefi/maintenance/VersionChecker.java
@@ -18,7 +18,7 @@ import java.util.Map;
 
 import static com.devexperts.logging.Logging.getLogging;
 import static com.rusefi.Launcher.*;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 /**
  * This class checks the recommended versions numbers and compares them with current versions
diff --git a/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java b/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java
index f890b17dc0..2e509af9fb 100644
--- a/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java
+++ b/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLog.java
@@ -3,7 +3,7 @@ package com.rusefi.sensor_logs;
 import com.opensr5.Logger;
 import com.rusefi.FileLog;
 import com.rusefi.config.generated.Fields;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 
 import java.io.*;
 import java.util.*;
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
index 970c54074d..3f9417b115 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
@@ -14,6 +14,7 @@ import com.rusefi.config.generated.Fields;
 import com.rusefi.core.EngineState;
 import com.rusefi.core.Pair;
 import com.rusefi.core.ResponseBuffer;
+import com.rusefi.core.SignatureHelper;
 import com.rusefi.io.ConnectionStateListener;
 import com.rusefi.io.ConnectionStatusLogic;
 import com.rusefi.io.IoStream;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/GaugesGridElement.java b/java_console/ui/src/main/java/com/rusefi/ui/GaugesGridElement.java
index 2c5ba8ed96..6e3b5ab793 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/GaugesGridElement.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/GaugesGridElement.java
@@ -1,7 +1,7 @@
 package com.rusefi.ui;
 
 import com.rusefi.core.Sensor;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.widgets.JPanelWithListener;
 import com.rusefi.ui.widgets.SensorGauge;
 
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/GaugesPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/GaugesPanel.java
index 39ebe88022..d3c265f172 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/GaugesPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/GaugesPanel.java
@@ -2,7 +2,7 @@ package com.rusefi.ui;
 
 import com.rusefi.FileLog;
 import com.rusefi.core.Sensor;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.widgets.AnyCommand;
 import com.rusefi.ui.widgets.DetachedSensor;
@@ -17,7 +17,8 @@ import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
+
 
 /**
  * Date: 2/5/13
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/LogSizeControl.java b/java_console/ui/src/main/java/com/rusefi/ui/LogSizeControl.java
index bb61cdc841..54ddf8d3ac 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/LogSizeControl.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/LogSizeControl.java
@@ -1,6 +1,6 @@
 package com.rusefi.ui;
 
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/MessagesPane.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesPane.java
index 98426178ae..0684eb60f2 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/MessagesPane.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/MessagesPane.java
@@ -1,15 +1,13 @@
 package com.rusefi.ui;
 
-import com.rusefi.ConsoleUI;
 import com.rusefi.ui.engine.EngineSnifferPanel;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.URLLabel;
 import com.rusefi.ui.widgets.AnyCommand;
 import com.rusefi.ui.widgets.IdleLabel;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 /**
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/MessagesPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesPanel.java
index 08e9841426..d84aa91cc5 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/MessagesPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/MessagesPanel.java
@@ -1,6 +1,6 @@
 package com.rusefi.ui;
 
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.widgets.AnyCommand;
 
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java
index 58896e813c..b6728819e3 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java
@@ -4,7 +4,7 @@ import com.rusefi.FileLog;
 import com.rusefi.core.EngineState;
 import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.CommandQueue;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java
index 96809ed4ef..c18af2de8a 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java
@@ -2,7 +2,7 @@ package com.rusefi.ui;
 
 import com.devexperts.logging.Logging;
 import com.rusefi.AverageAnglesUtil;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.CommandQueue;
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import static com.rusefi.IoUtil.*;
 import static com.rusefi.config.generated.Fields.CMD_DATE;
 import static com.rusefi.config.generated.Fields.CMD_TRIGGERINFO;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 /**
  * This UI element displays an array of buttons, each for one of the recently used commands
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java b/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java
index 55a472ee19..1cd703cf07 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java
@@ -4,7 +4,7 @@ import com.rusefi.NamedThreadFactory;
 import com.rusefi.core.Sensor;
 import com.rusefi.core.SensorCategory;
 import com.rusefi.core.SensorCentral;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 import org.jetbrains.annotations.NotNull;
 
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 5e1d9f4a7f..91282bdff4 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
@@ -2,7 +2,7 @@ package com.rusefi.ui;
 
 import com.devexperts.logging.Logging;
 import com.rusefi.autoupdate.Autoupdate;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.ui.util.FrameHelper;
 import com.rusefi.ui.util.UiUtils;
 import org.jetbrains.annotations.NotNull;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java
index aa7ababfe1..7ddda19614 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java
@@ -3,7 +3,7 @@ package com.rusefi.ui;
 import com.rusefi.FileLog;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.core.MessagesCentral;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 
 import javax.swing.*;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
index e5199705f8..dbf7c6ad21 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
@@ -8,7 +8,7 @@ import com.rusefi.core.EngineState;
 import com.rusefi.io.*;
 import com.rusefi.io.tcp.BinaryProtocolServer;
 import com.rusefi.maintenance.VersionChecker;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.FrameHelper;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.util.IoUtils;
@@ -19,7 +19,7 @@ import java.util.Objects;
 import java.util.TimeZone;
 
 import static com.devexperts.logging.Logging.getLogging;
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 public class MainFrame {
     private static final Logging log = getLogging(Launcher.class);
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java
index 6371b01228..422f793211 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java
@@ -10,7 +10,7 @@ import com.rusefi.ui.UIContext;
 import javax.swing.*;
 import java.awt.*;
 
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 public class TabbedPanel {
     // todo: the logic around 'criticalError' could be implemented nicer
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
index da2fd7ffaf..c22bb22d03 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
@@ -9,7 +9,7 @@ import com.rusefi.core.SensorCentral;
 import com.rusefi.ui.*;
 import com.rusefi.ui.config.BitConfigField;
 import com.rusefi.ui.config.ConfigField;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.URLLabel;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.widgets.AnyCommand;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java
index b8d5a0b7ee..b74d250372 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java
@@ -6,7 +6,7 @@ import com.rusefi.ui.UIContext;
 import com.rusefi.ui.config.BitConfigField;
 import com.rusefi.ui.config.ConfigField;
 import com.rusefi.ui.config.EnumConfigField;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.widgets.AnyCommand;
 import com.rusefi.ui.widgets.DetachedSensor;
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 343c52df73..204503914b 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
@@ -6,6 +6,7 @@ import com.rusefi.autodetect.PortDetector;
 import com.rusefi.autoupdate.Autoupdate;
 import com.rusefi.core.Sensor;
 import com.rusefi.core.SensorCentral;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.io.ConnectionStateListener;
 import com.rusefi.io.ConnectionStatusLogic;
 import com.rusefi.io.ConnectionWatchdog;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java
index 55f0469f81..0885186a19 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java
@@ -7,7 +7,7 @@ import com.rusefi.io.ConnectionStatusLogic;
 import com.rusefi.io.LinkManager;
 import com.rusefi.ui.MessagesPanel;
 import com.rusefi.ui.UIContext;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.URLLabel;
 import com.rusefi.ui.widgets.AnyCommand;
 import neoe.formatter.lua.LuaFormatter;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java b/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java
index acf2eabafc..ef7f19e8f9 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java
@@ -1,6 +1,6 @@
 package com.rusefi.ui.util;
 
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.imageio.ImageIO;
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 7b05650d78..a9df094edb 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,12 +3,11 @@ 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;
 import com.rusefi.ui.UIContext;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.JTextFieldWithWidth;
 
 import javax.swing.*;
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java
index ab2ebce2c0..8d5c0866eb 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java
@@ -6,7 +6,7 @@ import com.rusefi.io.IMethodInvocation;
 import com.rusefi.io.InvocationConfirmationListener;
 import com.rusefi.io.LinkManager;
 import com.rusefi.ui.UIContext;
-import com.rusefi.ui.storage.Node;
+import com.rusefi.core.preferences.storage.Node;
 import com.rusefi.ui.util.UiUtils;
 
 import javax.swing.*;
diff --git a/java_console/ui/src/test/java/com/rusefi/FullServerTest.java b/java_console/ui/src/test/java/com/rusefi/FullServerTest.java
index 91bebe90a4..467a867e5d 100644
--- a/java_console/ui/src/test/java/com/rusefi/FullServerTest.java
+++ b/java_console/ui/src/test/java/com/rusefi/FullServerTest.java
@@ -5,6 +5,7 @@ import com.opensr5.ConfigurationImage;
 import com.opensr5.ini.field.ScalarIniField;
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.config.generated.Fields;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.io.ConnectionStateListener;
 import com.rusefi.io.LinkManager;
 import com.rusefi.io.tcp.BinaryProtocolServer;
diff --git a/java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java b/java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
index e48f9e47e9..2b23b73960 100644
--- a/java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
+++ b/java_console/ui/src/test/java/com/rusefi/proxy/client/LocalApplicationProxyTest.java
@@ -33,7 +33,7 @@ import static com.rusefi.binaryprotocol.BinaryProtocol.sleep;
 import static com.rusefi.config.generated.Fields.TS_PROTOCOL;
 import static com.rusefi.io.tcp.BinaryProtocolServer.getPacketLength;
 import static com.rusefi.io.tcp.TcpConnector.LOCALHOST;
-import static com.rusefi.shared.FileUtil.close;
+import static com.rusefi.core.FileUtil.close;
 import static org.junit.Assert.*;
 
 public class LocalApplicationProxyTest {
diff --git a/java_console/ui/src/test/java/com/rusefi/ui/test/WavePanelSandbox.java b/java_console/ui/src/test/java/com/rusefi/ui/test/WavePanelSandbox.java
index 6ccf5047eb..a229481b3a 100644
--- a/java_console/ui/src/test/java/com/rusefi/ui/test/WavePanelSandbox.java
+++ b/java_console/ui/src/test/java/com/rusefi/ui/test/WavePanelSandbox.java
@@ -1,9 +1,9 @@
 package com.rusefi.ui.test;
 
 import com.rusefi.config.generated.Fields;
+import com.rusefi.core.preferences.storage.PersistentConfiguration;
 import com.rusefi.ui.util.FrameHelper;
 import com.rusefi.ui.engine.EngineSnifferPanel;
-import com.rusefi.ui.storage.PersistentConfiguration;
 import com.rusefi.waves.EngineChartParser;
 
 import javax.swing.*;
diff --git a/java_tools/configuration_definition/build.gradle b/java_tools/configuration_definition/build.gradle
index d021a6229b..2f55b823b0 100644
--- a/java_tools/configuration_definition/build.gradle
+++ b/java_tools/configuration_definition/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'antlr'
 }
 
-apply from: '../../android/dependencies.gradle'
+apply from: '../../java_tools/dependencies.gradle'
 
 defaultTasks 'shadowJar'
 
@@ -12,7 +12,7 @@ dependencies {
     implementation project(':logging')
     implementation project(':models')
     implementation project(':enum_to_string')
-    antlr libs.antlr
+    antlr global_libs.antlr
 }
 
 shadowJar {
@@ -34,9 +34,9 @@ shadowJar {
      and loggin-api as in build.xml
     */
     dependencies {
-        exclude(dependency(libs.jsr305))
-        exclude(dependency(libs.junit))
-        exclude(dependency(libs.annotations))
+        exclude(dependency(global_libs.jsr305))
+        exclude(dependency(global_libs.junit))
+        exclude(dependency(global_libs.annotations))
         exclude(dependency('com.ibm.icu:icu4j:.*'))
     }
 }
\ No newline at end of file
diff --git a/java_tools/dependencies.gradle b/java_tools/dependencies.gradle
index 4c9e42052d..61571a0ff9 100644
--- a/java_tools/dependencies.gradle
+++ b/java_tools/dependencies.gradle
@@ -3,6 +3,7 @@ ext {
           junit          : "junit:junit:4.13",
           annotations    : "org.jetbrains:annotations:16.0.1",
           jsr305         : "com.google.code.findbugs:jsr305:3.0.2",
+          antlr          : "org.antlr:antlr4:4.9.3", // use ANTLR version 4
   ]
 
 }
\ No newline at end of file
diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java
index 8b7a8c539c..944a063e16 100644
--- a/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java
+++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java
@@ -12,7 +12,7 @@ import com.rusefi.io.tcp.BinaryProtocolProxy;
 import com.rusefi.io.tcp.BinaryProtocolServer;
 import com.rusefi.io.tcp.ServerSocketReference;
 import com.rusefi.io.tcp.TcpIoStream;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import com.rusefi.tools.online.ProxyClient;
 import net.jcip.annotations.GuardedBy;
 import org.jetbrains.annotations.NotNull;
diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
index fd8769542b..7c8afa9945 100644
--- a/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
+++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/ControllerConnectionState.java
@@ -2,7 +2,7 @@ package com.rusefi.server;
 
 import com.devexperts.logging.Logging;
 import com.opensr5.ini.IniFileModel;
-import com.rusefi.SignatureHelper;
+import com.rusefi.core.SignatureHelper;
 import com.rusefi.auth.AuthTokenUtil;
 import com.rusefi.binaryprotocol.IncomingDataBuffer;
 import com.rusefi.config.generated.Fields;
@@ -12,7 +12,7 @@ import com.rusefi.io.IoStream;
 import com.rusefi.io.commands.GetOutputsCommand;
 import com.rusefi.io.commands.HelloCommand;
 import com.rusefi.io.tcp.TcpIoStream;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/Monitoring.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/Monitoring.java
index f3bebc1b05..12d7ecd932 100644
--- a/java_tools/proxy_server/src/main/java/com/rusefi/server/Monitoring.java
+++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/Monitoring.java
@@ -1,7 +1,7 @@
 package com.rusefi.server;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.tools.online.ProxyClient;
 import org.takes.Take;
 import org.takes.facets.fork.FkRegex;
diff --git a/java_tools/settings.gradle b/java_tools/settings.gradle
index 3e9147c988..ea555b4353 100644
--- a/java_tools/settings.gradle
+++ b/java_tools/settings.gradle
@@ -1,5 +1,9 @@
 //todo include ':proxy_server'
 //todo project(':proxy_server').projectDir = new File('proxy_server')
+include ':core_io'
+project(':core_io').projectDir = new File('../java_console/shared_io')
+include ':core_ui'
+project(':core_ui').projectDir = new File('../java_console/core_ui')
 include ':logging-api'
 project(':logging-api').projectDir = new File('../java_console/logging-api')
 include ':gcc_map_reader'
@@ -20,8 +24,6 @@ include ':ts_plugin'
 project(':ts_plugin').projectDir = new File('ts_plugin')
 include ':autoupdate'
 project(':autoupdate').projectDir = new File('../java_console/autoupdate')
-include ':shared_io'
-project(':shared_io').projectDir = new File('../java_console/shared_io')
 include ':shared_ui'
 project(':shared_ui').projectDir = new File('../java_console/shared_ui')
 include ':ecu_io'
@@ -34,4 +36,7 @@ include ':inifile'
 project(':inifile').projectDir = new File('../java_console/inifile')
 include ':models'
 project(':models').projectDir = new File('../java_console/models')
-
+include ':autotest'
+project(':autotest').projectDir = new File('../java_console/autotest')
+include ':ui'
+project(':ui').projectDir = new File('../java_console/ui')
diff --git a/java_tools/ts_plugin/build.gradle b/java_tools/ts_plugin/build.gradle
index 89cf0a0037..e63093a54f 100644
--- a/java_tools/ts_plugin/build.gradle
+++ b/java_tools/ts_plugin/build.gradle
@@ -6,11 +6,10 @@ plugins {
 apply from: '../../android/dependencies.gradle'
 
 dependencies {
+    api project(':core_ui')
     api project(':ecu_io')
-    api project(':shared_ui')
     api project(':inifile')
     api project(':ts_plugin_launcher')
-    api project(':ts_plugin_launcher')
     testImplementation libs.mockito
     testImplementation testFixtures( project(':ecu_io'))
     implementation files('../ts_plugin_launcher/lib/TunerStudioPluginAPI.jar')
diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/BroadcastTab.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/BroadcastTab.java
index 8ba233475e..cc6ce47260 100644
--- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/BroadcastTab.java
+++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/BroadcastTab.java
@@ -2,7 +2,7 @@ package com.rusefi.ts_plugin;
 
 import com.rusefi.auth.AuthTokenUtil;
 import com.rusefi.autodetect.PortDetector;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.proxy.NetworkConnector;
 import com.rusefi.proxy.NetworkConnectorContext;
 import com.rusefi.tools.VehicleToken;
diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java
index 5c147a140b..6a893f459f 100644
--- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java
+++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/LogUploadSelector.java
@@ -2,7 +2,7 @@ package com.rusefi.ts_plugin;
 
 import com.efiAnalytics.plugin.ecu.ControllerAccess;
 import com.rusefi.TsTuneReader;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.tools.online.Online;
 import com.rusefi.tools.online.UploadResult;
 import org.apache.http.concurrent.FutureCallback;
diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/PluginEntry.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/PluginEntry.java
index 97a6857f48..f192e9911e 100644
--- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/PluginEntry.java
+++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/PluginEntry.java
@@ -1,7 +1,7 @@
 package com.rusefi.ts_plugin;
 
 import com.efiAnalytics.plugin.ecu.ControllerAccess;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.ts_plugin.auth.InstanceAuthContext;
 import com.rusefi.ts_plugin.util.ManifestHelper;
 import com.rusefi.tune.xml.Constant;
diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java
index 7f09eed06c..be641a28c9 100644
--- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java
+++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java
@@ -1,9 +1,9 @@
 package com.rusefi.ts_plugin;
 
 import com.rusefi.NamedThreadFactory;
-import com.rusefi.SignatureHelper;
+import com.rusefi.core.SignatureHelper;
 import com.rusefi.Timeouts;
-import com.rusefi.autoupdate.AutoupdateUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
 import com.rusefi.core.Pair;
 import com.rusefi.io.serial.StreamStatistics;
 import com.rusefi.io.tcp.ServerSocketReference;
@@ -12,7 +12,7 @@ import com.rusefi.proxy.NetworkConnector;
 import com.rusefi.proxy.client.LocalApplicationProxy;
 import com.rusefi.proxy.client.LocalApplicationProxyContextImpl;
 import com.rusefi.proxy.client.UpdateType;
-import com.rusefi.rusEFIVersion;
+import com.rusefi.core.rusEFIVersion;
 import com.rusefi.server.ApplicationRequest;
 import com.rusefi.server.ControllerInfo;
 import com.rusefi.server.SessionDetails;
@@ -37,7 +37,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.rusefi.preferences.storage.PersistentConfiguration.getConfig;
+import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
 
 /**
  * remote ECU access & control
diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java
index fdfb497baf..d806d6042d 100644
--- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java
+++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadQueue.java
@@ -2,7 +2,7 @@ package com.rusefi.ts_plugin;
 
 import com.devexperts.logging.Logging;
 import com.efiAnalytics.plugin.ecu.ControllerAccess;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.FileUtil;
 import com.rusefi.tools.online.Online;
 import com.rusefi.tools.online.UploadResult;
 import com.rusefi.tune.xml.Msq;
diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java
index bdc8e951f9..a9550cc9ee 100644
--- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java
+++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java
@@ -1,7 +1,7 @@
 package com.rusefi.ts_plugin;
 
 import com.rusefi.tools.online.UploadResult;
-import com.rusefi.preferences.storage.PersistentConfiguration;
+import com.rusefi.core.preferences.storage.PersistentConfiguration;
 import org.putgemin.VerticalFlowLayout;
 
 import javax.swing.*;
diff --git a/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java b/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java
index a09477900e..977b8ab5c9 100644
--- a/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java
+++ b/java_tools/ts_plugin/src/test/java/com/rusefi/SignatureHelperTest.java
@@ -1,5 +1,6 @@
 package com.rusefi;
 
+import com.rusefi.core.SignatureHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java
index 8b3d977cb4..ae8360d3d9 100644
--- a/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java
+++ b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java
@@ -1,8 +1,8 @@
 package com.rusefi.ts_plugin;
 
-import com.rusefi.autoupdate.AutoupdateUtil;
-import com.rusefi.shared.ConnectionAndMeta;
-import com.rusefi.shared.FileUtil;
+import com.rusefi.core.ui.AutoupdateUtil;
+import com.rusefi.core.net.ConnectionAndMeta;
+import com.rusefi.core.FileUtil;
 import org.jetbrains.annotations.Nullable;
 import org.putgemin.VerticalFlowLayout;