diff --git a/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java b/platform/core-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java
similarity index 97%
rename from platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java
rename to platform/core-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java
index 735a11bdfe25..909260858a8c 100644
--- a/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java
+++ b/platform/core-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/core-api/src/com/intellij/psi/stubs/EmptyStub.java b/platform/core-api/src/com/intellij/psi/stubs/EmptyStub.java
new file mode 100644
index 000000000000..c34ec6e179b7
--- /dev/null
+++ b/platform/core-api/src/com/intellij/psi/stubs/EmptyStub.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.stubs;
+
+import com.intellij.psi.PsiElement;
+
+/**
+ * @author peter
+ */
+public class EmptyStub<T extends PsiElement> extends StubBase<T> {
+
+  public EmptyStub(StubElement parent, IStubElementType elementType) {
+    super(parent, elementType);
+  }
+}
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/EmptyStub.java b/platform/lang-api/src/com/intellij/psi/stubs/EmptyStub.java
deleted file mode 100644
index 61bb85da165b..000000000000
--- a/platform/lang-api/src/com/intellij/psi/stubs/EmptyStub.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.intellij.psi.stubs;
-
-import com.intellij.psi.PsiElement;
-
-/**
- * @author peter
- */
-public class EmptyStub<T extends PsiElement> extends StubBase<T> {
-
-  public EmptyStub(StubElement parent, IStubElementType elementType) {
-    super(parent, elementType);
-  }
-}