diff --git a/bin/idea.sh b/bin/idea.sh
index 0852ff09f45..03b9eee13da 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -68,12 +68,9 @@ mkdir $IDEA_OUTPUT || exit 1
 cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
 
 MAKE_DIR="$SCRIPT_DIR/../make"
-SUPPORT_DIR="$SCRIPT_DIR/../build/.idea-support"
 IDEA_MAKE="$MAKE_DIR/idea"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
-mkdir -p $SUPPORT_DIR
-
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
 
 #init template variables
@@ -127,11 +124,6 @@ if [ "x$SPEC" = "x" ] ; then
   echo "FATAL: SPEC is empty" >&2; exit 1
 fi
 
-# move build.xml out of .idea, see IDEA-189915
-IDEA_BUILD_OLD=$IDEA_BUILD
-IDEA_BUILD=$SUPPORT_DIR/build.xml
-mv $IDEA_BUILD_OLD $IDEA_BUILD
-
 SOURCE_FOLDER="      <sourceFolder url=\"file://\$MODULE_DIR\$/####\" isTestSource=\"false\" />"
 SOURCE_FOLDERS_DONE="false"
 
diff --git a/make/idea/template/build.xml b/make/idea/build.xml
similarity index 92%
rename from make/idea/template/build.xml
rename to make/idea/build.xml
index 0377d266539..611ba851447 100644
--- a/make/idea/template/build.xml
+++ b/make/idea/build.xml
@@ -1,7 +1,7 @@
 <!-- importing.xml -->
-<project name="jdk" basedir="../..">
+<project name="jdk">
 
-    <script language="javascript" classpath=".idea/classes">
+    <script language="javascript" classpath="${idea.dir}/classes">
         var JdkLogger = Java.type("idea.JdkIdeaAntLogger");
         new JdkLogger(project)
     </script>
diff --git a/make/idea/template/ant.xml b/make/idea/template/ant.xml
index 5c2519d4606..89862ba1f78 100644
--- a/make/idea/template/ant.xml
+++ b/make/idea/template/ant.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build/.idea-support/build.xml">
+    <buildFile url="file://$PROJECT_DIR$/make/idea/build.xml">
       <properties>
         <property name="intellij.ismake" value="$IsMake$" />
         <property name="build.target.dir" value="specDir" /> <!-- this will be replaced -->
         <property name="module.name" value="java.base" /> <!-- this will be replaced -->
+        <property name="idea.dir" value="$ModuleFileDir$" />
       </properties>
       <executeOn event="afterCompilation" target="post-make" />
     </buildFile>
diff --git a/make/idea/template/misc.xml b/make/idea/template/misc.xml
index 6363b8a051f..509bb021f2b 100644
--- a/make/idea/template/misc.xml
+++ b/make/idea/template/misc.xml
@@ -9,10 +9,10 @@
     <jre alt="true" value="images_jdk" /> <!-- this will be replaced -->
     <options></options>
     <ant>
-      <target file="file://$PROJECT_DIR$/build/.idea-support/build.xml" name="images" />
+      <target file="file://$PROJECT_DIR$/make/idea/build.xml" name="images" />
     </ant>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" assert-keyword="true" jdk-15="true">
-    <output url="file://$PROJECT_DIR$/build/.idea-support/out" />
+    <output url="file://$PROJECT_DIR$/build/out" />
   </component>
 </project>
diff --git a/make/idea/template/workspace.xml b/make/idea/template/workspace.xml
index 7113a00aa75..384ee54579d 100644
--- a/make/idea/template/workspace.xml
+++ b/make/idea/template/workspace.xml
@@ -11,24 +11,11 @@
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
+    <buildFile url="file://$PROJECT_DIR$/make/idea/build.xml">
       <runInBackground value="false" />
       <targetFilters>
-        <filter targetName="post-make" isVisible="false" />
         <filter targetName="clean" isVisible="true" />
-        <filter targetName="-do-configure" isVisible="false" />
         <filter targetName="images" isVisible="true" />
-        <filter targetName="build-module" isVisible="true" />
-        <filter targetName="jtreg-debug" isVisible="false" />
-        <filter targetName="jtreg-debug-internal" isVisible="false" />
-        <filter targetName="jtreg" isVisible="false" />
-        <filter targetName="-check-jtreg.home" isVisible="false" />
-        <filter targetName="-def-check" isVisible="false" />
-        <filter targetName="-def-jtreg" isVisible="false" />
-        <filter targetName="-check-boot.java.home" isVisible="false" />
-        <filter targetName="-check-target.java.home" isVisible="false" />
-        <filter targetName="find-jdk-build-dir" isVisible="false" />
-        <filter targetName="check-env" isVisible="false" />
       </targetFilters>
       <treeView value="false" />
       <expanded value="true" />
diff --git a/make/langtools/build.xml b/make/langtools/build.xml
index cc3273a3d66..dc9ae593300 100644
--- a/make/langtools/build.xml
+++ b/make/langtools/build.xml
@@ -76,7 +76,6 @@
     <property name="make.conf.dir" location="${make.dir}/conf"/>
     <property name="make.tools.dir" location="${make.dir}/tools"/>
     <property name="build.dir" location="build/langtools"/>
-    <property name="idea.support.dir" location="build/.idea-support"/>
     <property name="build.modules" location="${build.dir}/modules"/>
     <property name="build.gensrc" location="${build.dir}/gensrc"/>
     <property name="build.tools" location="${build.dir}/toolclasses"/>
@@ -270,14 +269,11 @@
     <target name="idea" depends="-check-langtools.jdk.home">
         <mkdir dir=".idea"/>
         <copy todir=".idea" >
-            <fileset dir="${make.dir}/intellij">
+            <fileset dir="${make.dir}/intellij/template">
                <exclude name="**/src/**"/>
                <exclude name="**/utils/**"/>
             </fileset>
         </copy>
-        <!-- move build.xml out of .idea, see IDEA-189915 -->
-        <mkdir dir="${idea.support.dir}"/>
-        <move todir="${idea.support.dir}" file=".idea/build.xml"/>
         <condition property="idea.jtreg.home" value="${jtreg.home}" else = "[jtreg.home]">
             <isset property="jtreg.home"/>
         </condition>
@@ -293,7 +289,7 @@
         <mkdir dir=".idea/classes"/>
         <javac source="${javac.build.source}"
                target="${javac.build.target}"
-               srcdir="${make.dir}/intellij/src"
+               srcdir="${make.dir}/intellij/template/src"
                destdir=".idea/classes"/>
     </target>
 
diff --git a/make/langtools/intellij/build.xml b/make/langtools/intellij/build.xml
index 6921deeb6e5..68305f9a97e 100644
--- a/make/langtools/intellij/build.xml
+++ b/make/langtools/intellij/build.xml
@@ -1,12 +1,12 @@
 <!-- importing.xml -->
-<project name="langtools" basedir="../..">
+<project name="langtools" basedir = "../../..">
 
-    <script language="javascript" classpath=".idea/classes">
+    <script language="javascript" classpath="${idea.dir}/classes">
         var LangtoolsLogger = Java.type("idea.LangtoolsIdeaAntLogger");
         new LangtoolsLogger(project)
     </script>
 
-    <import file="../../make/langtools/build.xml"/>
+    <import file="../build.xml"/>
 
     <target name="cond-clean" unless="${intellij.ismake}">
         <antcall target="clean"/>
diff --git a/make/langtools/intellij/ant.xml b/make/langtools/intellij/template/ant.xml
similarity index 73%
rename from make/langtools/intellij/ant.xml
rename to make/langtools/intellij/template/ant.xml
index 982777b9041..f7601f1eafe 100644
--- a/make/langtools/intellij/ant.xml
+++ b/make/langtools/intellij/template/ant.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build/.idea-support/build.xml">
+    <buildFile url="file://$PROJECT_DIR$/make/langtools/intellij/build.xml">
       <properties>
 	    <property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
         <property name="intellij.ismake" value="$IsMake$" />
+        <property name="idea.dir" value="$ModuleFileDir$" />
       </properties>
       <executeOn event="afterCompilation" target="post-make" />
     </buildFile>
