diff --git a/java/java-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java b/java/java-psi-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java
rename to java/java-psi-impl/src/com/intellij/codeInsight/TestFrameworksImpl.java
diff --git a/platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateDescriptor.java b/platform/core-api/src/com/intellij/ide/fileTemplates/FileTemplateDescriptor.java
similarity index 88%
rename from platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateDescriptor.java
rename to platform/core-api/src/com/intellij/ide/fileTemplates/FileTemplateDescriptor.java
index cfa72d76d71e..897c3550cd93 100644
--- a/platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateDescriptor.java
+++ b/platform/core-api/src/com/intellij/ide/fileTemplates/FileTemplateDescriptor.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.ide.fileTemplates;
 
-import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
@@ -25,7 +25,7 @@ public class FileTemplateDescriptor {
   private final String myFileName;
 
   public FileTemplateDescriptor(@NonNls String fileName) {
-    this(fileName, FileTypeManager.getInstance().getFileTypeByFileName(fileName).getIcon());
+    this(fileName, FileTypeRegistry.getInstance().getFileTypeByFileName(fileName).getIcon());
   }
 
   public FileTemplateDescriptor(@NonNls String fileName, Icon icon) {
diff --git a/platform/lang-api/src/com/intellij/testIntegration/TestFramework.java b/platform/core-api/src/com/intellij/testIntegration/TestFramework.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/testIntegration/TestFramework.java
rename to platform/core-api/src/com/intellij/testIntegration/TestFramework.java