let's have separate modules for python-psi-api (that will go into upsource later) and python-openapi (which will contain UI stuff and more)

python/build/pycharm_build.gant

@@ -53,7 +53,7 @@ private List<String> pycharmPlatformApiModules() {
 
 
 private List pycharmImplementationModules() {
-  return ["yaml", "graph", "coverage-common", "python", "python-ide", "python-openapi"]
+  return ["yaml", "graph", "coverage-common", "python", "python-ide", "python-openapi", "python-psi-api"]
 }
 
 class Paths {

python/openapi/python-openapi.iml

@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
+    <orderEntry type="module" module-name="python-psi-api" exported="" />
   </component>
 </module>
 

python/psi-api/python-psi-api.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core-api" />
+  </component>
+</module>
+

python/psi-api/src/com/jetbrains/python/codeInsight/controlflow/ScopeOwner.java

@@ -0,0 +1,12 @@
+package com.jetbrains.python.codeInsight.controlflow;
+
+import com.jetbrains.python.psi.PyElement;
+
+/**
+ * Marker interface for Python elements which define a scope.
+ *
+ * @see ControlFlowCache
+ * @author oleg
+ */
+public interface ScopeOwner extends PyElement {
+}