diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/MiddleTreePatcher.java b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/MiddleTreePatcher.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/templateLanguages/MiddleTreePatcher.java
rename to platform/analysis-impl/src/com/intellij/psi/templateLanguages/MiddleTreePatcher.java
diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/OuterLanguageElementImpl.java b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/OuterLanguageElementImpl.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/templateLanguages/OuterLanguageElementImpl.java
rename to platform/analysis-impl/src/com/intellij/psi/templateLanguages/OuterLanguageElementImpl.java
diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/SimpleTreePatcher.java b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/SimpleTreePatcher.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/templateLanguages/SimpleTreePatcher.java
rename to platform/analysis-impl/src/com/intellij/psi/templateLanguages/SimpleTreePatcher.java
diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
rename to platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java
index 34c5389d0e85..4efbc826345a 100644
--- a/python/gen/icons/PythonIcons.java
+++ b/python/gen/icons/PythonIcons.java
@@ -43,7 +43,6 @@ public final class PythonIcons {
     }
     /** 16x16 */ public static final @NotNull Icon Dotnet = load("/icons/com/jetbrains/python/dotnet.svg");
     /** 16x16 */ public static final @NotNull Icon Function = load("/icons/com/jetbrains/python/function.svg");
-    /** 16x16 */ public static final @NotNull Icon IpythonNotebook = load("/icons/com/jetbrains/python/IpythonNotebook.svg");
     /** 16x16 */ public static final @NotNull Icon Jython = load("/icons/com/jetbrains/python/jython.svg");
     /** 16x16 */ public static final @NotNull Icon Pypy = load("/icons/com/jetbrains/python/pypy.svg");
     /** 16x16 */ public static final @NotNull Icon Python = load("/icons/com/jetbrains/python/python.svg");
diff --git a/python/pluginResources/icons/com/jetbrains/python/IpythonNotebook.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/IpythonNotebook.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/IpythonNotebook.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/IpythonNotebook.svg
diff --git a/python/python-psi-api/src/icons/PythonPsiApiIcons.java b/python/python-psi-api/src/icons/PythonPsiApiIcons.java
index 1c1aaa33dbee..aec492f7be68 100644
--- a/python/python-psi-api/src/icons/PythonPsiApiIcons.java
+++ b/python/python-psi-api/src/icons/PythonPsiApiIcons.java
@@ -15,6 +15,7 @@ public final class PythonPsiApiIcons {
     return IconManager.getInstance().getIcon(path, PythonPsiApiIcons.class);
   }
 
+  /** 16x16 */ public static final @NotNull Icon IpythonNotebook = load("/icons/com/jetbrains/python/IpythonNotebook.svg");
 
   public final static class Nodes {
     /** 16x16 */ public static final @NotNull Icon Cyan_dot = load("/icons/com/jetbrains/python/nodes/cyan-dot.svg");