diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileDocumentManager.java b/platform/core-api/src/com/intellij/openapi/fileEditor/FileDocumentManager.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/fileEditor/FileDocumentManager.java
rename to platform/core-api/src/com/intellij/openapi/fileEditor/FileDocumentManager.java
diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/BinaryFileDecompiler.java b/platform/core-api/src/com/intellij/openapi/fileTypes/BinaryFileDecompiler.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/fileTypes/BinaryFileDecompiler.java
rename to platform/core-api/src/com/intellij/openapi/fileTypes/BinaryFileDecompiler.java
diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/BinaryFileTypeDecompilers.java b/platform/core-api/src/com/intellij/openapi/fileTypes/BinaryFileTypeDecompilers.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/fileTypes/BinaryFileTypeDecompilers.java
rename to platform/core-api/src/com/intellij/openapi/fileTypes/BinaryFileTypeDecompilers.java
diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
rename to platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/INativeFileType.java b/platform/core-api/src/com/intellij/openapi/fileTypes/INativeFileType.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/fileTypes/INativeFileType.java
rename to platform/core-api/src/com/intellij/openapi/fileTypes/INativeFileType.java
diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java b/platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java
rename to platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java
diff --git a/platform/platform-api/src/com/intellij/openapi/project/DumbAware.java b/platform/core-api/src/com/intellij/openapi/project/DumbAware.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/project/DumbAware.java
rename to platform/core-api/src/com/intellij/openapi/project/DumbAware.java
diff --git a/platform/platform-api/src/com/intellij/openapi/project/DumbService.java b/platform/core-api/src/com/intellij/openapi/project/DumbService.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/project/DumbService.java
rename to platform/core-api/src/com/intellij/openapi/project/DumbService.java
diff --git a/platform/platform-api/src/com/intellij/openapi/project/PossiblyDumbAware.java b/platform/core-api/src/com/intellij/openapi/project/PossiblyDumbAware.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/project/PossiblyDumbAware.java
rename to platform/core-api/src/com/intellij/openapi/project/PossiblyDumbAware.java
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Queryable.java b/platform/core-api/src/com/intellij/openapi/ui/Queryable.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/ui/Queryable.java
rename to platform/core-api/src/com/intellij/openapi/ui/Queryable.java
diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/DeprecatedVirtualFileSystem.java b/platform/core-api/src/com/intellij/openapi/vfs/DeprecatedVirtualFileSystem.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/vfs/DeprecatedVirtualFileSystem.java
rename to platform/core-api/src/com/intellij/openapi/vfs/DeprecatedVirtualFileSystem.java
diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/VirtualFileWithId.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileWithId.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/vfs/VirtualFileWithId.java
rename to platform/core-api/src/com/intellij/openapi/vfs/VirtualFileWithId.java
diff --git a/platform/platform-api/src/com/intellij/patterns/ElementPattern.java b/platform/core-api/src/com/intellij/patterns/ElementPattern.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/patterns/ElementPattern.java
rename to platform/core-api/src/com/intellij/patterns/ElementPattern.java
diff --git a/platform/platform-api/src/com/intellij/patterns/ElementPatternCondition.java b/platform/core-api/src/com/intellij/patterns/ElementPatternCondition.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/patterns/ElementPatternCondition.java
rename to platform/core-api/src/com/intellij/patterns/ElementPatternCondition.java
diff --git a/platform/platform-api/src/com/intellij/patterns/InitialPatternCondition.java b/platform/core-api/src/com/intellij/patterns/InitialPatternCondition.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/patterns/InitialPatternCondition.java
rename to platform/core-api/src/com/intellij/patterns/InitialPatternCondition.java
diff --git a/platform/platform-api/src/com/intellij/patterns/PatternCondition.java b/platform/core-api/src/com/intellij/patterns/PatternCondition.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/patterns/PatternCondition.java
rename to platform/core-api/src/com/intellij/patterns/PatternCondition.java
diff --git a/platform/platform-api/src/com/intellij/psi/LanguageSubstitutor.java b/platform/core-api/src/com/intellij/psi/LanguageSubstitutor.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/psi/LanguageSubstitutor.java
rename to platform/core-api/src/com/intellij/psi/LanguageSubstitutor.java
diff --git a/platform/platform-api/src/com/intellij/psi/LanguageSubstitutors.java b/platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/psi/LanguageSubstitutors.java
rename to platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
diff --git a/platform/platform-api/src/com/intellij/testFramework/LightVirtualFile.java b/platform/core-api/src/com/intellij/testFramework/LightVirtualFile.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/testFramework/LightVirtualFile.java
rename to platform/core-api/src/com/intellij/testFramework/LightVirtualFile.java
diff --git a/platform/platform-api/src/com/intellij/ui/DeferredIcon.java b/platform/core-api/src/com/intellij/ui/DeferredIcon.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/ui/DeferredIcon.java
rename to platform/core-api/src/com/intellij/ui/DeferredIcon.java
diff --git a/platform/platform-api/src/com/intellij/ui/IconDeferrer.java b/platform/core-api/src/com/intellij/ui/IconDeferrer.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/ui/IconDeferrer.java
rename to platform/core-api/src/com/intellij/ui/IconDeferrer.java
diff --git a/platform/platform-api/src/com/intellij/ui/LayeredIcon.java b/platform/core-api/src/com/intellij/ui/LayeredIcon.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/ui/LayeredIcon.java
rename to platform/core-api/src/com/intellij/ui/LayeredIcon.java
diff --git a/platform/platform-api/src/com/intellij/ui/RowIcon.java b/platform/core-api/src/com/intellij/ui/RowIcon.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/ui/RowIcon.java
rename to platform/core-api/src/com/intellij/ui/RowIcon.java
diff --git a/platform/platform-api/src/com/intellij/util/IconUtil.java b/platform/core-api/src/com/intellij/util/IconUtil.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/util/IconUtil.java
rename to platform/core-api/src/com/intellij/util/IconUtil.java