diff --git a/codeInsight/openapi/com/intellij/codeInsight/AnnotationUtil.java b/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/AnnotationUtil.java
rename to java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/ClassUtil.java b/java/openapi/src/com/intellij/codeInsight/ClassUtil.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/ClassUtil.java
rename to java/openapi/src/com/intellij/codeInsight/ClassUtil.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/CodeInsightServicesUtil.java b/java/openapi/src/com/intellij/codeInsight/CodeInsightServicesUtil.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/CodeInsightServicesUtil.java
rename to java/openapi/src/com/intellij/codeInsight/CodeInsightServicesUtil.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/CodeSmellInfo.java b/java/openapi/src/com/intellij/codeInsight/CodeSmellInfo.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/CodeSmellInfo.java
rename to java/openapi/src/com/intellij/codeInsight/CodeSmellInfo.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/ExternalAnnotationsManager.java b/java/openapi/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/ExternalAnnotationsManager.java
rename to java/openapi/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/MethodImplementor.java b/java/openapi/src/com/intellij/codeInsight/MethodImplementor.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/MethodImplementor.java
rename to java/openapi/src/com/intellij/codeInsight/MethodImplementor.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/TestFramework.java b/java/openapi/src/com/intellij/codeInsight/TestFramework.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/TestFramework.java
rename to java/openapi/src/com/intellij/codeInsight/TestFramework.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/TestUtil.java b/java/openapi/src/com/intellij/codeInsight/TestUtil.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/TestUtil.java
rename to java/openapi/src/com/intellij/codeInsight/TestUtil.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java b/java/openapi/src/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java
rename to java/openapi/src/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/completion/util/SimpleMethodCallLookupElement.java b/java/openapi/src/com/intellij/codeInsight/completion/util/SimpleMethodCallLookupElement.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/completion/util/SimpleMethodCallLookupElement.java
rename to java/openapi/src/com/intellij/codeInsight/completion/util/SimpleMethodCallLookupElement.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/daemon/GroupNames.java b/java/openapi/src/com/intellij/codeInsight/daemon/GroupNames.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/daemon/GroupNames.java
rename to java/openapi/src/com/intellij/codeInsight/daemon/GroupNames.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java b/java/openapi/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
rename to java/openapi/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java b/java/openapi/src/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java
rename to java/openapi/src/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java b/java/openapi/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java
rename to java/openapi/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/highlighting/package.html b/java/openapi/src/com/intellij/codeInsight/highlighting/package.html
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/highlighting/package.html
rename to java/openapi/src/com/intellij/codeInsight/highlighting/package.html
diff --git a/codeInsight/openapi/com/intellij/codeInsight/intention/AddAnnotationFix.java b/java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/intention/AddAnnotationFix.java
rename to java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/intention/QuickFixFactory.java b/java/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/intention/QuickFixFactory.java
rename to java/openapi/src/com/intellij/codeInsight/intention/QuickFixFactory.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/package.html b/java/openapi/src/com/intellij/codeInsight/package.html
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/package.html
rename to java/openapi/src/com/intellij/codeInsight/package.html
diff --git a/codeInsight/openapi/com/intellij/codeInsight/quickfix/ChangeVariableTypeQuickFixProvider.java b/java/openapi/src/com/intellij/codeInsight/quickfix/ChangeVariableTypeQuickFixProvider.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/quickfix/ChangeVariableTypeQuickFixProvider.java
rename to java/openapi/src/com/intellij/codeInsight/quickfix/ChangeVariableTypeQuickFixProvider.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java b/java/openapi/src/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java
rename to java/openapi/src/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java
diff --git a/codeInsight/openapi/com/intellij/codeInsight/runner/JavaMainMethodProvider.java b/java/openapi/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java
similarity index 100%
rename from codeInsight/openapi/com/intellij/codeInsight/runner/JavaMainMethodProvider.java
rename to java/openapi/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java