diff --git a/source/com/intellij/openapi/components/impl/stores/IdeaProjectStoreClassProvider.java b/java/idea-ui/src/com/intellij/openapi/components/impl/stores/IdeaProjectStoreClassProvider.java
similarity index 100%
rename from source/com/intellij/openapi/components/impl/stores/IdeaProjectStoreClassProvider.java
rename to java/idea-ui/src/com/intellij/openapi/components/impl/stores/IdeaProjectStoreClassProvider.java
diff --git a/source/com/intellij/openapi/components/impl/stores/IdeaProjectStoreImpl.java b/java/idea-ui/src/com/intellij/openapi/components/impl/stores/IdeaProjectStoreImpl.java
similarity index 100%
rename from source/com/intellij/openapi/components/impl/stores/IdeaProjectStoreImpl.java
rename to java/idea-ui/src/com/intellij/openapi/components/impl/stores/IdeaProjectStoreImpl.java
diff --git a/source/com/intellij/openapi/project/impl/IdeaProjectManagerImpl.java b/java/idea-ui/src/com/intellij/openapi/project/impl/IdeaProjectManagerImpl.java
similarity index 100%
rename from source/com/intellij/openapi/project/impl/IdeaProjectManagerImpl.java
rename to java/idea-ui/src/com/intellij/openapi/project/impl/IdeaProjectManagerImpl.java
diff --git a/source/com/intellij/openapi/project/impl/convertors/Convertor01.java b/java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor01.java
similarity index 100%
rename from source/com/intellij/openapi/project/impl/convertors/Convertor01.java
rename to java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor01.java
diff --git a/source/com/intellij/openapi/project/impl/convertors/Convertor12.java b/java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor12.java
similarity index 100%
rename from source/com/intellij/openapi/project/impl/convertors/Convertor12.java
rename to java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor12.java
diff --git a/source/com/intellij/openapi/project/impl/convertors/Convertor23.java b/java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor23.java
similarity index 100%
rename from source/com/intellij/openapi/project/impl/convertors/Convertor23.java
rename to java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor23.java
diff --git a/source/com/intellij/openapi/project/impl/convertors/Convertor34.java b/java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor34.java
similarity index 100%
rename from source/com/intellij/openapi/project/impl/convertors/Convertor34.java
rename to java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Convertor34.java
diff --git a/source/com/intellij/openapi/project/impl/convertors/Util.java b/java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Util.java
similarity index 100%
rename from source/com/intellij/openapi/project/impl/convertors/Util.java
rename to java/idea-ui/src/com/intellij/openapi/project/impl/convertors/Util.java
diff --git a/source/com/intellij/openapi/keymap/JBuilderKeymapProvider.java b/java/java-impl/src/com/intellij/openapi/keymap/JBuilderKeymapProvider.java
similarity index 100%
rename from source/com/intellij/openapi/keymap/JBuilderKeymapProvider.java
rename to java/java-impl/src/com/intellij/openapi/keymap/JBuilderKeymapProvider.java
diff --git a/source/com/intellij/openapi/roots/impl/CompilerModuleExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerModuleExtensionImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/CompilerModuleExtensionImpl.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/CompilerModuleExtensionImpl.java
diff --git a/source/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
diff --git a/source/com/intellij/openapi/roots/impl/ExcludeCompilerOutputPolicy.java b/java/java-impl/src/com/intellij/openapi/roots/impl/ExcludeCompilerOutputPolicy.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/ExcludeCompilerOutputPolicy.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/ExcludeCompilerOutputPolicy.java
diff --git a/source/com/intellij/openapi/roots/impl/JavaLanguageLevelPusher.java b/java/java-impl/src/com/intellij/openapi/roots/impl/JavaLanguageLevelPusher.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/JavaLanguageLevelPusher.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/JavaLanguageLevelPusher.java
diff --git a/source/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
diff --git a/source/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java
diff --git a/source/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java b/java/java-impl/src/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/OldModuleRootsKeeper.java
diff --git a/source/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java
rename to java/java-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java