diff --git a/execution/openapi/execution-openapi.iml b/java/execution/openapi/execution-openapi.iml
similarity index 99%
rename from execution/openapi/execution-openapi.iml
rename to java/execution/openapi/execution-openapi.iml
index 301d8de5be24..91286b9965d3 100644
--- a/execution/openapi/execution-openapi.iml
+++ b/java/execution/openapi/execution-openapi.iml
@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/execution/openapi/com/intellij/execution/CantRunException.java b/java/execution/openapi/src/com/intellij/execution/CantRunException.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/CantRunException.java
rename to java/execution/openapi/src/com/intellij/execution/CantRunException.java
diff --git a/execution/openapi/com/intellij/execution/JUnitPatcher.java b/java/execution/openapi/src/com/intellij/execution/JUnitPatcher.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/JUnitPatcher.java
rename to java/execution/openapi/src/com/intellij/execution/JUnitPatcher.java
diff --git a/execution/openapi/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/JavaExecutionUtil.java
rename to java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
diff --git a/execution/openapi/com/intellij/execution/PsiClassLocationUtil.java b/java/execution/openapi/src/com/intellij/execution/PsiClassLocationUtil.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/PsiClassLocationUtil.java
rename to java/execution/openapi/src/com/intellij/execution/PsiClassLocationUtil.java
diff --git a/execution/openapi/com/intellij/execution/configurations/CommandLineBuilder.java b/java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/CommandLineBuilder.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java
diff --git a/execution/openapi/com/intellij/execution/configurations/ConfigurationUtil.java b/java/execution/openapi/src/com/intellij/execution/configurations/ConfigurationUtil.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/ConfigurationUtil.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/ConfigurationUtil.java
diff --git a/execution/openapi/com/intellij/execution/configurations/DebuggingRunnerData.java b/java/execution/openapi/src/com/intellij/execution/configurations/DebuggingRunnerData.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/DebuggingRunnerData.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/DebuggingRunnerData.java
diff --git a/execution/openapi/com/intellij/execution/configurations/JavaCommandLine.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLine.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/JavaCommandLine.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLine.java
diff --git a/execution/openapi/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/JavaCommandLineState.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
diff --git a/execution/openapi/com/intellij/execution/configurations/JavaCommandLineStateUtil.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
diff --git a/execution/openapi/com/intellij/execution/configurations/JavaParameters.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/JavaParameters.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
diff --git a/execution/openapi/com/intellij/execution/configurations/JavaRunConfigurationModule.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/JavaRunConfigurationModule.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
diff --git a/execution/openapi/com/intellij/execution/configurations/PatchedRunnableState.java b/java/execution/openapi/src/com/intellij/execution/configurations/PatchedRunnableState.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/PatchedRunnableState.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/PatchedRunnableState.java
diff --git a/execution/openapi/com/intellij/execution/configurations/RefactoringListenerProvider.java b/java/execution/openapi/src/com/intellij/execution/configurations/RefactoringListenerProvider.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/RefactoringListenerProvider.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/RefactoringListenerProvider.java
diff --git a/execution/openapi/com/intellij/execution/configurations/RemoteConnection.java b/java/execution/openapi/src/com/intellij/execution/configurations/RemoteConnection.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/RemoteConnection.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/RemoteConnection.java
diff --git a/execution/openapi/com/intellij/execution/configurations/RemoteState.java b/java/execution/openapi/src/com/intellij/execution/configurations/RemoteState.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/RemoteState.java
rename to java/execution/openapi/src/com/intellij/execution/configurations/RemoteState.java
diff --git a/execution/openapi/com/intellij/execution/configurations/package.html b/java/execution/openapi/src/com/intellij/execution/configurations/package.html
similarity index 100%
rename from execution/openapi/com/intellij/execution/configurations/package.html
rename to java/execution/openapi/src/com/intellij/execution/configurations/package.html
diff --git a/execution/openapi/com/intellij/execution/filters/ExceptionFilter.java b/java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilter.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/filters/ExceptionFilter.java
rename to java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilter.java
diff --git a/execution/openapi/com/intellij/execution/filters/package.html b/java/execution/openapi/src/com/intellij/execution/filters/package.html
similarity index 100%
rename from execution/openapi/com/intellij/execution/filters/package.html
rename to java/execution/openapi/src/com/intellij/execution/filters/package.html
diff --git a/execution/openapi/com/intellij/execution/package.html b/java/execution/openapi/src/com/intellij/execution/package.html
similarity index 100%
rename from execution/openapi/com/intellij/execution/package.html
rename to java/execution/openapi/src/com/intellij/execution/package.html
diff --git a/execution/openapi/com/intellij/execution/process/DefaultJavaProcessHandler.java b/java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/process/DefaultJavaProcessHandler.java
rename to java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java
diff --git a/execution/openapi/com/intellij/execution/process/package.html b/java/execution/openapi/src/com/intellij/execution/process/package.html
similarity index 100%
rename from execution/openapi/com/intellij/execution/process/package.html
rename to java/execution/openapi/src/com/intellij/execution/process/package.html
diff --git a/execution/openapi/com/intellij/execution/runners/JavaPatchableProgramRunner.java b/java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/runners/JavaPatchableProgramRunner.java
rename to java/execution/openapi/src/com/intellij/execution/runners/JavaPatchableProgramRunner.java
diff --git a/execution/openapi/com/intellij/execution/runners/ProcessProxyFactory.java b/java/execution/openapi/src/com/intellij/execution/runners/ProcessProxyFactory.java
similarity index 100%
rename from execution/openapi/com/intellij/execution/runners/ProcessProxyFactory.java
rename to java/execution/openapi/src/com/intellij/execution/runners/ProcessProxyFactory.java
diff --git a/execution/openapi/com/intellij/execution/ui/package.html b/java/execution/openapi/src/com/intellij/execution/ui/package.html
similarity index 100%
rename from execution/openapi/com/intellij/execution/ui/package.html
rename to java/execution/openapi/src/com/intellij/execution/ui/package.html