diff --git a/java_console/build.xml b/java_console/build.xml
index 1e5d8a30e4..e0671254d6 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -47,7 +47,7 @@
             <src path="models/src"/>
             <src path="inifile/src"/>
             <src path="shared_ui/src"/>
-            <src path="ui/src"/>
+            <src path="ui/src/main/java"/>
             <src path="romraider/src"/>
             <src path="opensr5/src"/>
             <src path="logging/src"/>
@@ -75,7 +75,7 @@
                 <fileset dir="autoupdate/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="io/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="models/src" includes="**/test/**/*Test.java"/>
-                <fileset dir="ui/src" includes="**/test/**/*Test.java"/>
+                <fileset dir="ui/src/main/java" includes="**/test/**/*Test.java"/>
                 <fileset dir="romraider/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="opensr5/src" includes="**/test/**/*Test.java"/>
                 <fileset dir="logging/src" includes="**/test/**/*Test.java"/>
diff --git a/java_console/ui/src/com/rusefi/AverageAnglePanel.java b/java_console/ui/src/main/java/com/rusefi/AverageAnglePanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/AverageAnglePanel.java
rename to java_console/ui/src/main/java/com/rusefi/AverageAnglePanel.java
diff --git a/java_console/ui/src/com/rusefi/BenchTestPane.java b/java_console/ui/src/main/java/com/rusefi/BenchTestPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/BenchTestPane.java
rename to java_console/ui/src/main/java/com/rusefi/BenchTestPane.java
diff --git a/java_console/ui/src/com/rusefi/CmdLine.java b/java_console/ui/src/main/java/com/rusefi/CmdLine.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/CmdLine.java
rename to java_console/ui/src/main/java/com/rusefi/CmdLine.java
diff --git a/java_console/ui/src/com/rusefi/CommandControl.java b/java_console/ui/src/main/java/com/rusefi/CommandControl.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/CommandControl.java
rename to java_console/ui/src/main/java/com/rusefi/CommandControl.java
diff --git a/java_console/ui/src/com/rusefi/CompileTool.java b/java_console/ui/src/main/java/com/rusefi/CompileTool.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/CompileTool.java
rename to java_console/ui/src/main/java/com/rusefi/CompileTool.java
diff --git a/java_console/ui/src/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ConsoleUI.java
rename to java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
diff --git a/java_console/ui/src/com/rusefi/ETBPane.java b/java_console/ui/src/main/java/com/rusefi/ETBPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ETBPane.java
rename to java_console/ui/src/main/java/com/rusefi/ETBPane.java
diff --git a/java_console/ui/src/com/rusefi/EcuStimulator.java b/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/EcuStimulator.java
rename to java_console/ui/src/main/java/com/rusefi/EcuStimulator.java
diff --git a/java_console/ui/src/com/rusefi/FixedCommandControl.java b/java_console/ui/src/main/java/com/rusefi/FixedCommandControl.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/FixedCommandControl.java
rename to java_console/ui/src/main/java/com/rusefi/FixedCommandControl.java
diff --git a/java_console/ui/src/com/rusefi/KeyStrokeShortcut.java b/java_console/ui/src/main/java/com/rusefi/KeyStrokeShortcut.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/KeyStrokeShortcut.java
rename to java_console/ui/src/main/java/com/rusefi/KeyStrokeShortcut.java
diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/main/java/com/rusefi/Launcher.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/Launcher.java
rename to java_console/ui/src/main/java/com/rusefi/Launcher.java
diff --git a/java_console/ui/src/com/rusefi/PaneSettings.java b/java_console/ui/src/main/java/com/rusefi/PaneSettings.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/PaneSettings.java
rename to java_console/ui/src/main/java/com/rusefi/PaneSettings.java
diff --git a/java_console/ui/src/com/rusefi/PresetsPane.java b/java_console/ui/src/main/java/com/rusefi/PresetsPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/PresetsPane.java
rename to java_console/ui/src/main/java/com/rusefi/PresetsPane.java
diff --git a/java_console/ui/src/com/rusefi/RomRaiderWrapper.java b/java_console/ui/src/main/java/com/rusefi/RomRaiderWrapper.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/RomRaiderWrapper.java
rename to java_console/ui/src/main/java/com/rusefi/RomRaiderWrapper.java
diff --git a/java_console/ui/src/com/rusefi/SensorLogger.java b/java_console/ui/src/main/java/com/rusefi/SensorLogger.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/SensorLogger.java
rename to java_console/ui/src/main/java/com/rusefi/SensorLogger.java
diff --git a/java_console/ui/src/com/rusefi/SensorSnifferCentral.java b/java_console/ui/src/main/java/com/rusefi/SensorSnifferCentral.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/SensorSnifferCentral.java
rename to java_console/ui/src/main/java/com/rusefi/SensorSnifferCentral.java
diff --git a/java_console/ui/src/com/rusefi/SensorSnifferPane.java b/java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/SensorSnifferPane.java
rename to java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java
diff --git a/java_console/ui/src/com/rusefi/SerialPortScanner.java b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/SerialPortScanner.java
rename to java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java
diff --git a/java_console/ui/src/com/rusefi/SimulatorHelper.java b/java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/SimulatorHelper.java
rename to java_console/ui/src/main/java/com/rusefi/SimulatorHelper.java
diff --git a/java_console/ui/src/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/StartupFrame.java
rename to java_console/ui/src/main/java/com/rusefi/StartupFrame.java
diff --git a/java_console/ui/src/com/rusefi/StimulationInputs.java b/java_console/ui/src/main/java/com/rusefi/StimulationInputs.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/StimulationInputs.java
rename to java_console/ui/src/main/java/com/rusefi/StimulationInputs.java
diff --git a/java_console/ui/src/com/rusefi/TableEditorPane.java b/java_console/ui/src/main/java/com/rusefi/TableEditorPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/TableEditorPane.java
rename to java_console/ui/src/main/java/com/rusefi/TableEditorPane.java
diff --git a/java_console/ui/src/com/rusefi/TriggerImage.java b/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/TriggerImage.java
rename to java_console/ui/src/main/java/com/rusefi/TriggerImage.java
diff --git a/java_console/ui/src/com/rusefi/UploadChanges.java b/java_console/ui/src/main/java/com/rusefi/UploadChanges.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/UploadChanges.java
rename to java_console/ui/src/main/java/com/rusefi/UploadChanges.java
diff --git a/java_console/ui/src/com/rusefi/ValueRangeControl.java b/java_console/ui/src/main/java/com/rusefi/ValueRangeControl.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ValueRangeControl.java
rename to java_console/ui/src/main/java/com/rusefi/ValueRangeControl.java
diff --git a/java_console/ui/src/com/rusefi/autodetect/PortDetector.java b/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetector.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/autodetect/PortDetector.java
rename to java_console/ui/src/main/java/com/rusefi/autodetect/PortDetector.java
diff --git a/java_console/ui/src/com/rusefi/autodetect/PortDetectorSandbox.java b/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/autodetect/PortDetectorSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java
diff --git a/java_console/ui/src/com/rusefi/autodetect/ReconnectSandbox.java b/java_console/ui/src/main/java/com/rusefi/autodetect/ReconnectSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/autodetect/ReconnectSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/autodetect/ReconnectSandbox.java
diff --git a/java_console/ui/src/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/autodetect/SerialAutoChecker.java
rename to java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
diff --git a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java b/java_console/ui/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
rename to java_console/ui/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
diff --git a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java b/java_console/ui/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/binaryprotocol/BinaryProtocolCmdSandbox.java
diff --git a/java_console/ui/src/com/rusefi/etb/ClosedLoopControlQualityMetric.java b/java_console/ui/src/main/java/com/rusefi/etb/ClosedLoopControlQualityMetric.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/etb/ClosedLoopControlQualityMetric.java
rename to java_console/ui/src/main/java/com/rusefi/etb/ClosedLoopControlQualityMetric.java
diff --git a/java_console/ui/src/com/rusefi/etb/EtbTarget.java b/java_console/ui/src/main/java/com/rusefi/etb/EtbTarget.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/etb/EtbTarget.java
rename to java_console/ui/src/main/java/com/rusefi/etb/EtbTarget.java
diff --git a/java_console/ui/src/com/rusefi/etb/StandardTestSequence.java b/java_console/ui/src/main/java/com/rusefi/etb/StandardTestSequence.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/etb/StandardTestSequence.java
rename to java_console/ui/src/main/java/com/rusefi/etb/StandardTestSequence.java
diff --git a/java_console/ui/src/com/rusefi/etb/TestSequenceStep.java b/java_console/ui/src/main/java/com/rusefi/etb/TestSequenceStep.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/etb/TestSequenceStep.java
rename to java_console/ui/src/main/java/com/rusefi/etb/TestSequenceStep.java
diff --git a/java_console/ui/src/com/rusefi/etb/test/ClosedLoopControlQualityMetricTest.java b/java_console/ui/src/main/java/com/rusefi/etb/test/ClosedLoopControlQualityMetricTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/etb/test/ClosedLoopControlQualityMetricTest.java
rename to java_console/ui/src/main/java/com/rusefi/etb/test/ClosedLoopControlQualityMetricTest.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/AccelEnrichmentMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/AccelEnrichmentMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/AccelEnrichmentMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/AccelEnrichmentMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/ElectronicThrottleMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/ElectronicThrottleMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/ElectronicThrottleMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/ElectronicThrottleMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/FuelMathMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/FuelMathMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/FuelMathMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/FuelMathMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/IdleThreadMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/IdleThreadMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/IdleThreadMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/IdleThreadMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/SpeedDensityMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/SpeedDensityMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/SpeedDensityMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/SpeedDensityMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/ThermistorsMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/ThermistorsMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/ThermistorsMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/ThermistorsMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/TpsMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/TpsMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/TpsMeta.java
diff --git a/java_console/ui/src/com/rusefi/ldmp/generated/TriggerDecoderMeta.java b/java_console/ui/src/main/java/com/rusefi/ldmp/generated/TriggerDecoderMeta.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ldmp/generated/TriggerDecoderMeta.java
rename to java_console/ui/src/main/java/com/rusefi/ldmp/generated/TriggerDecoderMeta.java
diff --git a/java_console/ui/src/com/rusefi/logic/IgnitionMapBuilder.java b/java_console/ui/src/main/java/com/rusefi/logic/IgnitionMapBuilder.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/logic/IgnitionMapBuilder.java
rename to java_console/ui/src/main/java/com/rusefi/logic/IgnitionMapBuilder.java
diff --git a/java_console/ui/src/com/rusefi/logic/test/IgnitionMapBuilderTest.java b/java_console/ui/src/main/java/com/rusefi/logic/test/IgnitionMapBuilderTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/logic/test/IgnitionMapBuilderTest.java
rename to java_console/ui/src/main/java/com/rusefi/logic/test/IgnitionMapBuilderTest.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/DriverInstall.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/DriverInstall.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/EraseChip.java b/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/EraseChip.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/ExecHelper.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ExecHelper.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/ExecHelper.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/ExecHelper.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/FirmwareFlasher.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/FirmwareFlasher.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/HwPlatform.java b/java_console/ui/src/main/java/com/rusefi/maintenance/HwPlatform.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/HwPlatform.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/HwPlatform.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/ProgramSelector.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/StatusAnimation.java b/java_console/ui/src/main/java/com/rusefi/maintenance/StatusAnimation.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/StatusAnimation.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/StatusAnimation.java
diff --git a/java_console/ui/src/com/rusefi/maintenance/VersionChecker.java b/java_console/ui/src/main/java/com/rusefi/maintenance/VersionChecker.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/maintenance/VersionChecker.java
rename to java_console/ui/src/main/java/com/rusefi/maintenance/VersionChecker.java
diff --git a/java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java b/java_console/ui/src/main/java/com/rusefi/test/EcuStimulatorSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/test/EcuStimulatorSandbox.java
diff --git a/java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java b/java_console/ui/src/main/java/com/rusefi/test/MsgPanelSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/test/MsgPanelSandbox.java
diff --git a/java_console/ui/src/com/rusefi/test/SensorSnifferPaneSandbox.java b/java_console/ui/src/main/java/com/rusefi/test/SensorSnifferPaneSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/test/SensorSnifferPaneSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/test/SensorSnifferPaneSandbox.java
diff --git a/java_console/ui/src/com/rusefi/test/VoltageDividerTest.java b/java_console/ui/src/main/java/com/rusefi/test/VoltageDividerTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/test/VoltageDividerTest.java
rename to java_console/ui/src/main/java/com/rusefi/test/VoltageDividerTest.java
diff --git a/java_console/ui/src/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/tools/ConsoleTools.java
rename to java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
diff --git a/java_console/ui/src/com/rusefi/trigger/WaveState.java b/java_console/ui/src/main/java/com/rusefi/trigger/WaveState.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/trigger/WaveState.java
rename to java_console/ui/src/main/java/com/rusefi/trigger/WaveState.java
diff --git a/java_console/ui/src/com/rusefi/ui/BooleanInputsModel.java b/java_console/ui/src/main/java/com/rusefi/ui/BooleanInputsModel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/BooleanInputsModel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/BooleanInputsModel.java
diff --git a/java_console/ui/src/com/rusefi/ui/ChartHelper.java b/java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/ChartHelper.java
rename to java_console/ui/src/main/java/com/rusefi/ui/ChartHelper.java
diff --git a/java_console/ui/src/com/rusefi/ui/ChartRepository.java b/java_console/ui/src/main/java/com/rusefi/ui/ChartRepository.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/ChartRepository.java
rename to java_console/ui/src/main/java/com/rusefi/ui/ChartRepository.java
diff --git a/java_console/ui/src/com/rusefi/ui/ChartScrollControl.java b/java_console/ui/src/main/java/com/rusefi/ui/ChartScrollControl.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/ChartScrollControl.java
rename to java_console/ui/src/main/java/com/rusefi/ui/ChartScrollControl.java
diff --git a/java_console/ui/src/com/rusefi/ui/FormulasPane.java b/java_console/ui/src/main/java/com/rusefi/ui/FormulasPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/FormulasPane.java
rename to java_console/ui/src/main/java/com/rusefi/ui/FormulasPane.java
diff --git a/java_console/ui/src/com/rusefi/ui/FuelTunePane.java b/java_console/ui/src/main/java/com/rusefi/ui/FuelTunePane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/FuelTunePane.java
rename to java_console/ui/src/main/java/com/rusefi/ui/FuelTunePane.java
diff --git a/java_console/ui/src/com/rusefi/ui/GaugesGrid.java b/java_console/ui/src/main/java/com/rusefi/ui/GaugesGrid.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/GaugesGrid.java
rename to java_console/ui/src/main/java/com/rusefi/ui/GaugesGrid.java
diff --git a/java_console/ui/src/com/rusefi/ui/GaugesGridElement.java b/java_console/ui/src/main/java/com/rusefi/ui/GaugesGridElement.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/GaugesGridElement.java
rename to java_console/ui/src/main/java/com/rusefi/ui/GaugesGridElement.java
diff --git a/java_console/ui/src/com/rusefi/ui/GaugesPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/GaugesPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/GaugesPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/GaugesPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/Live3DReport.java b/java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/Live3DReport.java
rename to java_console/ui/src/main/java/com/rusefi/ui/Live3DReport.java
diff --git a/java_console/ui/src/com/rusefi/ui/LogDownloader.java b/java_console/ui/src/main/java/com/rusefi/ui/LogDownloader.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/LogDownloader.java
rename to java_console/ui/src/main/java/com/rusefi/ui/LogDownloader.java
diff --git a/java_console/ui/src/com/rusefi/ui/MessagesPane.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/MessagesPane.java
rename to java_console/ui/src/main/java/com/rusefi/ui/MessagesPane.java
diff --git a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/MessagesPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/MessagesPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/MessagesView.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/MessagesView.java
rename to java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java
diff --git a/java_console/ui/src/com/rusefi/ui/OnlineTab.java b/java_console/ui/src/main/java/com/rusefi/ui/OnlineTab.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/OnlineTab.java
rename to java_console/ui/src/main/java/com/rusefi/ui/OnlineTab.java
diff --git a/java_console/ui/src/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/RecentCommands.java
rename to java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java
diff --git a/java_console/ui/src/com/rusefi/ui/RpmLabel.java b/java_console/ui/src/main/java/com/rusefi/ui/RpmLabel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/RpmLabel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/RpmLabel.java
diff --git a/java_console/ui/src/com/rusefi/ui/RpmModel.java b/java_console/ui/src/main/java/com/rusefi/ui/RpmModel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/RpmModel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/RpmModel.java
diff --git a/java_console/ui/src/com/rusefi/ui/SensorLiveGraph.java b/java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/SensorLiveGraph.java
rename to java_console/ui/src/main/java/com/rusefi/ui/SensorLiveGraph.java
diff --git a/java_console/ui/src/com/rusefi/ui/SensorsLiveDataPane.java b/java_console/ui/src/main/java/com/rusefi/ui/SensorsLiveDataPane.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/SensorsLiveDataPane.java
rename to java_console/ui/src/main/java/com/rusefi/ui/SensorsLiveDataPane.java
diff --git a/java_console/ui/src/com/rusefi/ui/ShowMap.java b/java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/ShowMap.java
rename to java_console/ui/src/main/java/com/rusefi/ui/ShowMap.java
diff --git a/java_console/ui/src/com/rusefi/ui/SizeSelectorPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/SizeSelectorPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/SizeSelectorPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/StatusConsumer.java b/java_console/ui/src/main/java/com/rusefi/ui/StatusConsumer.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/StatusConsumer.java
rename to java_console/ui/src/main/java/com/rusefi/ui/StatusConsumer.java
diff --git a/java_console/ui/src/com/rusefi/ui/StatusWindow.java b/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/StatusWindow.java
rename to java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java
diff --git a/java_console/ui/src/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/WarningPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/WarningPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/Wizard.java b/java_console/ui/src/main/java/com/rusefi/ui/Wizard.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/Wizard.java
rename to java_console/ui/src/main/java/com/rusefi/ui/Wizard.java
diff --git a/java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java b/java_console/ui/src/main/java/com/rusefi/ui/config/BaseConfigField.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java
rename to java_console/ui/src/main/java/com/rusefi/ui/config/BaseConfigField.java
diff --git a/java_console/ui/src/com/rusefi/ui/config/BitConfigField.java b/java_console/ui/src/main/java/com/rusefi/ui/config/BitConfigField.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/config/BitConfigField.java
rename to java_console/ui/src/main/java/com/rusefi/ui/config/BitConfigField.java
diff --git a/java_console/ui/src/com/rusefi/ui/config/ConfigField.java b/java_console/ui/src/main/java/com/rusefi/ui/config/ConfigField.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/config/ConfigField.java
rename to java_console/ui/src/main/java/com/rusefi/ui/config/ConfigField.java
diff --git a/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java b/java_console/ui/src/main/java/com/rusefi/ui/config/EnumConfigField.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java
rename to java_console/ui/src/main/java/com/rusefi/ui/config/EnumConfigField.java
diff --git a/java_console/ui/src/com/rusefi/ui/console/MainFrame.java b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/console/MainFrame.java
rename to java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
diff --git a/java_console/ui/src/com/rusefi/ui/console/SettingsTab.java b/java_console/ui/src/main/java/com/rusefi/ui/console/SettingsTab.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/console/SettingsTab.java
rename to java_console/ui/src/main/java/com/rusefi/ui/console/SettingsTab.java
diff --git a/java_console/ui/src/com/rusefi/ui/console/TabbedPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/console/TabbedPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/ChannelNaming.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/ChannelNaming.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/ChannelNaming.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/ChannelNaming.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferStatusPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferStatusPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/NameUtil.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/NameUtil.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/NameUtil.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/NameUtil.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/UpDownImage.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/UpDownImage.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/ZoomControl.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/ZoomControl.java
diff --git a/java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/test/UpDownSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/ui/engine/test/UpDownSandbox.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/CalibrationPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/CalibrationPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/DirectDrivePanel.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/DirectDrivePanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/DirectDrivePanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/DirectDrivePanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/EtbCommandsPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/EtbCommandsPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/EtbMonteCarloSequence.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbMonteCarloSequence.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/EtbMonteCarloSequence.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/EtbMonteCarloSequence.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/EtbReturnToNeutral.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbReturnToNeutral.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/EtbReturnToNeutral.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/EtbReturnToNeutral.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/EtbTestSequence.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbTestSequence.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/EtbTestSequence.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/EtbTestSequence.java
diff --git a/java_console/ui/src/com/rusefi/ui/etb/MagicSpotsFinder.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/MagicSpotsFinder.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/etb/MagicSpotsFinder.java
rename to java_console/ui/src/main/java/com/rusefi/ui/etb/MagicSpotsFinder.java
diff --git a/java_console/ui/src/com/rusefi/ui/fsio/FlexibleControls.java b/java_console/ui/src/main/java/com/rusefi/ui/fsio/FlexibleControls.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/fsio/FlexibleControls.java
rename to java_console/ui/src/main/java/com/rusefi/ui/fsio/FlexibleControls.java
diff --git a/java_console/ui/src/com/rusefi/ui/light/InternetStatus.java b/java_console/ui/src/main/java/com/rusefi/ui/light/InternetStatus.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/light/InternetStatus.java
rename to java_console/ui/src/main/java/com/rusefi/ui/light/InternetStatus.java
diff --git a/java_console/ui/src/com/rusefi/ui/light/LightweightGUI.java b/java_console/ui/src/main/java/com/rusefi/ui/light/LightweightGUI.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/light/LightweightGUI.java
rename to java_console/ui/src/main/java/com/rusefi/ui/light/LightweightGUI.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/ActionPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/ActionPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/ActionPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/ActionPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/IfConditionPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/IfConditionPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/IfConditionPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/IfConditionPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/LessJumpyJLabel.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/LessJumpyJLabel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/LessJumpyJLabel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/LessJumpyJLabel.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/LiveDocPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/LiveDocPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/LiveDocsSandbox.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/LiveDocsSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/LiveDocsSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/LiveDocsSandbox.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/controls/ConfigReference.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/ConfigReference.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/controls/ConfigReference.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/ConfigReference.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/controls/ConfigView.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/ConfigView.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/controls/ConfigView.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/ConfigView.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/controls/LogicReference.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/LogicReference.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/controls/LogicReference.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/LogicReference.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/controls/Toolbox.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/Toolbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/controls/Toolbox.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/controls/Toolbox.java
diff --git a/java_console/ui/src/com/rusefi/ui/livedocs/test/LiveDocPanelTest.java b/java_console/ui/src/main/java/com/rusefi/ui/livedocs/test/LiveDocPanelTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/livedocs/test/LiveDocPanelTest.java
rename to java_console/ui/src/main/java/com/rusefi/ui/livedocs/test/LiveDocPanelTest.java
diff --git a/java_console/ui/src/com/rusefi/ui/logview/FileItem.java b/java_console/ui/src/main/java/com/rusefi/ui/logview/FileItem.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/logview/FileItem.java
rename to java_console/ui/src/main/java/com/rusefi/ui/logview/FileItem.java
diff --git a/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java b/java_console/ui/src/main/java/com/rusefi/ui/logview/LogViewer.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/logview/LogViewer.java
rename to java_console/ui/src/main/java/com/rusefi/ui/logview/LogViewer.java
diff --git a/java_console/ui/src/com/rusefi/ui/test/EngineSnifferPanelTest.java b/java_console/ui/src/main/java/com/rusefi/ui/test/EngineSnifferPanelTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/test/EngineSnifferPanelTest.java
rename to java_console/ui/src/main/java/com/rusefi/ui/test/EngineSnifferPanelTest.java
diff --git a/java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java b/java_console/ui/src/main/java/com/rusefi/ui/test/FlexibleControlsSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/ui/test/FlexibleControlsSandbox.java
diff --git a/java_console/ui/src/com/rusefi/ui/test/RpmModelTest.java b/java_console/ui/src/main/java/com/rusefi/ui/test/RpmModelTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/test/RpmModelTest.java
rename to java_console/ui/src/main/java/com/rusefi/ui/test/RpmModelTest.java
diff --git a/java_console/ui/src/com/rusefi/ui/test/WavePanelSandbox.java b/java_console/ui/src/main/java/com/rusefi/ui/test/WavePanelSandbox.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/test/WavePanelSandbox.java
rename to java_console/ui/src/main/java/com/rusefi/ui/test/WavePanelSandbox.java
diff --git a/java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java b/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java
rename to java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java
diff --git a/java_console/ui/src/com/rusefi/ui/util/HorizontalLine.java b/java_console/ui/src/main/java/com/rusefi/ui/util/HorizontalLine.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/HorizontalLine.java
rename to java_console/ui/src/main/java/com/rusefi/ui/util/HorizontalLine.java
diff --git a/java_console/ui/src/com/rusefi/ui/util/JTextFieldWithWidth.java b/java_console/ui/src/main/java/com/rusefi/ui/util/JTextFieldWithWidth.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/JTextFieldWithWidth.java
rename to java_console/ui/src/main/java/com/rusefi/ui/util/JTextFieldWithWidth.java
diff --git a/java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java b/java_console/ui/src/main/java/com/rusefi/ui/util/JustOneInstance.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java
rename to java_console/ui/src/main/java/com/rusefi/ui/util/JustOneInstance.java
diff --git a/java_console/ui/src/com/rusefi/ui/util/LocalizedMessages.java b/java_console/ui/src/main/java/com/rusefi/ui/util/LocalizedMessages.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/LocalizedMessages.java
rename to java_console/ui/src/main/java/com/rusefi/ui/util/LocalizedMessages.java
diff --git a/java_console/ui/src/com/rusefi/ui/util/UiUtils.java b/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/UiUtils.java
rename to java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/BooleanFlagControlPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/BooleanFlagControlPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/DetachedSensor.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/IdleLabel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/IdleLabel.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/IntGaugeLabel.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/IntGaugeLabel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/IntGaugeLabel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/IntGaugeLabel.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/JPanelWithListener.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/JPanelWithListener.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/JPanelWithListener.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/JPanelWithListener.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/MafCommand.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/PopupMenuButton.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/PopupMenuButton.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/PopupMenuButton.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/PopupMenuButton.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/RpmCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/RpmCommand.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/RpmCommand.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/RpmCommand.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/SensorGauge.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/WaveInfoPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/WaveInfoPanel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/WaveInfoPanel.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/WaveInfoPanel.java
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/test/AnyCommandTest.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/test/AnyCommandTest.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/widgets/test/AnyCommandTest.java
rename to java_console/ui/src/main/java/com/rusefi/ui/widgets/test/AnyCommandTest.java
diff --git a/java_console/ui/ui.iml b/java_console/ui/ui.iml
index f118903fb8..ee5ef7d9dd 100644
--- a/java_console/ui/ui.iml
+++ b/java_console/ui/ui.iml
@@ -5,6 +5,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />