diff --git a/java/compiler/impl/compiler-impl.iml b/java/compiler/impl/compiler-impl.iml
index 7a2bf4dbe81b..224fdd858935 100644
--- a/java/compiler/impl/compiler-impl.iml
+++ b/java/compiler/impl/compiler-impl.iml
@@ -14,7 +14,7 @@
-
+
diff --git a/java/debugger/impl/debugger-impl.iml b/java/debugger/impl/debugger-impl.iml
index 7f8384f4901a..39f163a0dbee 100644
--- a/java/debugger/impl/debugger-impl.iml
+++ b/java/debugger/impl/debugger-impl.iml
@@ -17,7 +17,7 @@
-
+
diff --git a/java/execution/impl/execution-impl.iml b/java/execution/impl/execution-impl.iml
index 76551bfa8c15..7ead60fcb083 100644
--- a/java/execution/impl/execution-impl.iml
+++ b/java/execution/impl/execution-impl.iml
@@ -10,7 +10,7 @@
-
+
diff --git a/java/execution/openapi/execution-openapi.iml b/java/execution/openapi/execution-openapi.iml
index 8a261e322d10..4a710d3c2a45 100644
--- a/java/execution/openapi/execution-openapi.iml
+++ b/java/execution/openapi/execution-openapi.iml
@@ -10,7 +10,7 @@
-
+
diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 5ef98043dfe9..10212457d67c 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -14,7 +14,7 @@
-
+
diff --git a/java/java-runtime/java-runtime.iml b/java/java-runtime/java-runtime.iml
new file mode 100644
index 000000000000..c053808175a3
--- /dev/null
+++ b/java/java-runtime/java-runtime.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/runtimesource/FormPreviewFrame.java b/java/java-runtime/src/FormPreviewFrame.java
similarity index 100%
rename from runtimesource/FormPreviewFrame.java
rename to java/java-runtime/src/FormPreviewFrame.java
diff --git a/runtimesource/RuntimeBundle.properties b/java/java-runtime/src/RuntimeBundle.properties
similarity index 100%
rename from runtimesource/RuntimeBundle.properties
rename to java/java-runtime/src/RuntimeBundle.properties
diff --git a/runtimesource/com/intellij/rt/ant/execution/AntMain2.java b/java/java-runtime/src/com/intellij/rt/ant/execution/AntMain2.java
similarity index 100%
rename from runtimesource/com/intellij/rt/ant/execution/AntMain2.java
rename to java/java-runtime/src/com/intellij/rt/ant/execution/AntMain2.java
diff --git a/runtimesource/com/intellij/rt/ant/execution/IdeaAntLogger2.java b/java/java-runtime/src/com/intellij/rt/ant/execution/IdeaAntLogger2.java
similarity index 100%
rename from runtimesource/com/intellij/rt/ant/execution/IdeaAntLogger2.java
rename to java/java-runtime/src/com/intellij/rt/ant/execution/IdeaAntLogger2.java
diff --git a/runtimesource/com/intellij/rt/ant/execution/IdeaInputHandler.java b/java/java-runtime/src/com/intellij/rt/ant/execution/IdeaInputHandler.java
similarity index 100%
rename from runtimesource/com/intellij/rt/ant/execution/IdeaInputHandler.java
rename to java/java-runtime/src/com/intellij/rt/ant/execution/IdeaInputHandler.java
diff --git a/runtimesource/com/intellij/rt/ant/execution/PacketFactory.java b/java/java-runtime/src/com/intellij/rt/ant/execution/PacketFactory.java
similarity index 100%
rename from runtimesource/com/intellij/rt/ant/execution/PacketFactory.java
rename to java/java-runtime/src/com/intellij/rt/ant/execution/PacketFactory.java
diff --git a/runtimesource/com/intellij/rt/compiler/JavacResourcesReader.java b/java/java-runtime/src/com/intellij/rt/compiler/JavacResourcesReader.java
similarity index 100%
rename from runtimesource/com/intellij/rt/compiler/JavacResourcesReader.java
rename to java/java-runtime/src/com/intellij/rt/compiler/JavacResourcesReader.java
diff --git a/runtimesource/com/intellij/rt/compiler/JavacRunner.java b/java/java-runtime/src/com/intellij/rt/compiler/JavacRunner.java
similarity index 100%
rename from runtimesource/com/intellij/rt/compiler/JavacRunner.java
rename to java/java-runtime/src/com/intellij/rt/compiler/JavacRunner.java
diff --git a/runtimesource/com/intellij/rt/debugger/BatchEvaluatorServer.java b/java/java-runtime/src/com/intellij/rt/debugger/BatchEvaluatorServer.java
similarity index 100%
rename from runtimesource/com/intellij/rt/debugger/BatchEvaluatorServer.java
rename to java/java-runtime/src/com/intellij/rt/debugger/BatchEvaluatorServer.java
diff --git a/runtimesource/com/intellij/rt/execution/CommandLineWrapper.java b/java/java-runtime/src/com/intellij/rt/execution/CommandLineWrapper.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/CommandLineWrapper.java
rename to java/java-runtime/src/com/intellij/rt/execution/CommandLineWrapper.java
diff --git a/runtimesource/com/intellij/rt/execution/application/AppMain.java b/java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/application/AppMain.java
rename to java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java
diff --git a/runtimesource/com/intellij/rt/execution/application/MainAppClassLoader.java b/java/java-runtime/src/com/intellij/rt/execution/application/MainAppClassLoader.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/application/MainAppClassLoader.java
rename to java/java-runtime/src/com/intellij/rt/execution/application/MainAppClassLoader.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/ExceptionPacketFactory.java b/java/java-runtime/src/com/intellij/rt/execution/junit/ExceptionPacketFactory.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/ExceptionPacketFactory.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/ExceptionPacketFactory.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/PacketFactory.java b/java/java-runtime/src/com/intellij/rt/execution/junit/PacketFactory.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/PacketFactory.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/PacketFactory.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/EchoOutputStream.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/EchoOutputStream.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/EchoOutputStream.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/EchoOutputStream.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/OutputObjectRegistry.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/OutputObjectRegistry.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/OutputObjectRegistry.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/OutputObjectRegistry.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/OutputObjectRegistryEx.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/OutputObjectRegistryEx.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/OutputObjectRegistryEx.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/OutputObjectRegistryEx.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/Packet.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/Packet.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/Packet.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/Packet.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PacketFactory.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketFactory.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PacketFactory.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketFactory.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PacketProcessor.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketProcessor.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PacketProcessor.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketProcessor.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PacketProcessors.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketProcessors.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PacketProcessors.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketProcessors.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PacketWriter.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketWriter.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PacketWriter.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PacketWriter.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PoolOfDelimiters.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PoolOfDelimiters.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PoolOfDelimiters.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PoolOfDelimiters.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PoolOfKnownObjects.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PoolOfKnownObjects.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PoolOfKnownObjects.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PoolOfKnownObjects.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/PoolOfTestTypes.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/PoolOfTestTypes.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/PoolOfTestTypes.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/PoolOfTestTypes.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/SegmentedOutputStream.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/SegmentedOutputStream.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/SegmentedOutputStream.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/SegmentedOutputStream.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/SegmentedStream.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/SegmentedStream.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/SegmentedStream.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/SegmentedStream.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/segments/TraceFilter.java b/java/java-runtime/src/com/intellij/rt/execution/junit/segments/TraceFilter.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/segments/TraceFilter.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/segments/TraceFilter.java
diff --git a/runtimesource/com/intellij/rt/execution/junit/states/PoolOfTestStates.java b/java/java-runtime/src/com/intellij/rt/execution/junit/states/PoolOfTestStates.java
similarity index 100%
rename from runtimesource/com/intellij/rt/execution/junit/states/PoolOfTestStates.java
rename to java/java-runtime/src/com/intellij/rt/execution/junit/states/PoolOfTestStates.java
diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index 9b23d407bb65..066a19f0c2bc 100644
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -8,7 +8,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
diff --git a/plugins/ant/ant.iml b/plugins/ant/ant.iml
index a5470b9bfd95..4c80cda8c0bc 100644
--- a/plugins/ant/ant.iml
+++ b/plugins/ant/ant.iml
@@ -13,7 +13,7 @@
-
+
diff --git a/plugins/junit_rt/junit_rt.iml b/plugins/junit_rt/junit_rt.iml
index 5c7e201e8d86..f25b895ecf05 100644
--- a/plugins/junit_rt/junit_rt.iml
+++ b/plugins/junit_rt/junit_rt.iml
@@ -8,7 +8,7 @@
-
+