diff --git a/ExtendedApi/ExtendedApi.iml b/ExtendedApi/ExtendedApi.iml
index d769af7d4f93..542e592c28b8 100644
--- a/ExtendedApi/ExtendedApi.iml
+++ b/ExtendedApi/ExtendedApi.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="resources_eng" />
     <orderEntry type="module" module-name="codeInsight-impl" exported="" />
     <orderEntry type="module" module-name="inspections-impl" exported="" />
-    <orderEntry type="module" module-name="inspections-openapi" />
     <orderEntry type="module" module-name="dom-openapi" />
     <orderEntry type="module" module-name="lang-api" exported="" />
     <orderEntry type="module" module-name="lang-impl" exported="" />
diff --git a/codeInsight/codeInsight-impl.iml b/codeInsight/codeInsight-impl.iml
index 072561a05d66..1d5f354829d1 100644
--- a/codeInsight/codeInsight-impl.iml
+++ b/codeInsight/codeInsight-impl.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="Annotations" />
     <orderEntry type="module" module-name="inspections-impl" />
-    <orderEntry type="module" module-name="inspections-openapi" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="refactoring-impl" />
     <orderEntry type="module" module-name="resources_eng" />
diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index 4bd8d9d9e336..ba2cb5c4d63f 100644
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -30,7 +30,6 @@
     <orderEntry type="module" module-name="extensions" exported="" />
     <orderEntry type="module" module-name="icons" />
     <orderEntry type="module" module-name="resources_eng" exported="" />
-    <orderEntry type="module" module-name="inspections-openapi" exported="" />
     <orderEntry type="module" module-name="execution-openapi" exported="" />
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
     <orderEntry type="library" exported="" name="microba" level="project" />
diff --git a/inspections/openapi/com/intellij/codeInspection/GlobalJavaInspectionContext.java b/java/openapi/src/com/intellij/codeInspection/GlobalJavaInspectionContext.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/GlobalJavaInspectionContext.java
rename to java/openapi/src/com/intellij/codeInspection/GlobalJavaInspectionContext.java
diff --git a/inspections/openapi/com/intellij/codeInspection/GlobalJavaInspectionTool.java b/java/openapi/src/com/intellij/codeInspection/GlobalJavaInspectionTool.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/GlobalJavaInspectionTool.java
rename to java/openapi/src/com/intellij/codeInspection/GlobalJavaInspectionTool.java
diff --git a/inspections/openapi/com/intellij/codeInspection/HTMLJavaHTMLComposer.java b/java/openapi/src/com/intellij/codeInspection/HTMLJavaHTMLComposer.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/HTMLJavaHTMLComposer.java
rename to java/openapi/src/com/intellij/codeInspection/HTMLJavaHTMLComposer.java
diff --git a/inspections/openapi/com/intellij/codeInspection/SuppressManager.java b/java/openapi/src/com/intellij/codeInspection/SuppressManager.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/SuppressManager.java
rename to java/openapi/src/com/intellij/codeInspection/SuppressManager.java
diff --git a/inspections/openapi/com/intellij/codeInspection/deadCode/UnusedCodeExtension.java b/java/openapi/src/com/intellij/codeInspection/deadCode/UnusedCodeExtension.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/deadCode/UnusedCodeExtension.java
rename to java/openapi/src/com/intellij/codeInspection/deadCode/UnusedCodeExtension.java
diff --git a/inspections/openapi/com/intellij/codeInspection/ex/EntryPointsManager.java b/java/openapi/src/com/intellij/codeInspection/ex/EntryPointsManager.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/ex/EntryPointsManager.java
rename to java/openapi/src/com/intellij/codeInspection/ex/EntryPointsManager.java
diff --git a/inspections/openapi/com/intellij/codeInspection/package.html b/java/openapi/src/com/intellij/codeInspection/package.html
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/package.html
rename to java/openapi/src/com/intellij/codeInspection/package.html
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefClass.java b/java/openapi/src/com/intellij/codeInspection/reference/RefClass.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefClass.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefClass.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefField.java b/java/openapi/src/com/intellij/codeInspection/reference/RefField.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefField.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefField.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefImplicitConstructor.java b/java/openapi/src/com/intellij/codeInspection/reference/RefImplicitConstructor.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefImplicitConstructor.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefImplicitConstructor.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefJavaElement.java b/java/openapi/src/com/intellij/codeInspection/reference/RefJavaElement.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefJavaElement.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefJavaElement.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefJavaManager.java b/java/openapi/src/com/intellij/codeInspection/reference/RefJavaManager.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefJavaManager.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefJavaManager.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefJavaUtil.java b/java/openapi/src/com/intellij/codeInspection/reference/RefJavaUtil.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefJavaUtil.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefJavaUtil.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefJavaVisitor.java b/java/openapi/src/com/intellij/codeInspection/reference/RefJavaVisitor.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefJavaVisitor.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefJavaVisitor.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefMethod.java b/java/openapi/src/com/intellij/codeInspection/reference/RefMethod.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefMethod.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefMethod.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefPackage.java b/java/openapi/src/com/intellij/codeInspection/reference/RefPackage.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefPackage.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefPackage.java
diff --git a/inspections/openapi/com/intellij/codeInspection/reference/RefParameter.java b/java/openapi/src/com/intellij/codeInspection/reference/RefParameter.java
similarity index 100%
rename from inspections/openapi/com/intellij/codeInspection/reference/RefParameter.java
rename to java/openapi/src/com/intellij/codeInspection/reference/RefParameter.java
diff --git a/ui-designer/impl/ui-designer-impl.iml b/ui-designer/impl/ui-designer-impl.iml
index cf4c99ccf2e2..2d3564da6c4d 100644
--- a/ui-designer/impl/ui-designer-impl.iml
+++ b/ui-designer/impl/ui-designer-impl.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="forms_rt" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="inspections-openapi" />
     <orderEntry type="module" module-name="inspections-impl" />
     <orderEntry type="module" module-name="execution-impl" />
     <orderEntry type="module" module-name="execution-openapi" />