diff --git a/debugger/debugger-openapi.iml b/java/debugger/openapi/debugger-openapi.iml
similarity index 97%
rename from debugger/debugger-openapi.iml
rename to java/debugger/openapi/debugger-openapi.iml
index dc999f1c1c4e..44f735e287e2 100644
--- a/debugger/debugger-openapi.iml
+++ b/java/debugger/openapi/debugger-openapi.iml
@@ -2,12 +2,11 @@
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/openapi">
-      <sourceFolder url="file://$MODULE_DIR$/openapi" isTestSource="false" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Annotations" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="jsp-openapi" />
diff --git a/debugger/openapi/com/intellij/debugger/DebuggerBundle.java b/java/debugger/openapi/src/com/intellij/debugger/DebuggerBundle.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/DebuggerBundle.java
rename to java/debugger/openapi/src/com/intellij/debugger/DebuggerBundle.java
diff --git a/debugger/openapi/com/intellij/debugger/DebuggerContext.java b/java/debugger/openapi/src/com/intellij/debugger/DebuggerContext.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/DebuggerContext.java
rename to java/debugger/openapi/src/com/intellij/debugger/DebuggerContext.java
diff --git a/debugger/openapi/com/intellij/debugger/DebuggerManager.java b/java/debugger/openapi/src/com/intellij/debugger/DebuggerManager.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/DebuggerManager.java
rename to java/debugger/openapi/src/com/intellij/debugger/DebuggerManager.java
diff --git a/debugger/openapi/com/intellij/debugger/NameMapper.java b/java/debugger/openapi/src/com/intellij/debugger/NameMapper.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/NameMapper.java
rename to java/debugger/openapi/src/com/intellij/debugger/NameMapper.java
diff --git a/debugger/openapi/com/intellij/debugger/NoDataException.java b/java/debugger/openapi/src/com/intellij/debugger/NoDataException.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/NoDataException.java
rename to java/debugger/openapi/src/com/intellij/debugger/NoDataException.java
diff --git a/debugger/openapi/com/intellij/debugger/PositionManager.java b/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/PositionManager.java
rename to java/debugger/openapi/src/com/intellij/debugger/PositionManager.java
diff --git a/debugger/openapi/com/intellij/debugger/SourcePosition.java b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/SourcePosition.java
rename to java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/DebugProcess.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/DebugProcess.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/DebugProcessAdapter.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessAdapter.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/DebugProcessAdapter.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessAdapter.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/DebugProcessListener.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessListener.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/DebugProcessListener.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessListener.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/DebuggerUtils.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/DebuggerUtils.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/JSR45PositionManager.java b/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/JSR45PositionManager.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/SourcesFinder.java b/java/debugger/openapi/src/com/intellij/debugger/engine/SourcesFinder.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/SourcesFinder.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/SourcesFinder.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/StackFrameContext.java b/java/debugger/openapi/src/com/intellij/debugger/engine/StackFrameContext.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/StackFrameContext.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/StackFrameContext.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/SuspendContext.java b/java/debugger/openapi/src/com/intellij/debugger/engine/SuspendContext.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/SuspendContext.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/SuspendContext.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/evaluation/CodeFragmentFactory.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/CodeFragmentFactory.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/evaluation/CodeFragmentFactory.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/CodeFragmentFactory.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/evaluation/CodeFragmentKind.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/CodeFragmentKind.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/evaluation/CodeFragmentKind.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/CodeFragmentKind.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/evaluation/EvaluateException.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/evaluation/EvaluateException.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/evaluation/EvaluationContext.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluationContext.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/evaluation/EvaluationContext.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluationContext.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/evaluation/TextWithImports.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/TextWithImports.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/evaluation/TextWithImports.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/TextWithImports.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/jdi/LocalVariableProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/LocalVariableProxy.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/jdi/LocalVariableProxy.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/jdi/LocalVariableProxy.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/jdi/ObjectReferenceProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/ObjectReferenceProxy.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/jdi/ObjectReferenceProxy.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/jdi/ObjectReferenceProxy.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/jdi/StackFrameProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/StackFrameProxy.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/jdi/StackFrameProxy.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/jdi/StackFrameProxy.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/jdi/ThreadGroupReferenceProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/ThreadGroupReferenceProxy.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/jdi/ThreadGroupReferenceProxy.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/jdi/ThreadGroupReferenceProxy.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/jdi/ThreadReferenceProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/ThreadReferenceProxy.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/jdi/ThreadReferenceProxy.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/jdi/ThreadReferenceProxy.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/managerThread/DebuggerCommand.java b/java/debugger/openapi/src/com/intellij/debugger/engine/managerThread/DebuggerCommand.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/managerThread/DebuggerCommand.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/managerThread/DebuggerCommand.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/managerThread/DebuggerManagerThread.java b/java/debugger/openapi/src/com/intellij/debugger/engine/managerThread/DebuggerManagerThread.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/managerThread/DebuggerManagerThread.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/managerThread/DebuggerManagerThread.java
diff --git a/debugger/openapi/com/intellij/debugger/engine/managerThread/SuspendContextCommand.java b/java/debugger/openapi/src/com/intellij/debugger/engine/managerThread/SuspendContextCommand.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/engine/managerThread/SuspendContextCommand.java
rename to java/debugger/openapi/src/com/intellij/debugger/engine/managerThread/SuspendContextCommand.java
diff --git a/debugger/openapi/com/intellij/debugger/package.html b/java/debugger/openapi/src/com/intellij/debugger/package.html
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/package.html
rename to java/debugger/openapi/src/com/intellij/debugger/package.html
diff --git a/debugger/openapi/com/intellij/debugger/requests/ClassPrepareRequestor.java b/java/debugger/openapi/src/com/intellij/debugger/requests/ClassPrepareRequestor.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/requests/ClassPrepareRequestor.java
rename to java/debugger/openapi/src/com/intellij/debugger/requests/ClassPrepareRequestor.java
diff --git a/debugger/openapi/com/intellij/debugger/requests/RequestManager.java b/java/debugger/openapi/src/com/intellij/debugger/requests/RequestManager.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/requests/RequestManager.java
rename to java/debugger/openapi/src/com/intellij/debugger/requests/RequestManager.java
diff --git a/debugger/openapi/com/intellij/debugger/requests/Requestor.java b/java/debugger/openapi/src/com/intellij/debugger/requests/Requestor.java
similarity index 100%
rename from debugger/openapi/com/intellij/debugger/requests/Requestor.java
rename to java/debugger/openapi/src/com/intellij/debugger/requests/Requestor.java