diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java b/java/java-psi-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java
rename to java/java-psi-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java
diff --git a/platform/lang-api/src/com/intellij/psi/ElementDescriptionLocation.java b/platform/core-api/src/com/intellij/psi/ElementDescriptionLocation.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ElementDescriptionLocation.java
rename to platform/core-api/src/com/intellij/psi/ElementDescriptionLocation.java
diff --git a/platform/lang-api/src/com/intellij/psi/ElementDescriptionProvider.java b/platform/core-api/src/com/intellij/psi/ElementDescriptionProvider.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ElementDescriptionProvider.java
rename to platform/core-api/src/com/intellij/psi/ElementDescriptionProvider.java
diff --git a/platform/lang-api/src/com/intellij/psi/ElementDescriptionUtil.java b/platform/core-api/src/com/intellij/psi/ElementDescriptionUtil.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/ElementDescriptionUtil.java
rename to platform/core-api/src/com/intellij/psi/ElementDescriptionUtil.java
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesDescriptionLocation.java b/platform/core-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesDescriptionLocation.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesDescriptionLocation.java
rename to platform/core-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesDescriptionLocation.java