diff --git a/java_console/build.xml b/java_console/build.xml
index 8b5e05430e..dccf2c3a3c 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -44,7 +44,8 @@
             <src path="autoupdate/src"/>
             <src path="../java_tools/configuration_definition/src"/>
             <src path="../java_tools/enum_to_string/src"/>
-            <src path="io/src/main/src"/>
+            <src path="io/src/main/java"/>
+            <src path="io/src/test/java"/>
             <src path="models/src"/>
             <src path="inifile/src"/>
             <src path="shared_ui/src"/>
@@ -78,7 +79,7 @@
             <batchtest todir="build">
                 <fileset dir="autotest/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="autoupdate/src" includes="**/test/**/*Test.java"/>
-                <fileset dir="io/src" includes="**/test/**/*Test.java"/>
+                <fileset dir="io/src/test/java" includes="**/test/**/*Test.java"/>
                 <fileset dir="models/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="ui/src/test/java" includes="**/*Test.java"/>
                 <fileset dir="romraider/src" includes="**/test/**/*Test.java"/>
diff --git a/java_console/io/io.iml b/java_console/io/io.iml
index ae2b251806..35fd5e5a7b 100644
--- a/java_console/io/io.iml
+++ b/java_console/io/io.iml
@@ -3,7 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/java_console/io/src/main/com/rusefi/ConfigurationImageDiff.java b/java_console/io/src/main/java/com/rusefi/ConfigurationImageDiff.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ConfigurationImageDiff.java
rename to java_console/io/src/main/java/com/rusefi/ConfigurationImageDiff.java
diff --git a/java_console/io/src/main/com/rusefi/NamedThreadFactory.java b/java_console/io/src/main/java/com/rusefi/NamedThreadFactory.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/NamedThreadFactory.java
rename to java_console/io/src/main/java/com/rusefi/NamedThreadFactory.java
diff --git a/java_console/io/src/main/com/rusefi/Timeouts.java b/java_console/io/src/main/java/com/rusefi/Timeouts.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/Timeouts.java
rename to java_console/io/src/main/java/com/rusefi/Timeouts.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/BinaryProtocol.java
rename to java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/BinaryProtocolCommands.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolCommands.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/BinaryProtocolCommands.java
rename to java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolCommands.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/BinaryProtocolState.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolState.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/BinaryProtocolState.java
rename to java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolState.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/IncomingDataBuffer.java
rename to java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/IoHelper.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IoHelper.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/IoHelper.java
rename to java_console/io/src/main/java/com/rusefi/binaryprotocol/IoHelper.java
diff --git a/java_console/io/src/main/com/rusefi/file/FileUtils.java b/java_console/io/src/main/java/com/rusefi/file/FileUtils.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/file/FileUtils.java
rename to java_console/io/src/main/java/com/rusefi/file/FileUtils.java
diff --git a/java_console/io/src/main/com/rusefi/file/TableGenerator.java b/java_console/io/src/main/java/com/rusefi/file/TableGenerator.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/file/TableGenerator.java
rename to java_console/io/src/main/java/com/rusefi/file/TableGenerator.java
diff --git a/java_console/io/src/main/com/rusefi/io/CommandQueue.java b/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/CommandQueue.java
rename to java_console/io/src/main/java/com/rusefi/io/CommandQueue.java
diff --git a/java_console/io/src/main/com/rusefi/io/ConnectionStateListener.java b/java_console/io/src/main/java/com/rusefi/io/ConnectionStateListener.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/ConnectionStateListener.java
rename to java_console/io/src/main/java/com/rusefi/io/ConnectionStateListener.java
diff --git a/java_console/io/src/main/com/rusefi/io/ConnectionStatusLogic.java b/java_console/io/src/main/java/com/rusefi/io/ConnectionStatusLogic.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/ConnectionStatusLogic.java
rename to java_console/io/src/main/java/com/rusefi/io/ConnectionStatusLogic.java
diff --git a/java_console/io/src/main/com/rusefi/io/ConnectionStatusValue.java b/java_console/io/src/main/java/com/rusefi/io/ConnectionStatusValue.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/ConnectionStatusValue.java
rename to java_console/io/src/main/java/com/rusefi/io/ConnectionStatusValue.java
diff --git a/java_console/io/src/main/com/rusefi/io/ConnectionWatchdog.java b/java_console/io/src/main/java/com/rusefi/io/ConnectionWatchdog.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/ConnectionWatchdog.java
rename to java_console/io/src/main/java/com/rusefi/io/ConnectionWatchdog.java
diff --git a/java_console/io/src/main/com/rusefi/io/HeartBeatListeners.java b/java_console/io/src/main/java/com/rusefi/io/HeartBeatListeners.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/HeartBeatListeners.java
rename to java_console/io/src/main/java/com/rusefi/io/HeartBeatListeners.java
diff --git a/java_console/io/src/main/com/rusefi/io/IMethodInvocation.java b/java_console/io/src/main/java/com/rusefi/io/IMethodInvocation.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/IMethodInvocation.java
rename to java_console/io/src/main/java/com/rusefi/io/IMethodInvocation.java
diff --git a/java_console/io/src/main/com/rusefi/io/InvocationConfirmationListener.java b/java_console/io/src/main/java/com/rusefi/io/InvocationConfirmationListener.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/InvocationConfirmationListener.java
rename to java_console/io/src/main/java/com/rusefi/io/InvocationConfirmationListener.java
diff --git a/java_console/io/src/main/com/rusefi/io/IoStream.java b/java_console/io/src/main/java/com/rusefi/io/IoStream.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/IoStream.java
rename to java_console/io/src/main/java/com/rusefi/io/IoStream.java
diff --git a/java_console/io/src/main/com/rusefi/io/LinkConnector.java b/java_console/io/src/main/java/com/rusefi/io/LinkConnector.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/LinkConnector.java
rename to java_console/io/src/main/java/com/rusefi/io/LinkConnector.java
diff --git a/java_console/io/src/main/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/LinkManager.java
rename to java_console/io/src/main/java/com/rusefi/io/LinkManager.java
diff --git a/java_console/io/src/main/com/rusefi/io/serial/BaudRateHolder.java b/java_console/io/src/main/java/com/rusefi/io/serial/BaudRateHolder.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/serial/BaudRateHolder.java
rename to java_console/io/src/main/java/com/rusefi/io/serial/BaudRateHolder.java
diff --git a/java_console/io/src/main/com/rusefi/io/serial/PortHolder.java b/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/serial/PortHolder.java
rename to java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java
diff --git a/java_console/io/src/main/com/rusefi/io/serial/SerialConnector.java b/java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/serial/SerialConnector.java
rename to java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java
diff --git a/java_console/io/src/main/com/rusefi/io/serial/SerialIoStreamJSerialComm.java b/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
rename to java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
diff --git a/java_console/io/src/main/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/tcp/BinaryProtocolServer.java
rename to java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
diff --git a/java_console/io/src/main/com/rusefi/io/tcp/TcpConnector.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/tcp/TcpConnector.java
rename to java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java
diff --git a/java_console/io/src/main/com/rusefi/io/tcp/TcpIoStream.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/io/tcp/TcpIoStream.java
rename to java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
diff --git a/java_console/io/src/main/com/rusefi/ldmp/StateDictionary.java b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ldmp/StateDictionary.java
rename to java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java
diff --git a/java_console/io/src/main/com/rusefi/ui/livedocs/LiveDataContext.java b/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDataContext.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ui/livedocs/LiveDataContext.java
rename to java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDataContext.java
diff --git a/java_console/io/src/main/com/rusefi/ui/livedocs/LiveDocHolder.java b/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocHolder.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ui/livedocs/LiveDocHolder.java
rename to java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocHolder.java
diff --git a/java_console/io/src/main/com/rusefi/ui/livedocs/LiveDocsRegistry.java b/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ui/livedocs/LiveDocsRegistry.java
rename to java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java
diff --git a/java_console/io/src/main/com/rusefi/ui/livedocs/RefreshActions.java b/java_console/io/src/main/java/com/rusefi/ui/livedocs/RefreshActions.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ui/livedocs/RefreshActions.java
rename to java_console/io/src/main/java/com/rusefi/ui/livedocs/RefreshActions.java
diff --git a/java_console/io/src/main/com/rusefi/ui/livedocs/RefreshActionsMap.java b/java_console/io/src/main/java/com/rusefi/ui/livedocs/RefreshActionsMap.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/ui/livedocs/RefreshActionsMap.java
rename to java_console/io/src/main/java/com/rusefi/ui/livedocs/RefreshActionsMap.java
diff --git a/java_console/io/src/main/etch/util/ByteBuffer.java b/java_console/io/src/main/java/etch/util/ByteBuffer.java
similarity index 100%
rename from java_console/io/src/main/etch/util/ByteBuffer.java
rename to java_console/io/src/main/java/etch/util/ByteBuffer.java
diff --git a/java_console/io/src/main/etch/util/CircularByteBuffer.java b/java_console/io/src/main/java/etch/util/CircularByteBuffer.java
similarity index 100%
rename from java_console/io/src/main/etch/util/CircularByteBuffer.java
rename to java_console/io/src/main/java/etch/util/CircularByteBuffer.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/test/CRCTest.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/test/CRCTest.java
rename to java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java
diff --git a/java_console/io/src/main/com/rusefi/binaryprotocol/test/IoHelperTest.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/binaryprotocol/test/IoHelperTest.java
rename to java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java
diff --git a/java_console/io/src/main/com/rusefi/test/ConfigurationImageDiffTest.java b/java_console/io/src/test/java/com/rusefi/test/ConfigurationImageDiffTest.java
similarity index 100%
rename from java_console/io/src/main/com/rusefi/test/ConfigurationImageDiffTest.java
rename to java_console/io/src/test/java/com/rusefi/test/ConfigurationImageDiffTest.java