diff --git a/firmware/gen_ptrace_enums.bat b/firmware/gen_ptrace_enums.bat
index f8c1eead0c..e0232022b9 100644
--- a/firmware/gen_ptrace_enums.bat
+++ b/firmware/gen_ptrace_enums.bat
@@ -1,5 +1,5 @@
#
# this tool might have enough flexibility to generate both C# and java class depending on specified "top line" and "stringClassName" parameters?
#
-java -jar ../java_console_binary/rusefi_console.jar ptrace_enums development/perf_trace.h ../java_console/models/src/com/rusefi/tracing/EnumNames.java "package com.rusefi.tracing;" "public static final String"
+java -jar ../java_console_binary/rusefi_console.jar ptrace_enums development/perf_trace.h ../java_console/models/src/main/java/com/rusefi/tracing/EnumNames.java "package com.rusefi.tracing;" "public static final String"
diff --git a/java_console/.idea/inspectionProfiles/Project_Default.xml b/java_console/.idea/inspectionProfiles/Project_Default.xml
index 1fb1d1849b..350502b96e 100644
--- a/java_console/.idea/inspectionProfiles/Project_Default.xml
+++ b/java_console/.idea/inspectionProfiles/Project_Default.xml
@@ -1,15 +1,13 @@
+
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/java_console/autotest/autotest.iml b/java_console/autotest/autotest.iml
index 50df370975..214af6477b 100644
--- a/java_console/autotest/autotest.iml
+++ b/java_console/autotest/autotest.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_console/autotest/src/com/rusefi/AverageAnglesUtil.java b/java_console/autotest/src/main/java/com/rusefi/AverageAnglesUtil.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/AverageAnglesUtil.java
rename to java_console/autotest/src/main/java/com/rusefi/AverageAnglesUtil.java
diff --git a/java_console/autotest/src/com/rusefi/EnduranceTestUtility.java b/java_console/autotest/src/main/java/com/rusefi/EnduranceTestUtility.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/EnduranceTestUtility.java
rename to java_console/autotest/src/main/java/com/rusefi/EnduranceTestUtility.java
diff --git a/java_console/autotest/src/com/rusefi/IoUtil.java b/java_console/autotest/src/main/java/com/rusefi/IoUtil.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/IoUtil.java
rename to java_console/autotest/src/main/java/com/rusefi/IoUtil.java
diff --git a/java_console/autotest/src/com/rusefi/RealHardwareTestLauncher.java b/java_console/autotest/src/main/java/com/rusefi/RealHardwareTestLauncher.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/RealHardwareTestLauncher.java
rename to java_console/autotest/src/main/java/com/rusefi/RealHardwareTestLauncher.java
diff --git a/java_console/autotest/src/com/rusefi/RusefiTestBase.java b/java_console/autotest/src/main/java/com/rusefi/RusefiTestBase.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/RusefiTestBase.java
rename to java_console/autotest/src/main/java/com/rusefi/RusefiTestBase.java
diff --git a/java_console/autotest/src/com/rusefi/SimulatorExecHelper.java b/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/SimulatorExecHelper.java
rename to java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java
diff --git a/java_console/autotest/src/com/rusefi/SimulatorFunctionalTestLauncher.java b/java_console/autotest/src/main/java/com/rusefi/SimulatorFunctionalTestLauncher.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/SimulatorFunctionalTestLauncher.java
rename to java_console/autotest/src/main/java/com/rusefi/SimulatorFunctionalTestLauncher.java
diff --git a/java_console/autotest/src/com/rusefi/TestingUtils.java b/java_console/autotest/src/main/java/com/rusefi/TestingUtils.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/TestingUtils.java
rename to java_console/autotest/src/main/java/com/rusefi/TestingUtils.java
diff --git a/java_console/autotest/src/com/rusefi/autotest/ControllerConnectorState.java b/java_console/autotest/src/main/java/com/rusefi/autotest/ControllerConnectorState.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/autotest/ControllerConnectorState.java
rename to java_console/autotest/src/main/java/com/rusefi/autotest/ControllerConnectorState.java
diff --git a/java_console/autotest/src/com/rusefi/common/MiscTest.java b/java_console/autotest/src/main/java/com/rusefi/common/MiscTest.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/common/MiscTest.java
rename to java_console/autotest/src/main/java/com/rusefi/common/MiscTest.java
diff --git a/java_console/autotest/src/com/rusefi/f4discovery/CommonFunctionalTest.java b/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/f4discovery/CommonFunctionalTest.java
rename to java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java
diff --git a/java_console/autotest/src/com/rusefi/f4discovery/HighRevTest.java b/java_console/autotest/src/main/java/com/rusefi/f4discovery/HighRevTest.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/f4discovery/HighRevTest.java
rename to java_console/autotest/src/main/java/com/rusefi/f4discovery/HighRevTest.java
diff --git a/java_console/autotest/src/com/rusefi/f4discovery/PwmHardwareTest.java b/java_console/autotest/src/main/java/com/rusefi/f4discovery/PwmHardwareTest.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/f4discovery/PwmHardwareTest.java
rename to java_console/autotest/src/main/java/com/rusefi/f4discovery/PwmHardwareTest.java
diff --git a/java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java b/java_console/autotest/src/main/java/com/rusefi/f4discovery/VssHardwareLoopTest.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java
rename to java_console/autotest/src/main/java/com/rusefi/f4discovery/VssHardwareLoopTest.java
diff --git a/java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java b/java_console/autotest/src/main/java/com/rusefi/functional_tests/EcuTestHelper.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java
rename to java_console/autotest/src/main/java/com/rusefi/functional_tests/EcuTestHelper.java
diff --git a/java_console/autotest/src/com/rusefi/functional_tests/TestHelper.java b/java_console/autotest/src/main/java/com/rusefi/functional_tests/TestHelper.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/functional_tests/TestHelper.java
rename to java_console/autotest/src/main/java/com/rusefi/functional_tests/TestHelper.java
diff --git a/java_console/autotest/src/com/rusefi/proteus/ProteusAnalogTest.java b/java_console/autotest/src/main/java/com/rusefi/proteus/ProteusAnalogTest.java
similarity index 100%
rename from java_console/autotest/src/com/rusefi/proteus/ProteusAnalogTest.java
rename to java_console/autotest/src/main/java/com/rusefi/proteus/ProteusAnalogTest.java
diff --git a/java_console/build.xml b/java_console/build.xml
index 31fdeed716..70548375bf 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -21,7 +21,7 @@
destdir="autoupdate_build/classes"
classpath="lib/annotations.jar"
>
-
+
@@ -46,10 +46,10 @@
-
+
-
-
+
+
@@ -58,16 +58,16 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -201,8 +201,8 @@
-
-
+
+
@@ -222,8 +222,8 @@
-
-
+
+
diff --git a/java_console/inifile/inifile.iml b/java_console/inifile/inifile.iml
index 61f358d0f8..8cdc1c6a57 100644
--- a/java_console/inifile/inifile.iml
+++ b/java_console/inifile/inifile.iml
@@ -14,5 +14,6 @@
+
\ No newline at end of file
diff --git a/java_console/logging/logging.iml b/java_console/logging/logging.iml
index df2deabda2..6eeefe799c 100644
--- a/java_console/logging/logging.iml
+++ b/java_console/logging/logging.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/main/java/com/rusefi/FileLog.java
similarity index 100%
rename from java_console/logging/src/com/rusefi/FileLog.java
rename to java_console/logging/src/main/java/com/rusefi/FileLog.java
diff --git a/java_console/logging/src/com/rusefi/util/IoUtils.java b/java_console/logging/src/main/java/com/rusefi/util/IoUtils.java
similarity index 100%
rename from java_console/logging/src/com/rusefi/util/IoUtils.java
rename to java_console/logging/src/main/java/com/rusefi/util/IoUtils.java
diff --git a/java_console/logging/src/com/rusefi/util/LazyFile.java b/java_console/logging/src/main/java/com/rusefi/util/LazyFile.java
similarity index 100%
rename from java_console/logging/src/com/rusefi/util/LazyFile.java
rename to java_console/logging/src/main/java/com/rusefi/util/LazyFile.java
diff --git a/java_console/logging/src/com/rusefi/util/Output.java b/java_console/logging/src/main/java/com/rusefi/util/Output.java
similarity index 100%
rename from java_console/logging/src/com/rusefi/util/Output.java
rename to java_console/logging/src/main/java/com/rusefi/util/Output.java
diff --git a/java_console/logging/src/com/rusefi/util/SystemOut.java b/java_console/logging/src/main/java/com/rusefi/util/SystemOut.java
similarity index 100%
rename from java_console/logging/src/com/rusefi/util/SystemOut.java
rename to java_console/logging/src/main/java/com/rusefi/util/SystemOut.java
diff --git a/java_console/romraider/romraider.iml b/java_console/romraider/romraider.iml
index 2dd1ba060a..e3f21c153c 100644
--- a/java_console/romraider/romraider.iml
+++ b/java_console/romraider/romraider.iml
@@ -3,8 +3,8 @@
-
+
diff --git a/java_console/romraider/src/ZoeloeSoft/projects/JFontChooser/JFontChooser.java b/java_console/romraider/src/main/java/ZoeloeSoft/projects/JFontChooser/JFontChooser.java
similarity index 100%
rename from java_console/romraider/src/ZoeloeSoft/projects/JFontChooser/JFontChooser.java
rename to java_console/romraider/src/main/java/ZoeloeSoft/projects/JFontChooser/JFontChooser.java
diff --git a/java_console/romraider/src/com/romraider/ECUExec.java b/java_console/romraider/src/main/java/com/romraider/ECUExec.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/ECUExec.java
rename to java_console/romraider/src/main/java/com/romraider/ECUExec.java
diff --git a/java_console/romraider/src/com/romraider/Settings.java b/java_console/romraider/src/main/java/com/romraider/Settings.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/Settings.java
rename to java_console/romraider/src/main/java/com/romraider/Settings.java
diff --git a/java_console/romraider/src/com/romraider/Version.java b/java_console/romraider/src/main/java/com/romraider/Version.java
similarity index 96%
rename from java_console/romraider/src/com/romraider/Version.java
rename to java_console/romraider/src/main/java/com/romraider/Version.java
index 43996b7b8e..65ddeaae91 100644
--- a/java_console/romraider/src/com/romraider/Version.java
+++ b/java_console/romraider/src/main/java/com/romraider/Version.java
@@ -33,7 +33,7 @@ public final class Version {
// public static final String LOGGER_DEFS_URL = "http://www.romraider.com/forum/topic1642.html";
public static final String CARS_DEFS_URL = "http://www.romraider.com/forum/topic5792.html";
public static final String RELEASE_NOTES = "release_notes.txt";
- public static final ImageIcon ABOUT_ICON = new ImageIcon(Version.class.getClass().getResource("/graphics/romraider-ico-large.gif"));
+ public static final ImageIcon ABOUT_ICON = new ImageIcon(Version.class.getClass().getResource( "/graphics/romraider-ico-large.gif" ));
public static final int MIN_LOG_DEF_VERSION = 155;
private Version() {
diff --git a/java_console/romraider/src/com/romraider/Version.java.template b/java_console/romraider/src/main/java/com/romraider/Version.java.template
similarity index 100%
rename from java_console/romraider/src/com/romraider/Version.java.template
rename to java_console/romraider/src/main/java/com/romraider/Version.java.template
diff --git a/java_console/romraider/src/com/romraider/editor/ecu/ECUEditor.java b/java_console/romraider/src/main/java/com/romraider/editor/ecu/ECUEditor.java
similarity index 99%
rename from java_console/romraider/src/com/romraider/editor/ecu/ECUEditor.java
rename to java_console/romraider/src/main/java/com/romraider/editor/ecu/ECUEditor.java
index e85125ab47..c237e400cc 100644
--- a/java_console/romraider/src/com/romraider/editor/ecu/ECUEditor.java
+++ b/java_console/romraider/src/main/java/com/romraider/editor/ecu/ECUEditor.java
@@ -104,7 +104,7 @@ public class ECUEditor {
private CloseImageWorker closeImageWorker;
private SetUserLevelWorker setUserLevelWorker;
private LaunchLoggerWorker launchLoggerWorker;
- private final ImageIcon editorIcon = new ImageIcon(getClass().getResource("/graphics/romraider-ico.gif"), "RomRaider ECU Editor");
+ private final ImageIcon editorIcon = new ImageIcon(getClass().getResource( "/graphics/romraider-ico.gif" ), "RomRaider ECU Editor");
WindowListener wListenr = new WindowAdapter() {
@Override
diff --git a/java_console/romraider/src/com/romraider/editor/ecu/ECUEditorManager.java b/java_console/romraider/src/main/java/com/romraider/editor/ecu/ECUEditorManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/editor/ecu/ECUEditorManager.java
rename to java_console/romraider/src/main/java/com/romraider/editor/ecu/ECUEditorManager.java
diff --git a/java_console/romraider/src/com/romraider/io/connection/ConnectionManager.java b/java_console/romraider/src/main/java/com/romraider/io/connection/ConnectionManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/io/connection/ConnectionManager.java
rename to java_console/romraider/src/main/java/com/romraider/io/connection/ConnectionManager.java
diff --git a/java_console/romraider/src/com/romraider/io/connection/ConnectionProperties.java b/java_console/romraider/src/main/java/com/romraider/io/connection/ConnectionProperties.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/io/connection/ConnectionProperties.java
rename to java_console/romraider/src/main/java/com/romraider/io/connection/ConnectionProperties.java
diff --git a/java_console/romraider/src/com/romraider/io/connection/ConnectionPropertiesImpl.java b/java_console/romraider/src/main/java/com/romraider/io/connection/ConnectionPropertiesImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/io/connection/ConnectionPropertiesImpl.java
rename to java_console/romraider/src/main/java/com/romraider/io/connection/ConnectionPropertiesImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/car/util/Constants.java b/java_console/romraider/src/main/java/com/romraider/logger/car/util/Constants.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/car/util/Constants.java
rename to java_console/romraider/src/main/java/com/romraider/logger/car/util/Constants.java
diff --git a/java_console/romraider/src/com/romraider/logger/car/util/SpeedCalculator.java b/java_console/romraider/src/main/java/com/romraider/logger/car/util/SpeedCalculator.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/car/util/SpeedCalculator.java
rename to java_console/romraider/src/main/java/com/romraider/logger/car/util/SpeedCalculator.java
diff --git a/java_console/romraider/src/com/romraider/logger/car/util/TorqueCalculator.java b/java_console/romraider/src/main/java/com/romraider/logger/car/util/TorqueCalculator.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/car/util/TorqueCalculator.java
rename to java_console/romraider/src/main/java/com/romraider/logger/car/util/TorqueCalculator.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/EcuLoggerExec.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/EcuLoggerExec.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/EcuLoggerExec.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/EcuLoggerExec.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/learning/LearningTableValues.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/LearningTableValues.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/learning/LearningTableValues.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/LearningTableValues.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/learning/parameter/Parameter.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/parameter/Parameter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/learning/parameter/Parameter.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/parameter/Parameter.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/learning/parameter/ParameterCrossReference.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/parameter/ParameterCrossReference.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/learning/parameter/ParameterCrossReference.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/parameter/ParameterCrossReference.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/learning/parameter/ParameterIdComparator.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/parameter/ParameterIdComparator.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/learning/parameter/ParameterIdComparator.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/learning/parameter/ParameterIdComparator.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/manager/PollingState.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/PollingState.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/manager/PollingState.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/PollingState.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/manager/PollingStateImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/PollingStateImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/manager/PollingStateImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/PollingStateImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/manager/TransmissionManager.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/TransmissionManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/manager/TransmissionManager.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/TransmissionManager.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuInit.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuInit.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuInit.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuInit.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuInitCallback.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuInitCallback.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuInitCallback.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuInitCallback.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuQuery.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuQuery.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuQuery.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuQuery.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/ExternalQuery.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/ExternalQuery.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/ExternalQuery.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/ExternalQuery.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/Query.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/Query.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/Query.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/Query.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/Response.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/Response.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/Response.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/Response.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/ResponseImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/ResponseImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/ResponseImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/ResponseImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/query/SSMEcuInit.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/SSMEcuInit.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/query/SSMEcuInit.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/query/SSMEcuInit.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/readcodes/ReadCodesManager.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/readcodes/ReadCodesManager.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManager.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/comms/reset/ResetManager.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/reset/ResetManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/comms/reset/ResetManager.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/comms/reset/ResetManager.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuAddress.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuAddress.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuAddress.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuAddress.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuAddressImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuAddressImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuAddressImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuAddressImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuData.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuData.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuData.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuData.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDataConvertor.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDataConvertor.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDataConvertor.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDataConvertor.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDataType.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDataType.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDataType.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDataType.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDefinition.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDefinition.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDefinition.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDefinition.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuParameter.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuParameter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuParameter.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuParameter.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EcuSwitch.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuSwitch.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EcuSwitch.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EcuSwitch.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/EvaluateEcuDefinition.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EvaluateEcuDefinition.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/EvaluateEcuDefinition.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/EvaluateEcuDefinition.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/ExternalData.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/ExternalData.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/ExternalData.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/ExternalData.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/LoggerData.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/LoggerData.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/LoggerData.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/LoggerData.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionDocumentLoader.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuDefinitionDocumentLoader.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionDocumentLoader.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuDefinitionDocumentLoader.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionInheritanceList.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuDefinitionInheritanceList.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionInheritanceList.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuDefinitionInheritanceList.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuTableDefinitionHandler.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuTableDefinitionHandler.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/definition/xml/EcuTableDefinitionHandler.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/definition/xml/EcuTableDefinitionHandler.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/ConfigurationException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/ConfigurationException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/ConfigurationException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/ConfigurationException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/FileLoggerException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/FileLoggerException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/FileLoggerException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/FileLoggerException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/InvalidResponseException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/InvalidResponseException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/InvalidResponseException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/InvalidResponseException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/NotConnectedException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/NotConnectedException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/NotConnectedException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/NotConnectedException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/PortNotFoundException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/PortNotFoundException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/PortNotFoundException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/PortNotFoundException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/SerialCommunicationException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/SerialCommunicationException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/SerialCommunicationException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/SerialCommunicationException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfile.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfile.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfile.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfile.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileFileFilter.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileFileFilter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileFileFilter.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileFileFilter.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileItem.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileItem.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileItem.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileItem.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileItemImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileItemImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileItemImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileItemImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileLoader.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileLoader.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileLoader.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileLoader.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/DataRegistrationBroker.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/DataRegistrationBroker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/DataRegistrationBroker.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/DataRegistrationBroker.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/EcuDataComparator.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/EcuDataComparator.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/EcuDataComparator.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/EcuDataComparator.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/StatusChangeListener.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/StatusChangeListener.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/StatusChangeListener.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/StatusChangeListener.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/swing/layout/BetterFlowLayout.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/swing/layout/BetterFlowLayout.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/swing/layout/BetterFlowLayout.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/swing/layout/BetterFlowLayout.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/swing/vertical/VerticalLabelUI.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/swing/vertical/VerticalLabelUI.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/swing/vertical/VerticalLabelUI.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/swing/vertical/VerticalLabelUI.java
diff --git a/java_console/romraider/src/com/romraider/logger/ecu/ui/tab/TableFinder.java b/java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/tab/TableFinder.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/logger/ecu/ui/tab/TableFinder.java
rename to java_console/romraider/src/main/java/com/romraider/logger/ecu/ui/tab/TableFinder.java
diff --git a/java_console/romraider/src/com/romraider/maps/CopySelection2DWorker.java b/java_console/romraider/src/main/java/com/romraider/maps/CopySelection2DWorker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/CopySelection2DWorker.java
rename to java_console/romraider/src/main/java/com/romraider/maps/CopySelection2DWorker.java
diff --git a/java_console/romraider/src/com/romraider/maps/CopySelectionWorker.java b/java_console/romraider/src/main/java/com/romraider/maps/CopySelectionWorker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/CopySelectionWorker.java
rename to java_console/romraider/src/main/java/com/romraider/maps/CopySelectionWorker.java
diff --git a/java_console/romraider/src/com/romraider/maps/CopyTable2DWorker.java b/java_console/romraider/src/main/java/com/romraider/maps/CopyTable2DWorker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/CopyTable2DWorker.java
rename to java_console/romraider/src/main/java/com/romraider/maps/CopyTable2DWorker.java
diff --git a/java_console/romraider/src/com/romraider/maps/CopyTableWorker.java b/java_console/romraider/src/main/java/com/romraider/maps/CopyTableWorker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/CopyTableWorker.java
rename to java_console/romraider/src/main/java/com/romraider/maps/CopyTableWorker.java
diff --git a/java_console/romraider/src/com/romraider/maps/DataCell.java b/java_console/romraider/src/main/java/com/romraider/maps/DataCell.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/DataCell.java
rename to java_console/romraider/src/main/java/com/romraider/maps/DataCell.java
diff --git a/java_console/romraider/src/com/romraider/maps/Rom.java b/java_console/romraider/src/main/java/com/romraider/maps/Rom.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/Rom.java
rename to java_console/romraider/src/main/java/com/romraider/maps/Rom.java
diff --git a/java_console/romraider/src/com/romraider/maps/RomChecksum.java b/java_console/romraider/src/main/java/com/romraider/maps/RomChecksum.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/RomChecksum.java
rename to java_console/romraider/src/main/java/com/romraider/maps/RomChecksum.java
diff --git a/java_console/romraider/src/com/romraider/maps/RomID.java b/java_console/romraider/src/main/java/com/romraider/maps/RomID.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/RomID.java
rename to java_console/romraider/src/main/java/com/romraider/maps/RomID.java
diff --git a/java_console/romraider/src/com/romraider/maps/Scale.java b/java_console/romraider/src/main/java/com/romraider/maps/Scale.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/Scale.java
rename to java_console/romraider/src/main/java/com/romraider/maps/Scale.java
diff --git a/java_console/romraider/src/com/romraider/maps/Table.java b/java_console/romraider/src/main/java/com/romraider/maps/Table.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/Table.java
rename to java_console/romraider/src/main/java/com/romraider/maps/Table.java
diff --git a/java_console/romraider/src/com/romraider/maps/Table1D.java b/java_console/romraider/src/main/java/com/romraider/maps/Table1D.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/Table1D.java
rename to java_console/romraider/src/main/java/com/romraider/maps/Table1D.java
diff --git a/java_console/romraider/src/com/romraider/maps/Table2D.java b/java_console/romraider/src/main/java/com/romraider/maps/Table2D.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/Table2D.java
rename to java_console/romraider/src/main/java/com/romraider/maps/Table2D.java
diff --git a/java_console/romraider/src/com/romraider/maps/Table3D.java b/java_console/romraider/src/main/java/com/romraider/maps/Table3D.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/Table3D.java
rename to java_console/romraider/src/main/java/com/romraider/maps/Table3D.java
diff --git a/java_console/romraider/src/com/romraider/maps/TableSwitch.java b/java_console/romraider/src/main/java/com/romraider/maps/TableSwitch.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/TableSwitch.java
rename to java_console/romraider/src/main/java/com/romraider/maps/TableSwitch.java
diff --git a/java_console/romraider/src/com/romraider/maps/TableWithData.java b/java_console/romraider/src/main/java/com/romraider/maps/TableWithData.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/maps/TableWithData.java
rename to java_console/romraider/src/main/java/com/romraider/maps/TableWithData.java
diff --git a/java_console/romraider/src/com/romraider/net/BrowserControl.java b/java_console/romraider/src/main/java/com/romraider/net/BrowserControl.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/net/BrowserControl.java
rename to java_console/romraider/src/main/java/com/romraider/net/BrowserControl.java
diff --git a/java_console/romraider/src/com/romraider/net/URL.java b/java_console/romraider/src/main/java/com/romraider/net/URL.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/net/URL.java
rename to java_console/romraider/src/main/java/com/romraider/net/URL.java
diff --git a/java_console/romraider/src/com/romraider/swing/AbstractFrame.java b/java_console/romraider/src/main/java/com/romraider/swing/AbstractFrame.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/AbstractFrame.java
rename to java_console/romraider/src/main/java/com/romraider/swing/AbstractFrame.java
diff --git a/java_console/romraider/src/com/romraider/swing/CategoryTreeNode.java b/java_console/romraider/src/main/java/com/romraider/swing/CategoryTreeNode.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/CategoryTreeNode.java
rename to java_console/romraider/src/main/java/com/romraider/swing/CategoryTreeNode.java
diff --git a/java_console/romraider/src/com/romraider/swing/CompareImagesForm.java b/java_console/romraider/src/main/java/com/romraider/swing/CompareImagesForm.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/CompareImagesForm.java
rename to java_console/romraider/src/main/java/com/romraider/swing/CompareImagesForm.java
diff --git a/java_console/romraider/src/com/romraider/swing/CustomToolbarLayout.java b/java_console/romraider/src/main/java/com/romraider/swing/CustomToolbarLayout.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/CustomToolbarLayout.java
rename to java_console/romraider/src/main/java/com/romraider/swing/CustomToolbarLayout.java
diff --git a/java_console/romraider/src/com/romraider/swing/DebugPanel.java b/java_console/romraider/src/main/java/com/romraider/swing/DebugPanel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/DebugPanel.java
rename to java_console/romraider/src/main/java/com/romraider/swing/DebugPanel.java
diff --git a/java_console/romraider/src/com/romraider/swing/DefinitionManager.java b/java_console/romraider/src/main/java/com/romraider/swing/DefinitionManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/DefinitionManager.java
rename to java_console/romraider/src/main/java/com/romraider/swing/DefinitionManager.java
diff --git a/java_console/romraider/src/com/romraider/swing/ECUEditorMenuBar.java b/java_console/romraider/src/main/java/com/romraider/swing/ECUEditorMenuBar.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/ECUEditorMenuBar.java
rename to java_console/romraider/src/main/java/com/romraider/swing/ECUEditorMenuBar.java
diff --git a/java_console/romraider/src/com/romraider/swing/ECUEditorToolBar.java b/java_console/romraider/src/main/java/com/romraider/swing/ECUEditorToolBar.java
similarity index 96%
rename from java_console/romraider/src/com/romraider/swing/ECUEditorToolBar.java
rename to java_console/romraider/src/main/java/com/romraider/swing/ECUEditorToolBar.java
index 3e6b847bcd..d1c06443ea 100644
--- a/java_console/romraider/src/com/romraider/swing/ECUEditorToolBar.java
+++ b/java_console/romraider/src/main/java/com/romraider/swing/ECUEditorToolBar.java
@@ -108,9 +108,9 @@ public class ECUEditorToolBar extends JToolBar {
public void updateIcons() {
int iconScale = getSettings().getEditorIconScale();
// saveImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource("/graphics/icon-save.png")), iconScale));
- uploadImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource("/com/rusefi/upload48.jpg")), iconScale));
- downloadImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource("/com/rusefi/download48.jpg")), iconScale));
- burnImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource("/com/rusefi/writeconfig48.jpg")), iconScale));
+ uploadImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource( "/upload48.jpg" )), iconScale));
+ downloadImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource( "/download48.jpg" )), iconScale));
+ burnImage.setIcon(rescaleImageIcon(new ImageIcon(getClass().getResource( "/writeconfig48.jpg" )), iconScale));
// closeImage.setIcon(rescaleImageIcon(new ImageIcon( getClass().getResource("/graphics/icon-close.png")), iconScale));
repaint();
}
diff --git a/java_console/romraider/src/com/romraider/swing/ECUImageFilter.java b/java_console/romraider/src/main/java/com/romraider/swing/ECUImageFilter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/ECUImageFilter.java
rename to java_console/romraider/src/main/java/com/romraider/swing/ECUImageFilter.java
diff --git a/java_console/romraider/src/com/romraider/swing/GenericFileFilter.java b/java_console/romraider/src/main/java/com/romraider/swing/GenericFileFilter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/GenericFileFilter.java
rename to java_console/romraider/src/main/java/com/romraider/swing/GenericFileFilter.java
diff --git a/java_console/romraider/src/com/romraider/swing/JProgressPane.java b/java_console/romraider/src/main/java/com/romraider/swing/JProgressPane.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/JProgressPane.java
rename to java_console/romraider/src/main/java/com/romraider/swing/JProgressPane.java
diff --git a/java_console/romraider/src/com/romraider/swing/JTableChooser.java b/java_console/romraider/src/main/java/com/romraider/swing/JTableChooser.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/JTableChooser.java
rename to java_console/romraider/src/main/java/com/romraider/swing/JTableChooser.java
diff --git a/java_console/romraider/src/com/romraider/swing/LookAndFeelManager.java b/java_console/romraider/src/main/java/com/romraider/swing/LookAndFeelManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/LookAndFeelManager.java
rename to java_console/romraider/src/main/java/com/romraider/swing/LookAndFeelManager.java
diff --git a/java_console/romraider/src/com/romraider/swing/MDIDesktopPane.java b/java_console/romraider/src/main/java/com/romraider/swing/MDIDesktopPane.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/MDIDesktopPane.java
rename to java_console/romraider/src/main/java/com/romraider/swing/MDIDesktopPane.java
diff --git a/java_console/romraider/src/com/romraider/swing/ParameterIdsTableModel.java b/java_console/romraider/src/main/java/com/romraider/swing/ParameterIdsTableModel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/ParameterIdsTableModel.java
rename to java_console/romraider/src/main/java/com/romraider/swing/ParameterIdsTableModel.java
diff --git a/java_console/romraider/src/com/romraider/swing/RomCellRenderer.java b/java_console/romraider/src/main/java/com/romraider/swing/RomCellRenderer.java
similarity index 94%
rename from java_console/romraider/src/com/romraider/swing/RomCellRenderer.java
rename to java_console/romraider/src/main/java/com/romraider/swing/RomCellRenderer.java
index b6186bd16b..1f85bc65ec 100644
--- a/java_console/romraider/src/com/romraider/swing/RomCellRenderer.java
+++ b/java_console/romraider/src/main/java/com/romraider/swing/RomCellRenderer.java
@@ -110,13 +110,13 @@ public class RomCellRenderer implements TreeCellRenderer {
// display icon
if (table.getType() == Settings.TABLE_1D) {
- tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource("/graphics/1d.gif")), JLabel.LEFT);
+ tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource( "/graphics/1d.gif" )), JLabel.LEFT);
} else if (table.getType() == Settings.TABLE_2D) {
- tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource("/graphics/2d.gif")), JLabel.LEFT);
+ tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource( "/graphics/2d.gif" )), JLabel.LEFT);
} else if (table.getType() == Settings.TABLE_3D) {
- tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource("/graphics/3d.gif")), JLabel.LEFT);
+ tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource( "/graphics/3d.gif" )), JLabel.LEFT);
} else if (table.getType() == Settings.TABLE_SWITCH) {
- tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource("/graphics/switch.gif")), JLabel.LEFT);
+ tableName = new JLabel(table.getName() + " ", new ImageIcon(getClass().getResource( "/graphics/switch.gif" )), JLabel.LEFT);
}
// set color
diff --git a/java_console/romraider/src/com/romraider/swing/RomPropertyPanel.java b/java_console/romraider/src/main/java/com/romraider/swing/RomPropertyPanel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/RomPropertyPanel.java
rename to java_console/romraider/src/main/java/com/romraider/swing/RomPropertyPanel.java
diff --git a/java_console/romraider/src/com/romraider/swing/RomTree.java b/java_console/romraider/src/main/java/com/romraider/swing/RomTree.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/RomTree.java
rename to java_console/romraider/src/main/java/com/romraider/swing/RomTree.java
diff --git a/java_console/romraider/src/com/romraider/swing/RomTreeRootNode.java b/java_console/romraider/src/main/java/com/romraider/swing/RomTreeRootNode.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/RomTreeRootNode.java
rename to java_console/romraider/src/main/java/com/romraider/swing/RomTreeRootNode.java
diff --git a/java_console/romraider/src/com/romraider/swing/ScalesTableModel.java b/java_console/romraider/src/main/java/com/romraider/swing/ScalesTableModel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/ScalesTableModel.java
rename to java_console/romraider/src/main/java/com/romraider/swing/ScalesTableModel.java
diff --git a/java_console/romraider/src/com/romraider/swing/SetFont.java b/java_console/romraider/src/main/java/com/romraider/swing/SetFont.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/SetFont.java
rename to java_console/romraider/src/main/java/com/romraider/swing/SetFont.java
diff --git a/java_console/romraider/src/com/romraider/swing/SettingsForm.java b/java_console/romraider/src/main/java/com/romraider/swing/SettingsForm.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/SettingsForm.java
rename to java_console/romraider/src/main/java/com/romraider/swing/SettingsForm.java
diff --git a/java_console/romraider/src/com/romraider/swing/SwitchStateTableModel.java b/java_console/romraider/src/main/java/com/romraider/swing/SwitchStateTableModel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/SwitchStateTableModel.java
rename to java_console/romraider/src/main/java/com/romraider/swing/SwitchStateTableModel.java
diff --git a/java_console/romraider/src/com/romraider/swing/TableChooserTreeNode.java b/java_console/romraider/src/main/java/com/romraider/swing/TableChooserTreeNode.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/TableChooserTreeNode.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TableChooserTreeNode.java
diff --git a/java_console/romraider/src/com/romraider/swing/TableFrame.java b/java_console/romraider/src/main/java/com/romraider/swing/TableFrame.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/TableFrame.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TableFrame.java
diff --git a/java_console/romraider/src/com/romraider/swing/TableMenuBar.java b/java_console/romraider/src/main/java/com/romraider/swing/TableMenuBar.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/TableMenuBar.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TableMenuBar.java
diff --git a/java_console/romraider/src/com/romraider/swing/TableMenuItem.java b/java_console/romraider/src/main/java/com/romraider/swing/TableMenuItem.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/TableMenuItem.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TableMenuItem.java
diff --git a/java_console/romraider/src/com/romraider/swing/TablePropertyPanel.java b/java_console/romraider/src/main/java/com/romraider/swing/TablePropertyPanel.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/TablePropertyPanel.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TablePropertyPanel.java
diff --git a/java_console/romraider/src/com/romraider/swing/TableToolBar.java b/java_console/romraider/src/main/java/com/romraider/swing/TableToolBar.java
similarity index 98%
rename from java_console/romraider/src/com/romraider/swing/TableToolBar.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TableToolBar.java
index afce537c5e..9125a58983 100644
--- a/java_console/romraider/src/com/romraider/swing/TableToolBar.java
+++ b/java_console/romraider/src/main/java/com/romraider/swing/TableToolBar.java
@@ -100,13 +100,13 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene
// private final JButton clearOverlay = new JButton("Clear Overlay");
private final JLabel liveDataValue = new JLabel();
- private final URL incrementFineImage = getClass().getResource("/graphics/icon-incfine.png");
- private final URL decrementFineImage = getClass().getResource("/graphics/icon-decfine.png");
- private final URL incrementCoarseImage = getClass().getResource("/graphics/icon-inccoarse.png");
- private final URL decrementCoarseImage = getClass().getResource("/graphics/icon-deccoarse.png");
- private final URL enable3dImage = getClass().getResource("/graphics/3d_render.png");
- private final URL colorCellImage = getClass().getResource("/graphics/icon-palette.png");
- private final URL refreshCompareImage = getClass().getResource("/graphics/table_refresh.png");
+ private final URL incrementFineImage = getClass().getResource( "/graphics/icon-incfine.png" );
+ private final URL decrementFineImage = getClass().getResource( "/graphics/icon-decfine.png" );
+ private final URL incrementCoarseImage = getClass().getResource( "/graphics/icon-inccoarse.png" );
+ private final URL decrementCoarseImage = getClass().getResource( "/graphics/icon-deccoarse.png" );
+ private final URL enable3dImage = getClass().getResource( "/graphics/3d_render.png" );
+ private final URL colorCellImage = getClass().getResource( "/graphics/icon-palette.png" );
+ private final URL refreshCompareImage = getClass().getResource( "/graphics/table_refresh.png" );
private final TitledBorder toolbarBorder = BorderFactory.createTitledBorder(Settings.defaultTableToolBarName);
diff --git a/java_console/romraider/src/com/romraider/swing/TableTreeNode.java b/java_console/romraider/src/main/java/com/romraider/swing/TableTreeNode.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/TableTreeNode.java
rename to java_console/romraider/src/main/java/com/romraider/swing/TableTreeNode.java
diff --git a/java_console/romraider/src/com/romraider/swing/XMLFilter.java b/java_console/romraider/src/main/java/com/romraider/swing/XMLFilter.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/XMLFilter.java
rename to java_console/romraider/src/main/java/com/romraider/swing/XMLFilter.java
diff --git a/java_console/romraider/src/com/romraider/swing/menubar/Menu.java b/java_console/romraider/src/main/java/com/romraider/swing/menubar/Menu.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/menubar/Menu.java
rename to java_console/romraider/src/main/java/com/romraider/swing/menubar/Menu.java
diff --git a/java_console/romraider/src/com/romraider/swing/menubar/MenuItem.java b/java_console/romraider/src/main/java/com/romraider/swing/menubar/MenuItem.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/swing/menubar/MenuItem.java
rename to java_console/romraider/src/main/java/com/romraider/swing/menubar/MenuItem.java
diff --git a/java_console/romraider/src/com/romraider/util/AxisRange.java b/java_console/romraider/src/main/java/com/romraider/util/AxisRange.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/AxisRange.java
rename to java_console/romraider/src/main/java/com/romraider/util/AxisRange.java
diff --git a/java_console/romraider/src/com/romraider/util/ByteUtil.java b/java_console/romraider/src/main/java/com/romraider/util/ByteUtil.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/ByteUtil.java
rename to java_console/romraider/src/main/java/com/romraider/util/ByteUtil.java
diff --git a/java_console/romraider/src/com/romraider/util/ColorScaler.java b/java_console/romraider/src/main/java/com/romraider/util/ColorScaler.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/ColorScaler.java
rename to java_console/romraider/src/main/java/com/romraider/util/ColorScaler.java
diff --git a/java_console/romraider/src/com/romraider/util/FormatFilename.java b/java_console/romraider/src/main/java/com/romraider/util/FormatFilename.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/FormatFilename.java
rename to java_console/romraider/src/main/java/com/romraider/util/FormatFilename.java
diff --git a/java_console/romraider/src/com/romraider/util/HexUtil.java b/java_console/romraider/src/main/java/com/romraider/util/HexUtil.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/HexUtil.java
rename to java_console/romraider/src/main/java/com/romraider/util/HexUtil.java
diff --git a/java_console/romraider/src/com/romraider/util/JEPUtil.java b/java_console/romraider/src/main/java/com/romraider/util/JEPUtil.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/JEPUtil.java
rename to java_console/romraider/src/main/java/com/romraider/util/JEPUtil.java
diff --git a/java_console/romraider/src/com/romraider/util/JREChecker.java b/java_console/romraider/src/main/java/com/romraider/util/JREChecker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/JREChecker.java
rename to java_console/romraider/src/main/java/com/romraider/util/JREChecker.java
diff --git a/java_console/romraider/src/com/romraider/util/LogManager.java b/java_console/romraider/src/main/java/com/romraider/util/LogManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/LogManager.java
rename to java_console/romraider/src/main/java/com/romraider/util/LogManager.java
diff --git a/java_console/romraider/src/com/romraider/util/MD5Checksum.java b/java_console/romraider/src/main/java/com/romraider/util/MD5Checksum.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/MD5Checksum.java
rename to java_console/romraider/src/main/java/com/romraider/util/MD5Checksum.java
diff --git a/java_console/romraider/src/com/romraider/util/ObjectCloner.java b/java_console/romraider/src/main/java/com/romraider/util/ObjectCloner.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/ObjectCloner.java
rename to java_console/romraider/src/main/java/com/romraider/util/ObjectCloner.java
diff --git a/java_console/romraider/src/com/romraider/util/ParamChecker.java b/java_console/romraider/src/main/java/com/romraider/util/ParamChecker.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/ParamChecker.java
rename to java_console/romraider/src/main/java/com/romraider/util/ParamChecker.java
diff --git a/java_console/romraider/src/com/romraider/util/Platform.java b/java_console/romraider/src/main/java/com/romraider/util/Platform.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/Platform.java
rename to java_console/romraider/src/main/java/com/romraider/util/Platform.java
diff --git a/java_console/romraider/src/com/romraider/util/SaxParserFactory.java b/java_console/romraider/src/main/java/com/romraider/util/SaxParserFactory.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/SaxParserFactory.java
rename to java_console/romraider/src/main/java/com/romraider/util/SaxParserFactory.java
diff --git a/java_console/romraider/src/com/romraider/util/SettingsManager.java b/java_console/romraider/src/main/java/com/romraider/util/SettingsManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/SettingsManager.java
rename to java_console/romraider/src/main/java/com/romraider/util/SettingsManager.java
diff --git a/java_console/romraider/src/com/romraider/util/ThreadCheckingRepaintManager.java b/java_console/romraider/src/main/java/com/romraider/util/ThreadCheckingRepaintManager.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/ThreadCheckingRepaintManager.java
rename to java_console/romraider/src/main/java/com/romraider/util/ThreadCheckingRepaintManager.java
diff --git a/java_console/romraider/src/com/romraider/util/ThreadUtil.java b/java_console/romraider/src/main/java/com/romraider/util/ThreadUtil.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/ThreadUtil.java
rename to java_console/romraider/src/main/java/com/romraider/util/ThreadUtil.java
diff --git a/java_console/romraider/src/com/romraider/util/proxy/Proxifier.java b/java_console/romraider/src/main/java/com/romraider/util/proxy/Proxifier.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/proxy/Proxifier.java
rename to java_console/romraider/src/main/java/com/romraider/util/proxy/Proxifier.java
diff --git a/java_console/romraider/src/com/romraider/util/proxy/TimerWrapper.java b/java_console/romraider/src/main/java/com/romraider/util/proxy/TimerWrapper.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/proxy/TimerWrapper.java
rename to java_console/romraider/src/main/java/com/romraider/util/proxy/TimerWrapper.java
diff --git a/java_console/romraider/src/com/romraider/util/proxy/Wrapper.java b/java_console/romraider/src/main/java/com/romraider/util/proxy/Wrapper.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/util/proxy/Wrapper.java
rename to java_console/romraider/src/main/java/com/romraider/util/proxy/Wrapper.java
diff --git a/java_console/romraider/src/com/romraider/xml/DOMHelper.java b/java_console/romraider/src/main/java/com/romraider/xml/DOMHelper.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/DOMHelper.java
rename to java_console/romraider/src/main/java/com/romraider/xml/DOMHelper.java
diff --git a/java_console/romraider/src/com/romraider/xml/DOMRomUnmarshaller.java b/java_console/romraider/src/main/java/com/romraider/xml/DOMRomUnmarshaller.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/DOMRomUnmarshaller.java
rename to java_console/romraider/src/main/java/com/romraider/xml/DOMRomUnmarshaller.java
diff --git a/java_console/romraider/src/com/romraider/xml/DOMSettingsBuilder.java b/java_console/romraider/src/main/java/com/romraider/xml/DOMSettingsBuilder.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/DOMSettingsBuilder.java
rename to java_console/romraider/src/main/java/com/romraider/xml/DOMSettingsBuilder.java
diff --git a/java_console/romraider/src/com/romraider/xml/DOMSettingsUnmarshaller.java b/java_console/romraider/src/main/java/com/romraider/xml/DOMSettingsUnmarshaller.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/DOMSettingsUnmarshaller.java
rename to java_console/romraider/src/main/java/com/romraider/xml/DOMSettingsUnmarshaller.java
diff --git a/java_console/romraider/src/com/romraider/xml/InvalidTableNameException.java b/java_console/romraider/src/main/java/com/romraider/xml/InvalidTableNameException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/InvalidTableNameException.java
rename to java_console/romraider/src/main/java/com/romraider/xml/InvalidTableNameException.java
diff --git a/java_console/romraider/src/com/romraider/xml/RomAttributeParser.java b/java_console/romraider/src/main/java/com/romraider/xml/RomAttributeParser.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/RomAttributeParser.java
rename to java_console/romraider/src/main/java/com/romraider/xml/RomAttributeParser.java
diff --git a/java_console/romraider/src/com/romraider/xml/RomNotFoundException.java b/java_console/romraider/src/main/java/com/romraider/xml/RomNotFoundException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/RomNotFoundException.java
rename to java_console/romraider/src/main/java/com/romraider/xml/RomNotFoundException.java
diff --git a/java_console/romraider/src/com/romraider/xml/TableIsOmittedException.java b/java_console/romraider/src/main/java/com/romraider/xml/TableIsOmittedException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/TableIsOmittedException.java
rename to java_console/romraider/src/main/java/com/romraider/xml/TableIsOmittedException.java
diff --git a/java_console/romraider/src/com/romraider/xml/TableNotFoundException.java b/java_console/romraider/src/main/java/com/romraider/xml/TableNotFoundException.java
similarity index 100%
rename from java_console/romraider/src/com/romraider/xml/TableNotFoundException.java
rename to java_console/romraider/src/main/java/com/romraider/xml/TableNotFoundException.java
diff --git a/java_console/shared_ui/shared_ui.iml b/java_console/shared_ui/shared_ui.iml
index 94a76fec0f..596d393ebd 100644
--- a/java_console/shared_ui/shared_ui.iml
+++ b/java_console/shared_ui/shared_ui.iml
@@ -3,8 +3,8 @@
-
+
diff --git a/java_console/shared_ui/src/com/rusefi/tools/online/Online.java b/java_console/shared_ui/src/main/java/com/rusefi/tools/online/Online.java
similarity index 100%
rename from java_console/shared_ui/src/com/rusefi/tools/online/Online.java
rename to java_console/shared_ui/src/main/java/com/rusefi/tools/online/Online.java
diff --git a/java_console/shared_ui/src/com/rusefi/tools/online/UploadResult.java b/java_console/shared_ui/src/main/java/com/rusefi/tools/online/UploadResult.java
similarity index 100%
rename from java_console/shared_ui/src/com/rusefi/tools/online/UploadResult.java
rename to java_console/shared_ui/src/main/java/com/rusefi/tools/online/UploadResult.java
diff --git a/java_console/shared_ui/src/com/rusefi/ts_plugin/AudioPlayback.java b/java_console/shared_ui/src/main/java/com/rusefi/ts_plugin/AudioPlayback.java
similarity index 100%
rename from java_console/shared_ui/src/com/rusefi/ts_plugin/AudioPlayback.java
rename to java_console/shared_ui/src/main/java/com/rusefi/ts_plugin/AudioPlayback.java
diff --git a/java_console/shared_ui/src/com/rusefi/ui/AuthTokenPanel.java b/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java
similarity index 100%
rename from java_console/shared_ui/src/com/rusefi/ui/AuthTokenPanel.java
rename to java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java
diff --git a/java_console/shared_ui/src/com/rusefi/ui/util/Misc.java b/java_console/shared_ui/src/main/java/com/rusefi/ui/util/Misc.java
similarity index 100%
rename from java_console/shared_ui/src/com/rusefi/ui/util/Misc.java
rename to java_console/shared_ui/src/main/java/com/rusefi/ui/util/Misc.java
diff --git a/java_console/shared_ui/src/com/rusefi/ui/util/URLLabel.java b/java_console/shared_ui/src/main/java/com/rusefi/ui/util/URLLabel.java
similarity index 100%
rename from java_console/shared_ui/src/com/rusefi/ui/util/URLLabel.java
rename to java_console/shared_ui/src/main/java/com/rusefi/ui/util/URLLabel.java
diff --git a/java_console/tools/src/com/irnems/AdcFilter.java b/java_console/tools/src/main/java/com/irnems/AdcFilter.java
similarity index 100%
rename from java_console/tools/src/com/irnems/AdcFilter.java
rename to java_console/tools/src/main/java/com/irnems/AdcFilter.java
diff --git a/java_console/tools/src/com/irnems/MedianFilter.java b/java_console/tools/src/main/java/com/irnems/MedianFilter.java
similarity index 100%
rename from java_console/tools/src/com/irnems/MedianFilter.java
rename to java_console/tools/src/main/java/com/irnems/MedianFilter.java
diff --git a/java_console/tools/src/com/irnems/SimpleFilter.java b/java_console/tools/src/main/java/com/irnems/SimpleFilter.java
similarity index 100%
rename from java_console/tools/src/com/irnems/SimpleFilter.java
rename to java_console/tools/src/main/java/com/irnems/SimpleFilter.java
diff --git a/java_console/tools/src/com/irnems/file/FrequencyDivider.java b/java_console/tools/src/main/java/com/irnems/file/FrequencyDivider.java
similarity index 100%
rename from java_console/tools/src/com/irnems/file/FrequencyDivider.java
rename to java_console/tools/src/main/java/com/irnems/file/FrequencyDivider.java
diff --git a/java_console/tools/tools.iml b/java_console/tools/tools.iml
index 0421a0e4cd..22128b9495 100644
--- a/java_console/tools/tools.iml
+++ b/java_console/tools/tools.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/bin2header/Bin2Header.iml b/java_tools/bin2header/Bin2Header.iml
index d5c0743275..08ae11a0bc 100644
--- a/java_tools/bin2header/Bin2Header.iml
+++ b/java_tools/bin2header/Bin2Header.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/bin2header/build.xml b/java_tools/bin2header/build.xml
index bbb45c0cab..f51537bee3 100644
--- a/java_tools/bin2header/build.xml
+++ b/java_tools/bin2header/build.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/java_tools/bin2header/src/rusefi/Bin2Header.java b/java_tools/bin2header/src/main/java/rusefi/Bin2Header.java
similarity index 100%
rename from java_tools/bin2header/src/rusefi/Bin2Header.java
rename to java_tools/bin2header/src/main/java/rusefi/Bin2Header.java
diff --git a/java_tools/configuration_definition/build.xml b/java_tools/configuration_definition/build.xml
index 840b05baa0..5e35ef04dc 100644
--- a/java_tools/configuration_definition/build.xml
+++ b/java_tools/configuration_definition/build.xml
@@ -9,7 +9,7 @@
-
+
@@ -20,14 +20,14 @@
target="${javac.target}"
destdir="build/classes"
classpath="${console_path}/lib/jsr305-2.0.1.jar:lib/junit.jar:../../java_console/lib/annotations.jar:lib/snakeyaml.jar:lib/antlr-4.5-complete.jar">
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
diff --git a/java_tools/configuration_definition/configuration_definition.iml b/java_tools/configuration_definition/configuration_definition.iml
index 3f08362726..513d52fef1 100644
--- a/java_tools/configuration_definition/configuration_definition.iml
+++ b/java_tools/configuration_definition/configuration_definition.iml
@@ -3,13 +3,12 @@
-
+
-
@@ -23,5 +22,6 @@
+
\ No newline at end of file
diff --git a/java_tools/configuration_definition/src/com/rusefi/.gitignore b/java_tools/configuration_definition/src/main/java/com/rusefi/.gitignore
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/.gitignore
rename to java_tools/configuration_definition/src/main/java/com/rusefi/.gitignore
diff --git a/java_tools/configuration_definition/src/com/rusefi/BitState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/BitState.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/BitState.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/BitState.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ConfigField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ConfigField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigStructure.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ConfigStructure.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/FiringOrderTSLogic.java b/java_tools/configuration_definition/src/main/java/com/rusefi/FiringOrderTSLogic.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/FiringOrderTSLogic.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/FiringOrderTSLogic.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/PinType.java b/java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/PinType.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ReaderState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ReaderState.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/TriggerProcessor.java b/java_tools/configuration_definition/src/main/java/com/rusefi/TriggerProcessor.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/TriggerProcessor.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/TriggerProcessor.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/TsFileContent.java b/java_tools/configuration_definition/src/main/java/com/rusefi/TsFileContent.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/TsFileContent.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/TsFileContent.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/TypesHelper.java b/java_tools/configuration_definition/src/main/java/com/rusefi/TypesHelper.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/TypesHelper.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/TypesHelper.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/main/java/com/rusefi/VariableRegistry.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/VariableRegistry.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/ConfigRequest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/ConfigRequest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/ConfigRequest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/ConfigRequest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/FieldReference.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/FieldReference.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/FieldReference.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/FieldReference.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/FieldRequest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/FieldRequest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/FieldRequest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/FieldRequest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/IfRequest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/IfRequest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/IfRequest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/IfRequest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/LiveDocsMetaParser.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDocsMetaParser.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/LiveDocsMetaParser.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDocsMetaParser.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/MetaInfo.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/MetaInfo.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/MetaInfo.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/MetaInfo.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/Request.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/Request.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/Request.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/Request.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/SensorRequest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/SensorRequest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/SensorRequest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/SensorRequest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/TextRequest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/TextRequest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/TextRequest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/TextRequest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/UsagesReader.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/UsagesReader.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/test/LiveDocsMetaParserTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/ParseState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/ParseState.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/ArrayIterateScalarLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ArrayIterateScalarLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/ArrayIterateScalarLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ArrayIterateScalarLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/ArrayIterateStructLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ArrayIterateStructLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/ArrayIterateStructLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ArrayIterateStructLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/ArrayLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ArrayLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/ArrayLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ArrayLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/BitGroupLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/BitGroupLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/BitGroupLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/BitGroupLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/EnumLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/EnumLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/EnumLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/EnumLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/Layout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/Layout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/Layout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/Layout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/ScalarLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ScalarLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/ScalarLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/ScalarLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/StringLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/StringLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/StringLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/StringLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/StructLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/StructLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/StructLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/StructLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/StructNamePrefixer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/StructNamePrefixer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/StructNamePrefixer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/StructNamePrefixer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/UnionLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/UnionLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/UnionLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/UnionLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/layout/UnusedLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/UnusedLayout.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/layout/UnusedLayout.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/UnusedLayout.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/outputs/CStructWriter.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/outputs/CStructWriter.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/outputs/CStructWriter.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/outputs/CStructWriter.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/outputs/TsMetadata.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/outputs/TsMetadata.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/outputs/TsMetadata.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/outputs/TsMetadata.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/outputs/TsWriter.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/outputs/TsWriter.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/outputs/TsWriter.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/outputs/TsWriter.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ArrayField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ArrayField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ArrayTypedef.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayTypedef.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ArrayTypedef.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayTypedef.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/BitField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/BitField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/BitField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/BitField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/BitGroup.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/BitGroup.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/BitGroup.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/BitGroup.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Definition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Definition.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Definition.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Definition.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/EnumField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/EnumField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/EnumField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/EnumField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/EnumTypedef.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/EnumTypedef.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/EnumTypedef.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/EnumTypedef.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Field.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Field.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Field.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Field.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/FieldOptions.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/FieldOptions.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/FieldOptions.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/FieldOptions.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/PrototypeField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/PrototypeField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/PrototypeField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/PrototypeField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ScalarField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ScalarField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ScalarField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ScalarField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ScalarTypedef.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ScalarTypedef.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/ScalarTypedef.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ScalarTypedef.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/StringField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/StringField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/StringField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/StringField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/StringTypedef.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/StringTypedef.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/StringTypedef.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/StringTypedef.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Struct.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Struct.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Struct.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Struct.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/StructField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/StructField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/StructField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/StructField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Type.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Type.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Type.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Type.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Typedef.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Typedef.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Typedef.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Typedef.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Union.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Union.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/Union.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Union.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/newparse/parsing/UnusedField.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/UnusedField.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/newparse/parsing/UnusedField.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/UnusedField.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/BaseCHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/BaseCHeaderConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/CHeaderConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/CHeaderConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/ConfigurationConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/ConfigurationConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigurationConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/FileFsioSettingsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FileFsioSettingsConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/FileFsioSettingsConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/FileFsioSettingsConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/FileJavaFieldsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/FileJavaFieldsConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/FsioSettingsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FsioSettingsConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/FsioSettingsConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/FsioSettingsConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/JavaFieldsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/JavaFieldsConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/SignatureConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/SignatureConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/BitParsingTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/BitParsingTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/BitParsingTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/BitParsingTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionOutputTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionOutputTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionOutputTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionOutputTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigDefinitionTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserIssue1057Test.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserIssue1057Test.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/ConfigFieldParserTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/FiringOrderTSLogicTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/FiringOrderTSLogicTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/FiringOrderTSLogicTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/FiringOrderTSLogicTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/TSProjectConsumerTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/TSProjectConsumerTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/TSProjectConsumerTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/TSProjectConsumerTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/TestJavaFieldsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/TestJavaFieldsConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/TestJavaFieldsConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/TestJavaFieldsConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/TestTSProjectConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/TestTSProjectConsumer.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/TestTSProjectConsumer.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/TestTSProjectConsumer.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/VariableRegistryTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/VariableRegistryTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/VariableRegistryTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/integration/IntegrationTest.java b/java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/IntegrationTest.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/integration/IntegrationTest.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/IntegrationTest.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/integration/define.txt b/java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/define.txt
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/integration/define.txt
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/define.txt
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/integration/output.ini b/java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/output.ini
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/integration/output.ini
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/output.ini
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/integration/prepend.txt b/java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/prepend.txt
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/integration/prepend.txt
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/prepend.txt
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/integration/rusefi.input b/java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/rusefi.input
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/test/integration/rusefi.input
rename to java_tools/configuration_definition/src/main/java/com/rusefi/test/integration/rusefi.input
diff --git a/java_tools/configuration_definition/src/com/rusefi/util/CachingStrategy.java b/java_tools/configuration_definition/src/main/java/com/rusefi/util/CachingStrategy.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/util/CachingStrategy.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/util/CachingStrategy.java
diff --git a/java_tools/configuration_definition/src/com/rusefi/util/ZipUtil.java b/java_tools/configuration_definition/src/main/java/com/rusefi/util/ZipUtil.java
similarity index 100%
rename from java_tools/configuration_definition/src/com/rusefi/util/ZipUtil.java
rename to java_tools/configuration_definition/src/main/java/com/rusefi/util/ZipUtil.java
diff --git a/java_tools/enum_to_string/.idea/compiler.xml b/java_tools/enum_to_string/.idea/compiler.xml
deleted file mode 100644
index 217af471a9..0000000000
--- a/java_tools/enum_to_string/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java_tools/enum_to_string/.idea/encodings.xml b/java_tools/enum_to_string/.idea/encodings.xml
deleted file mode 100644
index 15a15b218a..0000000000
--- a/java_tools/enum_to_string/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/java_tools/enum_to_string/.idea/libraries/junit.xml b/java_tools/enum_to_string/.idea/libraries/junit.xml
deleted file mode 100644
index 11d7a6d750..0000000000
--- a/java_tools/enum_to_string/.idea/libraries/junit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java_tools/enum_to_string/.idea/misc.xml b/java_tools/enum_to_string/.idea/misc.xml
deleted file mode 100644
index d5d79e0ca5..0000000000
--- a/java_tools/enum_to_string/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java_tools/enum_to_string/.idea/modules.xml b/java_tools/enum_to_string/.idea/modules.xml
deleted file mode 100644
index ebb21d1076..0000000000
--- a/java_tools/enum_to_string/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java_tools/enum_to_string/.idea/runConfigurations/EnumToString.xml b/java_tools/enum_to_string/.idea/runConfigurations/EnumToString.xml
deleted file mode 100644
index 65723abd0f..0000000000
--- a/java_tools/enum_to_string/.idea/runConfigurations/EnumToString.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java_tools/enum_to_string/.idea/vcs.xml b/java_tools/enum_to_string/.idea/vcs.xml
deleted file mode 100644
index 9b76d0c0c2..0000000000
--- a/java_tools/enum_to_string/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java_tools/enum_to_string/build.xml b/java_tools/enum_to_string/build.xml
index c0ad814a99..6494c0d63a 100644
--- a/java_tools/enum_to_string/build.xml
+++ b/java_tools/enum_to_string/build.xml
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/java_tools/enum_to_string/enum_to_string.iml b/java_tools/enum_to_string/enum_to_string.iml
index 23d34faddf..5564055a1c 100644
--- a/java_tools/enum_to_string/enum_to_string.iml
+++ b/java_tools/enum_to_string/enum_to_string.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java b/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToString.java
similarity index 100%
rename from java_tools/enum_to_string/src/com/rusefi/EnumToString.java
rename to java_tools/enum_to_string/src/main/java/com/rusefi/EnumToString.java
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToStringTest.java
similarity index 100%
rename from java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
rename to java_tools/enum_to_string/src/main/java/com/rusefi/EnumToStringTest.java
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java b/java_tools/enum_to_string/src/main/java/com/rusefi/EnumsReader.java
similarity index 100%
rename from java_tools/enum_to_string/src/com/rusefi/EnumsReader.java
rename to java_tools/enum_to_string/src/main/java/com/rusefi/EnumsReader.java
diff --git a/java_tools/enum_to_string/src/com/rusefi/enum_reader/Value.java b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java
similarity index 100%
rename from java_tools/enum_to_string/src/com/rusefi/enum_reader/Value.java
rename to java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java
diff --git a/java_tools/enum_to_string/src/com/rusefi/util/test/LazyFileTest.java b/java_tools/enum_to_string/src/main/java/com/rusefi/util/test/LazyFileTest.java
similarity index 100%
rename from java_tools/enum_to_string/src/com/rusefi/util/test/LazyFileTest.java
rename to java_tools/enum_to_string/src/main/java/com/rusefi/util/test/LazyFileTest.java
diff --git a/java_tools/gcc_map_reader/build.xml b/java_tools/gcc_map_reader/build.xml
index 3d2d4e646b..c4d4645064 100644
--- a/java_tools/gcc_map_reader/build.xml
+++ b/java_tools/gcc_map_reader/build.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/java_tools/gcc_map_reader/gcc_map_reader.iml b/java_tools/gcc_map_reader/gcc_map_reader.iml
index 56c5201a0b..ec684dc4d8 100644
--- a/java_tools/gcc_map_reader/gcc_map_reader.iml
+++ b/java_tools/gcc_map_reader/gcc_map_reader.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/gcc_map_reader/src/rusefi/GccMapReader.java b/java_tools/gcc_map_reader/src/main/java/rusefi/GccMapReader.java
similarity index 100%
rename from java_tools/gcc_map_reader/src/rusefi/GccMapReader.java
rename to java_tools/gcc_map_reader/src/main/java/rusefi/GccMapReader.java
diff --git a/java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java b/java_tools/gcc_map_reader/src/main/java/rusefi/GccMapReaderTest.java
similarity index 100%
rename from java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java
rename to java_tools/gcc_map_reader/src/main/java/rusefi/GccMapReaderTest.java
diff --git a/java_tools/logicdata2c/build.xml b/java_tools/logicdata2c/build.xml
index c5f089bd59..58fa298d3b 100644
--- a/java_tools/logicdata2c/build.xml
+++ b/java_tools/logicdata2c/build.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/java_tools/logicdata2c/logicdata2c.iml b/java_tools/logicdata2c/logicdata2c.iml
index d5c0743275..08ae11a0bc 100644
--- a/java_tools/logicdata2c/logicdata2c.iml
+++ b/java_tools/logicdata2c/logicdata2c.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/logicdata2c/src/com/rusefi/LogicData2C.java b/java_tools/logicdata2c/src/main/java/com/rusefi/LogicData2C.java
similarity index 100%
rename from java_tools/logicdata2c/src/com/rusefi/LogicData2C.java
rename to java_tools/logicdata2c/src/main/java/com/rusefi/LogicData2C.java
diff --git a/java_tools/pcb_sync/build.xml b/java_tools/pcb_sync/build.xml
index 547798452b..5246412ccf 100644
--- a/java_tools/pcb_sync/build.xml
+++ b/java_tools/pcb_sync/build.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/java_tools/pcb_sync/pcb_sync.iml b/java_tools/pcb_sync/pcb_sync.iml
index 48e1ce8e6c..8be8a55e5f 100644
--- a/java_tools/pcb_sync/pcb_sync.iml
+++ b/java_tools/pcb_sync/pcb_sync.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/pcb_sync/src/com/rusefi/Main.java b/java_tools/pcb_sync/src/main/java/com/rusefi/Main.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/Main.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/Main.java
diff --git a/java_tools/pcb_sync/src/com/rusefi/RenameComponents.java b/java_tools/pcb_sync/src/main/java/com/rusefi/RenameComponents.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/RenameComponents.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/RenameComponents.java
diff --git a/java_tools/pcb_sync/src/com/rusefi/bom/BomBuilder.java b/java_tools/pcb_sync/src/main/java/com/rusefi/bom/BomBuilder.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/bom/BomBuilder.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/bom/BomBuilder.java
diff --git a/java_tools/pcb_sync/src/com/rusefi/bom/BomComponent.java b/java_tools/pcb_sync/src/main/java/com/rusefi/bom/BomComponent.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/bom/BomComponent.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/bom/BomComponent.java
diff --git a/java_tools/pcb_sync/src/com/rusefi/bom/BomRecord.java b/java_tools/pcb_sync/src/main/java/com/rusefi/bom/BomRecord.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/bom/BomRecord.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/bom/BomRecord.java
diff --git a/java_tools/pcb_sync/src/com/rusefi/bom/CpmFileModel.java b/java_tools/pcb_sync/src/main/java/com/rusefi/bom/CpmFileModel.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/bom/CpmFileModel.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/bom/CpmFileModel.java
diff --git a/java_tools/pcb_sync/src/com/rusefi/misc/CmpMergeTool.java b/java_tools/pcb_sync/src/main/java/com/rusefi/misc/CmpMergeTool.java
similarity index 100%
rename from java_tools/pcb_sync/src/com/rusefi/misc/CmpMergeTool.java
rename to java_tools/pcb_sync/src/main/java/com/rusefi/misc/CmpMergeTool.java
diff --git a/java_tools/ts2c/build.xml b/java_tools/ts2c/build.xml
index 74f435b8dd..1d9c9ee7a5 100644
--- a/java_tools/ts2c/build.xml
+++ b/java_tools/ts2c/build.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/java_tools/ts2c/src/com/rusefi/OBD2C.java b/java_tools/ts2c/src/main/java/com/rusefi/OBD2C.java
similarity index 100%
rename from java_tools/ts2c/src/com/rusefi/OBD2C.java
rename to java_tools/ts2c/src/main/java/com/rusefi/OBD2C.java
diff --git a/java_tools/ts2c/ts2c.iml b/java_tools/ts2c/ts2c.iml
index c90834f2d6..f76df2b77e 100644
--- a/java_tools/ts2c/ts2c.iml
+++ b/java_tools/ts2c/ts2c.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/ts_plugin_launcher/build.xml b/java_tools/ts_plugin_launcher/build.xml
index e118d21c5d..1535e2e35e 100644
--- a/java_tools/ts_plugin_launcher/build.xml
+++ b/java_tools/ts_plugin_launcher/build.xml
@@ -16,7 +16,7 @@
>
-
+
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/PluginLauncherSandbox.java b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/PluginLauncherSandbox.java
similarity index 100%
rename from java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/PluginLauncherSandbox.java
rename to java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/PluginLauncherSandbox.java
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginBody.java b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/TsPluginBody.java
similarity index 100%
rename from java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginBody.java
rename to java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/TsPluginBody.java
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginLauncher.java b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/TsPluginLauncher.java
similarity index 100%
rename from java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginLauncher.java
rename to java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/TsPluginLauncher.java
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Updater.java b/java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java
similarity index 100%
rename from java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Updater.java
rename to java_tools/ts_plugin_launcher/src/main/java/com/rusefi/ts_plugin/Updater.java
diff --git a/java_tools/ts_plugin_launcher/src/org/putgemin/VerticalFlowLayout.java b/java_tools/ts_plugin_launcher/src/main/java/org/putgemin/VerticalFlowLayout.java
similarity index 100%
rename from java_tools/ts_plugin_launcher/src/org/putgemin/VerticalFlowLayout.java
rename to java_tools/ts_plugin_launcher/src/main/java/org/putgemin/VerticalFlowLayout.java
diff --git a/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml b/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml
index 828f54fea7..12afda1905 100644
--- a/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml
+++ b/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/ts_screenshots/build.xml b/java_tools/ts_screenshots/build.xml
index 3d14df0411..6a3611d979 100644
--- a/java_tools/ts_screenshots/build.xml
+++ b/java_tools/ts_screenshots/build.xml
@@ -15,8 +15,8 @@
target="${javac.target}"
destdir="build/classes"
classpath="../../java_console/lib/junit.jar:../../java_console/lib/annotations.jar:lib/TunerStudioMS.jar">
-
-
+
+
diff --git a/java_tools/ts_screenshots/screen/screen.iml b/java_tools/ts_screenshots/screen/screen.iml
index 348f236b51..1fd06b9470 100644
--- a/java_tools/ts_screenshots/screen/screen.iml
+++ b/java_tools/ts_screenshots/screen/screen.iml
@@ -3,7 +3,7 @@
-
+
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/Callback.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/Callback.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/Callback.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/Callback.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/MdGenerator.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/MdGenerator.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/MdGenerator.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/MdGenerator.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/ScreenGenerator.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/ScreenGenerator.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/ScreenGenerator.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/ScreenGenerator.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/TunerStudioIntegration.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/TunerStudioIntegration.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/TunerStudioIntegration.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/TunerStudioIntegration.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/UiUtils.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/UiUtils.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/UiUtils.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/UiUtils.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/ContentModel.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/ContentModel.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/xml/ContentModel.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/ContentModel.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/DialogModel.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/DialogModel.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/xml/DialogModel.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/DialogModel.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/FieldModel.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/FieldModel.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/xml/FieldModel.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/FieldModel.java
diff --git a/java_tools/ts_screenshots/screen/src/com/rusefi/xml/TopLevelMenuModel.java b/java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/TopLevelMenuModel.java
similarity index 100%
rename from java_tools/ts_screenshots/screen/src/com/rusefi/xml/TopLevelMenuModel.java
rename to java_tools/ts_screenshots/screen/src/main/java/com/rusefi/xml/TopLevelMenuModel.java
diff --git a/java_tools/version2header/build.xml b/java_tools/version2header/build.xml
index bf3e0d0a92..2f4f83dae1 100644
--- a/java_tools/version2header/build.xml
+++ b/java_tools/version2header/build.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/java_tools/version2header/src/com/rusefi/Version2Header.java b/java_tools/version2header/src/main/java/com/rusefi/Version2Header.java
similarity index 100%
rename from java_tools/version2header/src/com/rusefi/Version2Header.java
rename to java_tools/version2header/src/main/java/com/rusefi/Version2Header.java
diff --git a/java_tools/version2header/version2header.iml b/java_tools/version2header/version2header.iml
index d5c0743275..08ae11a0bc 100644
--- a/java_tools/version2header/version2header.iml
+++ b/java_tools/version2header/version2header.iml
@@ -3,7 +3,7 @@
-
+