diff --git a/make/langtools/intellij/codeStyleSettings.xml b/make/langtools/intellij/template/codeStyleSettings.xml
similarity index 100%
rename from make/langtools/intellij/codeStyleSettings.xml
rename to make/langtools/intellij/template/codeStyleSettings.xml
diff --git a/make/langtools/intellij/compiler.xml b/make/langtools/intellij/template/compiler.xml
similarity index 100%
rename from make/langtools/intellij/compiler.xml
rename to make/langtools/intellij/template/compiler.xml
diff --git a/make/langtools/intellij/copyright/langtools.xml b/make/langtools/intellij/template/copyright/langtools.xml
similarity index 100%
rename from make/langtools/intellij/copyright/langtools.xml
rename to make/langtools/intellij/template/copyright/langtools.xml
diff --git a/make/langtools/intellij/copyright/profiles_settings.xml b/make/langtools/intellij/template/copyright/profiles_settings.xml
similarity index 100%
rename from make/langtools/intellij/copyright/profiles_settings.xml
rename to make/langtools/intellij/template/copyright/profiles_settings.xml
diff --git a/make/langtools/intellij/inspectionProfiles/langtools.xml b/make/langtools/intellij/template/inspectionProfiles/langtools.xml
similarity index 100%
rename from make/langtools/intellij/inspectionProfiles/langtools.xml
rename to make/langtools/intellij/template/inspectionProfiles/langtools.xml
diff --git a/make/langtools/intellij/inspectionProfiles/profiles_settings.xml b/make/langtools/intellij/template/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from make/langtools/intellij/inspectionProfiles/profiles_settings.xml
rename to make/langtools/intellij/template/inspectionProfiles/profiles_settings.xml
diff --git a/make/langtools/intellij/langtools.iml b/make/langtools/intellij/template/langtools.iml
similarity index 100%
rename from make/langtools/intellij/langtools.iml
rename to make/langtools/intellij/template/langtools.iml
diff --git a/make/langtools/intellij/misc.xml b/make/langtools/intellij/template/misc.xml
similarity index 85%
rename from make/langtools/intellij/misc.xml
rename to make/langtools/intellij/template/misc.xml
index e021a0691bf..76ca3ddf1b1 100644
--- a/make/langtools/intellij/misc.xml
+++ b/make/langtools/intellij/template/misc.xml
@@ -9,7 +9,7 @@
     <jre alt="true" value="@IDEA_TARGET_JDK@" />
     <options>@XPATCH@</options>
     <ant>
-      <target file="file://$PROJECT_DIR$/build/.idea-support/build.xml" name="build-all-classes" />
+      <target file="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" name="build-all-classes" />
     </ant>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
diff --git a/make/langtools/intellij/modules.xml b/make/langtools/intellij/template/modules.xml
similarity index 100%
rename from make/langtools/intellij/modules.xml
rename to make/langtools/intellij/template/modules.xml
diff --git a/make/langtools/intellij/runConfigurations/javac.xml b/make/langtools/intellij/template/runConfigurations/javac.xml
similarity index 100%
rename from make/langtools/intellij/runConfigurations/javac.xml
rename to make/langtools/intellij/template/runConfigurations/javac.xml
diff --git a/make/langtools/intellij/runConfigurations/javadoc.xml b/make/langtools/intellij/template/runConfigurations/javadoc.xml
similarity index 100%
rename from make/langtools/intellij/runConfigurations/javadoc.xml
rename to make/langtools/intellij/template/runConfigurations/javadoc.xml
diff --git a/make/langtools/intellij/runConfigurations/javap.xml b/make/langtools/intellij/template/runConfigurations/javap.xml
similarity index 100%
rename from make/langtools/intellij/runConfigurations/javap.xml
rename to make/langtools/intellij/template/runConfigurations/javap.xml
diff --git a/make/langtools/intellij/runConfigurations/jshell.xml b/make/langtools/intellij/template/runConfigurations/jshell.xml
similarity index 100%
rename from make/langtools/intellij/runConfigurations/jshell.xml
rename to make/langtools/intellij/template/runConfigurations/jshell.xml
diff --git a/make/langtools/intellij/runConfigurations/sjavac.xml b/make/langtools/intellij/template/runConfigurations/sjavac.xml
similarity index 100%
rename from make/langtools/intellij/runConfigurations/sjavac.xml
rename to make/langtools/intellij/template/runConfigurations/sjavac.xml
diff --git a/make/langtools/intellij/src/idea/LangtoolsIdeaAntLogger.java b/make/langtools/intellij/template/src/idea/LangtoolsIdeaAntLogger.java
similarity index 100%
rename from make/langtools/intellij/src/idea/LangtoolsIdeaAntLogger.java
rename to make/langtools/intellij/template/src/idea/LangtoolsIdeaAntLogger.java
diff --git a/make/langtools/intellij/vcs.xml b/make/langtools/intellij/template/vcs.xml
similarity index 100%
rename from make/langtools/intellij/vcs.xml
rename to make/langtools/intellij/template/vcs.xml
diff --git a/make/langtools/intellij/workspace.xml b/make/langtools/intellij/template/workspace.xml
similarity index 91%
rename from make/langtools/intellij/workspace.xml
rename to make/langtools/intellij/template/workspace.xml
index 5e9baf2126f..94f6d01b59b 100644
--- a/make/langtools/intellij/workspace.xml
+++ b/make/langtools/intellij/template/workspace.xml
@@ -6,7 +6,7 @@
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
+    <buildFile url="file://$PROJECT_DIR$/make/langtools/intellij/build.xml">
       <runInBackground value="false" />
       <targetFilters>
         <filter targetName="build-all-tools" isVisible="true" />