diff --git a/source/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
similarity index 100%
rename from source/com/intellij/openapi/module/JavaModuleType.java
rename to java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
diff --git a/source/com/intellij/openapi/module/impl/JavaAwareModuleTypeManagerImpl.java b/java/java-impl/src/com/intellij/openapi/module/impl/JavaAwareModuleTypeManagerImpl.java
similarity index 100%
rename from source/com/intellij/openapi/module/impl/JavaAwareModuleTypeManagerImpl.java
rename to java/java-impl/src/com/intellij/openapi/module/impl/JavaAwareModuleTypeManagerImpl.java
diff --git a/source/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java b/java/java-impl/src/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java
similarity index 100%
rename from source/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java
rename to java/java-impl/src/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java
diff --git a/source/com/intellij/openapi/module/impl/ModulePointerImpl.java b/java/java-impl/src/com/intellij/openapi/module/impl/ModulePointerImpl.java
similarity index 100%
rename from source/com/intellij/openapi/module/impl/ModulePointerImpl.java
rename to java/java-impl/src/com/intellij/openapi/module/impl/ModulePointerImpl.java
diff --git a/source/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java b/java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
similarity index 100%
rename from source/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
rename to java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
diff --git a/source/com/intellij/packageDependencies/JavaDependenciesVisitorFactory.java b/java/java-impl/src/com/intellij/packageDependencies/JavaDependenciesVisitorFactory.java
similarity index 100%
rename from source/com/intellij/packageDependencies/JavaDependenciesVisitorFactory.java
rename to java/java-impl/src/com/intellij/packageDependencies/JavaDependenciesVisitorFactory.java
diff --git a/source/com/intellij/packageDependencies/ui/GeneralGroupNode.java b/java/java-impl/src/com/intellij/packageDependencies/ui/GeneralGroupNode.java
similarity index 100%
rename from source/com/intellij/packageDependencies/ui/GeneralGroupNode.java
rename to java/java-impl/src/com/intellij/packageDependencies/ui/GeneralGroupNode.java
diff --git a/source/com/intellij/packageDependencies/ui/LibraryNode.java b/java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java
similarity index 100%
rename from source/com/intellij/packageDependencies/ui/LibraryNode.java
rename to java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java
diff --git a/source/com/intellij/packageDependencies/ui/PackageNode.java b/java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java
similarity index 100%
rename from source/com/intellij/packageDependencies/ui/PackageNode.java
rename to java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java
diff --git a/source/com/intellij/packageDependencies/ui/PackagePatternProvider.java b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java
similarity index 100%
rename from source/com/intellij/packageDependencies/ui/PackagePatternProvider.java
rename to java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java
diff --git a/source/com/intellij/packageDependencies/ui/TreeModelBuilder.java b/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java
similarity index 100%
rename from source/com/intellij/packageDependencies/ui/TreeModelBuilder.java
rename to java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java
diff --git a/source/com/intellij/pom/java/impl/PomJavaAspectImpl.java b/java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java
similarity index 100%
rename from source/com/intellij/pom/java/impl/PomJavaAspectImpl.java
rename to java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java
diff --git a/source/com/intellij/profile/codeInspection/ui/JavaErrorOptionsProvider.java b/java/java-impl/src/com/intellij/profile/codeInspection/ui/JavaErrorOptionsProvider.java
similarity index 100%
rename from source/com/intellij/profile/codeInspection/ui/JavaErrorOptionsProvider.java
rename to java/java-impl/src/com/intellij/profile/codeInspection/ui/JavaErrorOptionsProvider.java