diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index d678b864de..550056c80d 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -12,22 +12,16 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/../java_console/autoupdate" />
+            <option value="$PROJECT_DIR$/../java_console/core_ui" />
             <option value="$PROJECT_DIR$/../java_console/inifile" />
             <option value="$PROJECT_DIR$/../java_console/io" />
             <option value="$PROJECT_DIR$/../java_console/logging" />
             <option value="$PROJECT_DIR$/../java_console/logging-api" />
             <option value="$PROJECT_DIR$/../java_console/models" />
             <option value="$PROJECT_DIR$/../java_console/shared_io" />
-            <option value="$PROJECT_DIR$/../java_tools/bin2header" />
-            <option value="$PROJECT_DIR$/../java_tools/enum_to_string" />
-            <option value="$PROJECT_DIR$/../java_tools/gcc_map_reader" />
-            <option value="$PROJECT_DIR$/../java_tools/logicdata2c" />
-            <option value="$PROJECT_DIR$/../java_tools/ts_plugin_launcher" />
-            <option value="$PROJECT_DIR$/../java_tools/version2header" />
+            <option value="$PROJECT_DIR$/../java_console/shared_ui" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/java_console/.idea/modules.xml b/java_console/.idea/modules.xml
index e9cae1362a..1430b75ec5 100644
--- a/java_console/.idea/modules.xml
+++ b/java_console/.idea/modules.xml
@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/autotest/autotest.iml" filepath="$PROJECT_DIR$/autotest/autotest.iml" />
       <module fileurl="file://$PROJECT_DIR$/autoupdate/autoupdate.iml" filepath="$PROJECT_DIR$/autoupdate/autoupdate.iml" />
       <module fileurl="file://$PROJECT_DIR$/../java_tools/configuration_definition/configuration_definition.iml" filepath="$PROJECT_DIR$/../java_tools/configuration_definition/configuration_definition.iml" />
+      <module fileurl="file://$PROJECT_DIR$/core_ui/core_ui.iml" filepath="$PROJECT_DIR$/core_ui/core_ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/../java_tools/enum_to_string/enum_to_string.iml" filepath="$PROJECT_DIR$/../java_tools/enum_to_string/enum_to_string.iml" />
       <module fileurl="file://$PROJECT_DIR$/inifile/inifile.iml" filepath="$PROJECT_DIR$/inifile/inifile.iml" />
       <module fileurl="file://$PROJECT_DIR$/io/io.iml" filepath="$PROJECT_DIR$/io/io.iml" />
diff --git a/java_tools/.idea/gradle.xml b/java_tools/.idea/gradle.xml
index b6c7034b71..c6f887488c 100644
--- a/java_tools/.idea/gradle.xml
+++ b/java_tools/.idea/gradle.xml
@@ -9,20 +9,25 @@
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
+            <option value="$PROJECT_DIR$/../java_console/autotest" />
             <option value="$PROJECT_DIR$/../java_console/autoupdate" />
+            <option value="$PROJECT_DIR$/../java_console/core_ui" />
             <option value="$PROJECT_DIR$/../java_console/inifile" />
             <option value="$PROJECT_DIR$/../java_console/io" />
             <option value="$PROJECT_DIR$/../java_console/logging" />
             <option value="$PROJECT_DIR$/../java_console/logging-api" />
+            <option value="$PROJECT_DIR$/../java_console/luaformatter_module" />
             <option value="$PROJECT_DIR$/../java_console/models" />
             <option value="$PROJECT_DIR$/../java_console/shared_io" />
             <option value="$PROJECT_DIR$/../java_console/shared_ui" />
+            <option value="$PROJECT_DIR$/../java_console/ui" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/bin2header" />
             <option value="$PROJECT_DIR$/configuration_definition" />
             <option value="$PROJECT_DIR$/enum_to_string" />
             <option value="$PROJECT_DIR$/gcc_map_reader" />
             <option value="$PROJECT_DIR$/logicdata2c" />
+            <option value="$PROJECT_DIR$/proxy_server" />
             <option value="$PROJECT_DIR$/ts_plugin" />
             <option value="$PROJECT_DIR$/ts_plugin_launcher" />
             <option value="$PROJECT_DIR$/version2header" />
diff --git a/java_tools/enum_to_string/enum_to_string.iml b/java_tools/enum_to_string/enum_to_string.iml
new file mode 100644
index 0000000000..66356ed3da
--- /dev/null
+++ b/java_tools/enum_to_string/enum_to_string.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="jsr305-2.0.1" level="project" />
+    <orderEntry type="module" module-name="logging" exported="" />
+  </component>
+</module>
\ No newline at end of file