diff --git a/java/execution/impl/execution-impl.iml b/java/execution/impl/execution-impl.iml
index 9332d9e362bf..ece0c196ef21 100644
--- a/java/execution/impl/execution-impl.iml
+++ b/java/execution/impl/execution-impl.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="idea_rt" />
     <orderEntry type="module" module-name="resources_eng" />
-    <orderEntry type="module" module-name="refactoring-openapi" />
     <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
diff --git a/refactoring/openapi/com/intellij/refactoring/ConvertToInstanceMethodRefactoring.java b/java/openapi/src/com/intellij/refactoring/ConvertToInstanceMethodRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/ConvertToInstanceMethodRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/ConvertToInstanceMethodRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/IntroduceParameterRefactoring.java b/java/openapi/src/com/intellij/refactoring/IntroduceParameterRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/IntroduceParameterRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/IntroduceParameterRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/JavaRefactoringActionHandlerFactory.java b/java/openapi/src/com/intellij/refactoring/JavaRefactoringActionHandlerFactory.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/JavaRefactoringActionHandlerFactory.java
rename to java/openapi/src/com/intellij/refactoring/JavaRefactoringActionHandlerFactory.java
diff --git a/refactoring/openapi/com/intellij/refactoring/JavaRefactoringFactory.java b/java/openapi/src/com/intellij/refactoring/JavaRefactoringFactory.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/JavaRefactoringFactory.java
rename to java/openapi/src/com/intellij/refactoring/JavaRefactoringFactory.java
diff --git a/refactoring/openapi/com/intellij/refactoring/JavaRenameRefactoring.java b/java/openapi/src/com/intellij/refactoring/JavaRenameRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/JavaRenameRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/JavaRenameRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/MakeStaticRefactoring.java b/java/openapi/src/com/intellij/refactoring/MakeStaticRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/MakeStaticRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/MakeStaticRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/MoveClassesOrPackagesRefactoring.java b/java/openapi/src/com/intellij/refactoring/MoveClassesOrPackagesRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/MoveClassesOrPackagesRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/MoveClassesOrPackagesRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/MoveDestination.java b/java/openapi/src/com/intellij/refactoring/MoveDestination.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/MoveDestination.java
rename to java/openapi/src/com/intellij/refactoring/MoveDestination.java
diff --git a/refactoring/openapi/com/intellij/refactoring/MoveInnerRefactoring.java b/java/openapi/src/com/intellij/refactoring/MoveInnerRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/MoveInnerRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/MoveInnerRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/MoveInstanceMethodRefactoring.java b/java/openapi/src/com/intellij/refactoring/MoveInstanceMethodRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/MoveInstanceMethodRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/MoveInstanceMethodRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/MoveMembersRefactoring.java b/java/openapi/src/com/intellij/refactoring/MoveMembersRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/MoveMembersRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/MoveMembersRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/PackageWrapper.java b/java/openapi/src/com/intellij/refactoring/PackageWrapper.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/PackageWrapper.java
rename to java/openapi/src/com/intellij/refactoring/PackageWrapper.java
diff --git a/refactoring/openapi/com/intellij/refactoring/ReplaceConstructorWithFactoryRefactoring.java b/java/openapi/src/com/intellij/refactoring/ReplaceConstructorWithFactoryRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/ReplaceConstructorWithFactoryRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/ReplaceConstructorWithFactoryRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/TurnRefsToSuperRefactoring.java b/java/openapi/src/com/intellij/refactoring/TurnRefsToSuperRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/TurnRefsToSuperRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/TurnRefsToSuperRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/TypeCookRefactoring.java b/java/openapi/src/com/intellij/refactoring/TypeCookRefactoring.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/TypeCookRefactoring.java
rename to java/openapi/src/com/intellij/refactoring/TypeCookRefactoring.java
diff --git a/refactoring/openapi/com/intellij/refactoring/listeners/JavaRefactoringListenerManager.java b/java/openapi/src/com/intellij/refactoring/listeners/JavaRefactoringListenerManager.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/listeners/JavaRefactoringListenerManager.java
rename to java/openapi/src/com/intellij/refactoring/listeners/JavaRefactoringListenerManager.java
diff --git a/refactoring/openapi/com/intellij/refactoring/listeners/MoveMemberListener.java b/java/openapi/src/com/intellij/refactoring/listeners/MoveMemberListener.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/listeners/MoveMemberListener.java
rename to java/openapi/src/com/intellij/refactoring/listeners/MoveMemberListener.java
diff --git a/refactoring/openapi/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java b/java/openapi/src/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java
rename to java/openapi/src/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java
diff --git a/refactoring/openapi/com/intellij/refactoring/listeners/package.html b/java/openapi/src/com/intellij/refactoring/listeners/package.html
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/listeners/package.html
rename to java/openapi/src/com/intellij/refactoring/listeners/package.html
diff --git a/refactoring/openapi/com/intellij/refactoring/package.html b/java/openapi/src/com/intellij/refactoring/package.html
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/package.html
rename to java/openapi/src/com/intellij/refactoring/package.html
diff --git a/refactoring/openapi/com/intellij/refactoring/rename/RegExpValidator.java b/java/openapi/src/com/intellij/refactoring/rename/RegExpValidator.java
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/rename/RegExpValidator.java
rename to java/openapi/src/com/intellij/refactoring/rename/RegExpValidator.java
diff --git a/refactoring/openapi/com/intellij/refactoring/util/package.html b/java/openapi/src/com/intellij/refactoring/util/package.html
similarity index 100%
rename from refactoring/openapi/com/intellij/refactoring/util/package.html
rename to java/openapi/src/com/intellij/refactoring/util/package.html
diff --git a/ui-designer/impl/ui-designer-impl.iml b/ui-designer/impl/ui-designer-impl.iml
index 12b45cd0e3bd..5ccc9cfd879c 100644
--- a/ui-designer/impl/ui-designer-impl.iml
+++ b/ui-designer/impl/ui-designer-impl.iml
@@ -20,7 +20,6 @@
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="compiler-impl" />
     <orderEntry type="module" module-name="refactoring-impl" />
-    <orderEntry type="module" module-name="refactoring-openapi" />
     <orderEntry type="module" module-name="icons" />
     <orderEntry type="module" module-name="resources_eng" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />