diff --git a/IPython/Extensions/clearcmd.py b/IPython/Extensions/clearcmd.py
index 76cfbf7..8fbe4aa 100644
--- a/IPython/Extensions/clearcmd.py
+++ b/IPython/Extensions/clearcmd.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 """ IPython extension: add %clear magic """
 
-import IPython.ipapi
+from IPython.core import ipapi
 import gc
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 def clear_f(self,arg):
     """ Clear various data (e.g. stored history data)
diff --git a/IPython/Extensions/envpersist.py b/IPython/Extensions/envpersist.py
index ee4c139..62a96b1 100644
--- a/IPython/Extensions/envpersist.py
+++ b/IPython/Extensions/envpersist.py
@@ -2,8 +2,8 @@
 """ %env magic command for storing environment variables persistently
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys
 
@@ -16,7 +16,7 @@ def restore_env(self):
         os.environ[k] = os.environ.get(k,"") + v
     for k,v in env['pre']:
         os.environ[k] = v + os.environ.get(k,"")
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
   
 ip.set_hook('late_startup_hook', restore_env)
 
diff --git a/IPython/Extensions/ext_rescapture.py b/IPython/Extensions/ext_rescapture.py
index 6b7aec8..d3877c0 100644
--- a/IPython/Extensions/ext_rescapture.py
+++ b/IPython/Extensions/ext_rescapture.py
@@ -8,10 +8,10 @@ var = %magic blah blah
 var = !ls
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.utils.genutils import *
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 import re
 
@@ -58,6 +58,6 @@ def regex_prefilter_f(self,line):
         if mo:
             return handler(line,mo)
     
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 ip.set_hook('input_prefilter', regex_prefilter_f)     
diff --git a/IPython/Extensions/ibrowse.py b/IPython/Extensions/ibrowse.py
index 68a07c1..fcbef75 100644
--- a/IPython/Extensions/ibrowse.py
+++ b/IPython/Extensions/ibrowse.py
@@ -2,7 +2,7 @@
 
 import curses, fcntl, signal, struct, tty, textwrap, inspect
 
-from IPython import ipapi
+from IPython.coreZ import ipapi
 
 import astyle, ipipe
 
diff --git a/IPython/Extensions/igrid.py b/IPython/Extensions/igrid.py
index a2d317f..b49793c 100644
--- a/IPython/Extensions/igrid.py
+++ b/IPython/Extensions/igrid.py
@@ -1,7 +1,7 @@
 # -*- coding: iso-8859-1 -*-
 
 import ipipe, os, webbrowser, urllib
-from IPython import ipapi
+from IPython.core import ipapi
 import wx
 import wx.grid, wx.html
 
diff --git a/IPython/Extensions/ipipe.py b/IPython/Extensions/ipipe.py
index b739df2..22d8f61 100644
--- a/IPython/Extensions/ipipe.py
+++ b/IPython/Extensions/ipipe.py
@@ -139,7 +139,7 @@ except ImportError:
     genutils = None
     generics = None
 
-from IPython import ipapi
+from IPython.core import ipapi
 
 
 __all__ = [
diff --git a/IPython/Extensions/ipy_app_completers.py b/IPython/Extensions/ipy_app_completers.py
index 629ef79..5cca537 100644
--- a/IPython/Extensions/ipy_app_completers.py
+++ b/IPython/Extensions/ipy_app_completers.py
@@ -5,9 +5,9 @@ IPython extension that installs the completers related to external apps.
 The actual implementations are in Extensions/ipy_completers.py
 
 """
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from ipy_completers import *
 
diff --git a/IPython/Extensions/ipy_autoreload.py b/IPython/Extensions/ipy_autoreload.py
index e64161d..7a9c0e6 100644
--- a/IPython/Extensions/ipy_autoreload.py
+++ b/IPython/Extensions/ipy_autoreload.py
@@ -224,15 +224,15 @@ reloader = ModuleReloader()
 #------------------------------------------------------------------------------
 # IPython connectivity
 #------------------------------------------------------------------------------
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 autoreload_enabled = False
 
 def runcode_hook(self):
     if not autoreload_enabled:
-        raise IPython.ipapi.TryNext
+        raise ipapi.TryNext
     try:
         reloader.check()
     except:
diff --git a/IPython/Extensions/ipy_completers.py b/IPython/Extensions/ipy_completers.py
index e8c5eb5..0f02bd3 100644
--- a/IPython/Extensions/ipy_completers.py
+++ b/IPython/Extensions/ipy_completers.py
@@ -7,12 +7,12 @@ but the basic idea is to do:
 ip.set_hook('complete_command', svn_completer, str_key = 'svn')
 
 """
-import IPython.ipapi
+import IPython.core import ipapi
 import glob,os,shlex,sys
 import inspect
 from time import time
 from zipimport import zipimporter
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 try:
     set
@@ -329,7 +329,7 @@ def cd_completer(self, event):
         if ' ' in d:
             # we don't want to deal with any of that, complex code
             # for this is elsewhere
-            raise IPython.ipapi.TryNext
+            raise ipapi.TryNext
         found.append( d )
 
     if not found:
@@ -341,7 +341,7 @@ def cd_completer(self, event):
         if bkmatches:
             return bkmatches
         
-        raise IPython.ipapi.TryNext
+        raise ipapi.TryNext
 
 
     def single_dir_expand(matches):
diff --git a/IPython/Extensions/ipy_defaults.py b/IPython/Extensions/ipy_defaults.py
index 89ea3e2..5565738 100644
--- a/IPython/Extensions/ipy_defaults.py
+++ b/IPython/Extensions/ipy_defaults.py
@@ -13,8 +13,8 @@ ipy_profile_PROFILENAME etc.
 """
 
 import IPython.rlineimpl as readline
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 o = ip.options
 
diff --git a/IPython/Extensions/ipy_editors.py b/IPython/Extensions/ipy_editors.py
index 88e064a..3833e8a 100644
--- a/IPython/Extensions/ipy_editors.py
+++ b/IPython/Extensions/ipy_editors.py
@@ -5,8 +5,8 @@ They should honor the line number argument, at least.
 Contributions are *very* welcome.
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 from IPython.Itpl import itplns
 import os
@@ -29,7 +29,7 @@ def install_editor(run_template, wait = False):
         cmd = itplns(run_template, locals())
         print ">",cmd
         if os.system(cmd) != 0:
-            raise IPython.ipapi.TryNext()
+            raise ipapi.TryNext()
         if wait:
             raw_input("Press Enter when done editing:")
 
diff --git a/IPython/Extensions/ipy_exportdb.py b/IPython/Extensions/ipy_exportdb.py
index d19cfc0..cf4c191 100644
--- a/IPython/Extensions/ipy_exportdb.py
+++ b/IPython/Extensions/ipy_exportdb.py
@@ -1,11 +1,11 @@
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,pprint
 
 def export(filename = None):
 
-    lines = ['import IPython.ipapi', 'ip = IPython.ipapi.get()','']
+    lines = ['import IPython.core.ipapi', 'ip = IPython.core.ipapi.get()','']
 
     vars = ip.db.keys('autorestore/*')
     vars.sort()
diff --git a/IPython/Extensions/ipy_extutil.py b/IPython/Extensions/ipy_extutil.py
index c35cbc3..38f0d6c 100644
--- a/IPython/Extensions/ipy_extutil.py
+++ b/IPython/Extensions/ipy_extutil.py
@@ -7,8 +7,8 @@ to.
 # for the purposes of this module, every module that has the name 'ip' globally
 # installed as below is an IPython extension
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import sys,textwrap,inspect
 
@@ -34,7 +34,7 @@ class ExtUtil:
         act = []
         for mname,m in sys.modules.items():
             o = getattr(m, 'ip', None)
-            if isinstance(o, IPython.ipapi.IPApi):
+            if isinstance(o, ipapi.IPApi):
                 act.append((mname,m))
         act.sort()                
         return act
diff --git a/IPython/Extensions/ipy_fsops.py b/IPython/Extensions/ipy_fsops.py
index 4e2ae9f..5180bba 100644
--- a/IPython/Extensions/ipy_fsops.py
+++ b/IPython/Extensions/ipy_fsops.py
@@ -15,13 +15,13 @@ do some useful tricks on their own, though (like use 'mglob' patterns).
 Not to be confused with ipipe commands (ils etc.) that also start with i.
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import shutil,os,shlex
 from IPython.external import mglob
 from IPython.external.path import path
-from IPython.ipapi import UsageError
+from IPython.core.ipapi import UsageError
 import IPython.utils.generics
 
 def parse_args(args):
@@ -229,7 +229,7 @@ def complete_pathobj(obj, prev_completions):
         if res:
             return res
     # just return normal attributes of 'path' object if the dir is empty
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 complete_pathobj = IPython.utils.generics.complete_object.when_type(PathObj)(complete_pathobj)
 
diff --git a/IPython/Extensions/ipy_gnuglobal.py b/IPython/Extensions/ipy_gnuglobal.py
index d03babc..32f5b7c 100644
--- a/IPython/Extensions/ipy_gnuglobal.py
+++ b/IPython/Extensions/ipy_gnuglobal.py
@@ -8,8 +8,8 @@ http://www.gnu.org/software/global/
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 import os
 
 # alter to your liking
diff --git a/IPython/Extensions/ipy_greedycompleter.py b/IPython/Extensions/ipy_greedycompleter.py
index 3536efc..7ab77e7 100644
--- a/IPython/Extensions/ipy_greedycompleter.py
+++ b/IPython/Extensions/ipy_greedycompleter.py
@@ -9,7 +9,7 @@ only whitespace as completer delimiter. If this works well, we will
 do the same in default completer.
 
 """
-from IPython import ipapi
+from IPython.core import ipapi
 from IPython.utils import generics
 from IPython.utils.genutils import dir2
 
diff --git a/IPython/Extensions/ipy_jot.py b/IPython/Extensions/ipy_jot.py
index 26eb106..60bd5b2 100644
--- a/IPython/Extensions/ipy_jot.py
+++ b/IPython/Extensions/ipy_jot.py
@@ -8,8 +8,8 @@ Stores variables in Struct with some notes in PicleShare database
 """
 
 from datetime import datetime 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import pickleshare
 
diff --git a/IPython/Extensions/ipy_legacy.py b/IPython/Extensions/ipy_legacy.py
index ee7f094..f3fdc26 100644
--- a/IPython/Extensions/ipy_legacy.py
+++ b/IPython/Extensions/ipy_legacy.py
@@ -9,8 +9,8 @@ Stuff that is considered obsolete / redundant is gradually moved here.
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys
 
diff --git a/IPython/Extensions/ipy_lookfor.py b/IPython/Extensions/ipy_lookfor.py
index eb56f3d..4c766db 100644
--- a/IPython/Extensions/ipy_lookfor.py
+++ b/IPython/Extensions/ipy_lookfor.py
@@ -201,8 +201,8 @@ def _lookfor_generate_cache(module, import_modules, regenerate):
 # IPython connectivity
 #------------------------------------------------------------------------------
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 _lookfor_modules = ['numpy', 'scipy']
 
diff --git a/IPython/Extensions/ipy_p4.py b/IPython/Extensions/ipy_p4.py
index 448ce2a..3c77e20 100644
--- a/IPython/Extensions/ipy_p4.py
+++ b/IPython/Extensions/ipy_p4.py
@@ -3,8 +3,8 @@
 Add %p4 magic for pythonic p4 (Perforce) usage.
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys,marshal
 
diff --git a/IPython/Extensions/ipy_pretty.py b/IPython/Extensions/ipy_pretty.py
index 60460a4..eebe48d 100644
--- a/IPython/Extensions/ipy_pretty.py
+++ b/IPython/Extensions/ipy_pretty.py
@@ -16,12 +16,12 @@ for numpy dtype objects, add the following to your ipy_user_conf.py::
     ipy_pretty.for_type_by_name('numpy', 'dtype', ipy_pretty.dtype_pprinter)
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.utils.genutils import Term
 
 from IPython.external import pretty
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 
 #### Implementation ############################################################
diff --git a/IPython/Extensions/ipy_profile_doctest.py b/IPython/Extensions/ipy_profile_doctest.py
index b35074e..6adb5ab 100644
--- a/IPython/Extensions/ipy_profile_doctest.py
+++ b/IPython/Extensions/ipy_profile_doctest.py
@@ -14,7 +14,7 @@ similar as possible to the default Python ones, for inclusion in doctests."""
 # get various stuff that are there for historical / familiarity reasons
 import ipy_legacy
 
-from  IPython import ipapi
+from IPython.core import ipapi
 
 from IPython.Extensions import InterpreterPasteInput
 
diff --git a/IPython/Extensions/ipy_profile_numpy.py b/IPython/Extensions/ipy_profile_numpy.py
index a722627..6659884 100644
--- a/IPython/Extensions/ipy_profile_numpy.py
+++ b/IPython/Extensions/ipy_profile_numpy.py
@@ -5,11 +5,11 @@ This profile loads the math/cmath modules as well as all of numpy.
 It exposes numpy via the 'np' shorthand as well for convenience.
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 import ipy_defaults
 
 def main():
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
 
     try:
         ip.ex("import math,cmath")
diff --git a/IPython/Extensions/ipy_profile_scipy.py b/IPython/Extensions/ipy_profile_scipy.py
index 907448a..25defe4 100644
--- a/IPython/Extensions/ipy_profile_scipy.py
+++ b/IPython/Extensions/ipy_profile_scipy.py
@@ -6,11 +6,11 @@ It exposes numpy and scipy via the 'np' and 'sp' shorthands as well for
 convenience.
 """
 
-import IPython.ipapi
+from IPython.core import ipapi
 import ipy_defaults
 
 def main():
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
 
     try:
         ip.ex("import math,cmath")
diff --git a/IPython/Extensions/ipy_profile_sh.py b/IPython/Extensions/ipy_profile_sh.py
index 44dd9ef..22f40ca 100644
--- a/IPython/Extensions/ipy_profile_sh.py
+++ b/IPython/Extensions/ipy_profile_sh.py
@@ -7,7 +7,7 @@ shell mode and is recommended for users who don't care about pysh-mode
 compatibility)
 """
 
-from IPython import ipapi
+from IPython.core import ipapi
 import os,re,textwrap
 
 # The import below effectively obsoletes your old-style ipythonrc[.ini],
diff --git a/IPython/Extensions/ipy_profile_zope.py b/IPython/Extensions/ipy_profile_zope.py
index 72bce20..462e38d 100644
--- a/IPython/Extensions/ipy_profile_zope.py
+++ b/IPython/Extensions/ipy_profile_zope.py
@@ -17,7 +17,7 @@ Authors
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 
-from IPython import ipapi
+from IPython.core import ipapi
 from IPython import Release
 from types import StringType
 import sys
diff --git a/IPython/Extensions/ipy_pydb.py b/IPython/Extensions/ipy_pydb.py
index cb17a5f..68fe930 100644
--- a/IPython/Extensions/ipy_pydb.py
+++ b/IPython/Extensions/ipy_pydb.py
@@ -1,7 +1,7 @@
 import inspect
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.utils.genutils import arg_split
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from IPython.core import debugger
 
diff --git a/IPython/Extensions/ipy_rehashdir.py b/IPython/Extensions/ipy_rehashdir.py
index 15abcec..e3419ca 100644
--- a/IPython/Extensions/ipy_rehashdir.py
+++ b/IPython/Extensions/ipy_rehashdir.py
@@ -15,8 +15,8 @@ extensions are allowed to do that).
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 
 import os,re,fnmatch,sys
diff --git a/IPython/Extensions/ipy_render.py b/IPython/Extensions/ipy_render.py
index 3946a87..238b12b 100644
--- a/IPython/Extensions/ipy_render.py
+++ b/IPython/Extensions/ipy_render.py
@@ -2,9 +2,9 @@
 
 """ IPython extension: Render templates from variables and paste to clipbard """
 
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from string import Template
 import sys,os
diff --git a/IPython/Extensions/ipy_server.py b/IPython/Extensions/ipy_server.py
index cd4c55b..a409942 100644
--- a/IPython/Extensions/ipy_server.py
+++ b/IPython/Extensions/ipy_server.py
@@ -13,8 +13,8 @@ This is a bit like 'M-x server-start" or gnuserv in the emacs world.
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import SocketServer
 
diff --git a/IPython/Extensions/ipy_signals.py b/IPython/Extensions/ipy_signals.py
index 8debc62..8a152a3 100644
--- a/IPython/Extensions/ipy_signals.py
+++ b/IPython/Extensions/ipy_signals.py
@@ -10,10 +10,10 @@ If _ip.options.verbose is true, show exit status if nonzero
 """
 
 import signal,os,sys
-import IPython.ipapi
+from IPython.core import ipapi
 import subprocess
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 def new_ipsystem_posix(cmd):
     """ ctrl+c ignoring replacement for system() command in iplib.
diff --git a/IPython/Extensions/ipy_stock_completers.py b/IPython/Extensions/ipy_stock_completers.py
index 2714e0b..2ff32f5 100644
--- a/IPython/Extensions/ipy_stock_completers.py
+++ b/IPython/Extensions/ipy_stock_completers.py
@@ -5,9 +5,9 @@ IPython extension that installs completers related to core ipython behaviour.
 The actual implementations are in Extensions/ipy_completers.py
 
 """
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 from ipy_completers import *
 
diff --git a/IPython/Extensions/ipy_synchronize_with.py b/IPython/Extensions/ipy_synchronize_with.py
index d6222b6..1eb0d16 100644
--- a/IPython/Extensions/ipy_synchronize_with.py
+++ b/IPython/Extensions/ipy_synchronize_with.py
@@ -1,5 +1,5 @@
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import win32api
 import win32ui
diff --git a/IPython/Extensions/ipy_system_conf.py b/IPython/Extensions/ipy_system_conf.py
index 624b479..539650d 100644
--- a/IPython/Extensions/ipy_system_conf.py
+++ b/IPython/Extensions/ipy_system_conf.py
@@ -7,8 +7,8 @@ should reside there.
 
  """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 # add system wide configuration information, import extensions etc. here.
 # nothing here is essential 
diff --git a/IPython/Extensions/ipy_traits_completer.py b/IPython/Extensions/ipy_traits_completer.py
index b0d4e6c..80e1097 100644
--- a/IPython/Extensions/ipy_traits_completer.py
+++ b/IPython/Extensions/ipy_traits_completer.py
@@ -52,7 +52,7 @@ Notes
 from enthought.traits import api as T
 
 # IPython imports
-from IPython.ipapi import TryNext, get as ipget
+from IPython.core.ipapi import TryNext, get as ipget
 from IPython.utils.genutils import dir2
 try:
     set
diff --git a/IPython/Extensions/ipy_vimserver.py b/IPython/Extensions/ipy_vimserver.py
index f23b712..bcb23ee 100644
--- a/IPython/Extensions/ipy_vimserver.py
+++ b/IPython/Extensions/ipy_vimserver.py
@@ -67,15 +67,15 @@ something. Instead of edit, use the vim magic.  Thats it!
 
 """
 
-import IPython.ipapi
-#import ipythonhooks
+from IPython.core import ipapi
+
 import socket, select
 import os, threading, subprocess
 import re
 
 ERRCONDS = select.POLLHUP|select.POLLERR
 SERVER = None
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 # this listens to a unix domain socket in a separate thread, so that comms
 # between a vim instance and ipython can happen in a fun and productive way
@@ -161,7 +161,7 @@ def shutdown_server(self):
     if SERVER:
         SERVER.stop()
         SERVER.join(3)
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 ip.set_hook('shutdown_hook', shutdown_server, 10)
 
diff --git a/IPython/Extensions/ipy_which.py b/IPython/Extensions/ipy_which.py
index 44bfae1..e0380bd 100644
--- a/IPython/Extensions/ipy_which.py
+++ b/IPython/Extensions/ipy_which.py
@@ -4,8 +4,8 @@ r""" %which magic command
 
 """
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os,sys
 from fnmatch import fnmatch
diff --git a/IPython/Extensions/ipy_winpdb.py b/IPython/Extensions/ipy_winpdb.py
index 6c2d64b..7c29af0 100644
--- a/IPython/Extensions/ipy_winpdb.py
+++ b/IPython/Extensions/ipy_winpdb.py
@@ -21,10 +21,10 @@ For more details: https://bugs.launchpad.net/ipython/+bug/249036
 
 import os
 
-import IPython.ipapi
+from IPython.core import ipapi
 import rpdb2
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 rpdb_started = False
 
@@ -58,7 +58,7 @@ def wdb_f(self, arg):
     
     path = os.path.abspath(arg)
     if not os.path.isfile(path):
-        raise IPython.ipapi.UsageError("%%wdb: file %s does not exist" % path)
+        raise ipapi.UsageError("%%wdb: file %s does not exist" % path)
     if not rpdb_started:
         passwd = ip.db.get('winpdb_pass', None)
         if passwd is None:
diff --git a/IPython/Extensions/ipy_workdir.py b/IPython/Extensions/ipy_workdir.py
index e27b476..852c33b 100644
--- a/IPython/Extensions/ipy_workdir.py
+++ b/IPython/Extensions/ipy_workdir.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 import os, subprocess
 
diff --git a/IPython/Extensions/jobctrl.py b/IPython/Extensions/jobctrl.py
index 7e4e691..2185bf4 100644
--- a/IPython/Extensions/jobctrl.py
+++ b/IPython/Extensions/jobctrl.py
@@ -47,7 +47,7 @@ import threading,Queue
 
 from IPython.utils import genutils
 
-import IPython.ipapi
+from IPython.core import ipapi
 
 if os.name == 'nt':
     def kill_process(pid):
@@ -128,7 +128,7 @@ def jobctrl_prefilter_f(self,line):
             return '_ip.startjob(%s)' % genutils.make_quoted_expr(line)
         return '_ip.jobq(%s)' % genutils.make_quoted_expr(line)
 
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
 
 def jobq_output_hook(self):
     if not _jobq:
@@ -230,7 +230,7 @@ def jobctrl_shellcmd(ip,cmd):
 
 def install():
     global ip
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
     # needed to make startjob visible as _ip.startjob('blah')
     ip.startjob = startjob
     ip.set_hook('input_prefilter', jobctrl_prefilter_f)
diff --git a/IPython/Extensions/ledit.py b/IPython/Extensions/ledit.py
index 87683b4..a69acff 100644
--- a/IPython/Extensions/ledit.py
+++ b/IPython/Extensions/ledit.py
@@ -43,9 +43,9 @@ l.__class__        l.__hash__         l.__repr__         l.expandtabs       l.lj
 ... (completions for string variable shown ) ...
 
 """
-import IPython.ipapi
+from IPython.core import ipapi
 import pprint
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 curdata = []
 
diff --git a/IPython/Extensions/pspersistence.py b/IPython/Extensions/pspersistence.py
index 0088f13..5470750 100644
--- a/IPython/Extensions/pspersistence.py
+++ b/IPython/Extensions/pspersistence.py
@@ -5,9 +5,9 @@
 Stores variables, aliases etc. in PickleShare database.
 """
 
-import IPython.ipapi
-from IPython.ipapi import UsageError
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+from IPython.core.ipapi import UsageError
+ip = ipapi.get()
 
 import pickleshare
 
@@ -47,7 +47,7 @@ def restore_data(self):
     refresh_variables(ip)
     restore_aliases(self)
     restore_dhist(self)
-    raise IPython.ipapi.TryNext
+    raise ipapi.TryNext
     
 ip.set_hook('late_startup_hook', restore_data)
 
diff --git a/IPython/Extensions/win32clip.py b/IPython/Extensions/win32clip.py
index f2030e0..bb5838e 100644
--- a/IPython/Extensions/win32clip.py
+++ b/IPython/Extensions/win32clip.py
@@ -1,6 +1,6 @@
-import IPython.ipapi
+from IPython.core import ipapi
 
-ip = IPython.ipapi.get()
+ip = ipapi.get()
 
 def clip_f( self, parameter_s = '' ):
     """Save a set of lines to the clipboard.
diff --git a/IPython/Magic.py b/IPython/Magic.py
index 3b6558a..02e4ff7 100644
--- a/IPython/Magic.py
+++ b/IPython/Magic.py
@@ -53,8 +53,8 @@ from IPython.macro import Macro
 from IPython.utils.genutils import *
 from IPython import platutils
 import IPython.utils.generics
-import IPython.ipapi
-from IPython.ipapi import UsageError
+from IPython.core import ipapi
+from IPython.core.ipapi import UsageError
 from IPython.testing import decorators as testdec
 
 #***************************************************************************
@@ -720,7 +720,7 @@ Currently the magic system has the following functions:\n"""
             try:
                 IPython.utils.generics.inspect_object(info.obj)
                 return
-            except IPython.ipapi.TryNext:
+            except ipapi.TryNext:
                 pass
             # Get the docstring of the class property if it exists.
             path = oname.split('.')
@@ -2386,7 +2386,7 @@ Currently the magic system has the following functions:\n"""
         sys.stdout.flush()
         try:
             self.shell.hooks.editor(filename,lineno)
-        except IPython.ipapi.TryNext:
+        except ipapi.TryNext:
             warn('Could not open editor')
             return
         
diff --git a/IPython/Prompts.py b/IPython/Prompts.py
index cdc3be0..a3c5947 100644
--- a/IPython/Prompts.py
+++ b/IPython/Prompts.py
@@ -23,7 +23,7 @@ import time
 from IPython.utils import coloransi
 from IPython import Release
 from IPython.external.Itpl import ItplNS
-from IPython.ipapi import TryNext
+from IPython.core.ipapi import TryNext
 from IPython.ipstruct import Struct
 from IPython.macro import Macro
 import IPython.utils.generics
diff --git a/IPython/Shell.py b/IPython/Shell.py
index 55ee1b4..3536d35 100644
--- a/IPython/Shell.py
+++ b/IPython/Shell.py
@@ -34,7 +34,8 @@ except ImportError:
 
 # IPython imports
 import IPython
-from IPython import ultraTB, ipapi
+from IPython import ultraTB
+from IPython.core import ipapi
 from IPython.Magic import Magic
 from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no
 from IPython.iplib import InteractiveShell
@@ -562,7 +563,7 @@ class MatplotlibShellBase:
         self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive)
 
         # Build a user namespace initialized with matplotlib/matlab features.
-        user_ns, user_global_ns = IPython.ipapi.make_user_namespaces(user_ns,
+        user_ns, user_global_ns = ipapi.make_user_namespaces(user_ns,
             user_global_ns)
 
         # Import numpy as np/pyplot as plt are conventions we're trying to
@@ -1088,7 +1089,7 @@ def _load_pylab(user_ns):
     This little utility must be called AFTER the actual ipython instance is
     running, since only then will the options file have been fully parsed."""
     
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
     if ip.options.pylab_import_all:
         ip.ex("from matplotlib.pylab import *")
         ip.IP.user_config_ns.update(ip.user_ns)
diff --git a/IPython/UserConfig/ipy_user_conf.py b/IPython/UserConfig/ipy_user_conf.py
index 6d6fbbd..b21cd4c 100644
--- a/IPython/UserConfig/ipy_user_conf.py
+++ b/IPython/UserConfig/ipy_user_conf.py
@@ -18,8 +18,8 @@ description on what you could do here.
 
 # Most of your config files and extensions will probably start with this import
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 # You probably want to uncomment this if you did %upgrade -nolegacy
 # import ipy_defaults    
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index a879154..3689293 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -73,7 +73,7 @@ import sys
 import IPython.rlineimpl as readline    
 import itertools
 from IPython.ipstruct import Struct
-from IPython import ipapi
+from IPython.core import ipapi
 from IPython.utils import generics
 import types
 
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 4230c01..4d3e158 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -31,7 +31,8 @@ import linecache
 import os
 import sys
 
-from IPython import PyColorize, ipapi
+from IPython import PyColorize
+from IPython.core import ipapi
 from IPython.utils import coloransi
 from IPython.utils.genutils import Term
 from IPython.core.excolors import exception_colors
diff --git a/IPython/core/history.py b/IPython/core/history.py
index ec3a314..f03f3b8 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -6,7 +6,7 @@ import fnmatch
 import os
 
 from IPython.utils.genutils import Term, ask_yes_no, warn
-import IPython.ipapi
+from IPython.core import ipapi
 
 def magic_history(self, parameter_s = ''):
     """Print input history (_i<n> variables), with most recent last.
@@ -228,7 +228,7 @@ class ShadowHist:
             #print "new",newidx # dbg
             self.db.hset('shadowhist',ent, newidx)
         except:
-            IPython.ipapi.get().IP.showtraceback()
+            ipapi.get().IP.showtraceback()
             print "WARNING: disabling shadow history"
             self.disabled = True
     
diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py
index b68bb2c..c6225c0 100644
--- a/IPython/core/hooks.py
+++ b/IPython/core/hooks.py
@@ -19,8 +19,8 @@ For example, suppose that you have a module called 'myiphooks' in your
 PYTHONPATH, which contains the following definition:
 
 import os
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 def calljed(self,filename, linenum):
     "My editor hook calls the jed editor directly."
@@ -41,7 +41,7 @@ somewhere in your configuration files or ipython command line.
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
-from IPython import ipapi
+from IPython.core import ipapi
 
 import os,bisect
 from IPython.utils.genutils import Term,shell
diff --git a/IPython/ipapi.py b/IPython/core/ipapi.py
similarity index 99%
rename from IPython/ipapi.py
rename to IPython/core/ipapi.py
index da6bcf4..400becf 100644
--- a/IPython/ipapi.py
+++ b/IPython/core/ipapi.py
@@ -24,8 +24,8 @@ That way the module is imported at startup and you can have all your
 personal configuration (as opposed to boilerplate ipythonrc-PROFILENAME 
 stuff) in there. 
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 def ankka_f(self, arg):
     print 'Ankka',self,'says uppercase:',arg.upper()
@@ -331,8 +331,8 @@ class IPApi(object):
         To use this, you first must obtain a handle on the ipython object as
         indicated above, via:
 
-        import IPython.ipapi
-        ip = IPython.ipapi.get()
+        from IPython.core import ipapi
+        ip = ipapi.get()
 
         Once this is done, inside a routine foo() where you want to expose
         variables x and y, you do the following:
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index 848c359..8e3be84 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -22,5 +22,8 @@ def test_import_history():
 def test_import_hooks():
     from IPython.core import hooks
 
+def test_import_ipapi():
+    from IPython.core import ipapi
+
 
 
diff --git a/IPython/deathrow/dtutils.py b/IPython/deathrow/dtutils.py
index 37e7aa2..9bab867 100644
--- a/IPython/deathrow/dtutils.py
+++ b/IPython/deathrow/dtutils.py
@@ -10,8 +10,8 @@ See the idoctest docstring below for usage details.
 import doctest
 import sys
 
-import IPython.ipapi
-ip = IPython.ipapi.get()
+from IPython.core import ipapi
+ip = ipapi.get()
 
 def rundoctest(text,ns=None,eraise=False):
     """Run a the input source as a doctest, in the caller's namespace.
diff --git a/IPython/frontend/prefilterfrontend.py b/IPython/frontend/prefilterfrontend.py
index a5e233f..b0af0bb 100644
--- a/IPython/frontend/prefilterfrontend.py
+++ b/IPython/frontend/prefilterfrontend.py
@@ -28,7 +28,7 @@ import re
 import __builtin__
 
 from IPython.ipmaker import make_IPython
-from IPython.ipapi import IPApi
+from IPython.core.ipapi import IPApi
 from IPython.kernel.core.redirector_output_trap import RedirectorOutputTrap
 
 from IPython.kernel.core.sync_traceback_trap import SyncTracebackTrap
diff --git a/IPython/frontend/tests/test_prefilterfrontend.py b/IPython/frontend/tests/test_prefilterfrontend.py
index 317f1ed..beabde8 100644
--- a/IPython/frontend/tests/test_prefilterfrontend.py
+++ b/IPython/frontend/tests/test_prefilterfrontend.py
@@ -19,7 +19,7 @@ import string
 from nose.tools import assert_equal
 
 from IPython.frontend.prefilterfrontend import PrefilterFrontEnd
-from IPython.ipapi import get as get_ipython0
+from IPython.core.ipapi import get as get_ipython0
 from IPython.testing.plugin.ipdoctest import default_argv
 
 
diff --git a/IPython/gui/wx/ipshell_nonblocking.py b/IPython/gui/wx/ipshell_nonblocking.py
index 637c3aa..ab879e2 100644
--- a/IPython/gui/wx/ipshell_nonblocking.py
+++ b/IPython/gui/wx/ipshell_nonblocking.py
@@ -184,8 +184,8 @@ class NonBlockingIPShell(object):
         self._IP.user_ns['help'] = _Helper(self._pager_help)
 
         #we disable cpase magic... until we found a way to use it properly.
-        #import IPython.ipapi
-        ip = IPython.ipapi.get()
+        from IPython.core import ipapi
+        ip = ipapi.get()
         def bypass_magic(self, arg):
             print '%this magic is currently disabled.'
         ip.expose_magic('cpaste', bypass_magic)
diff --git a/IPython/gui/wx/wxIPython.py b/IPython/gui/wx/wxIPython.py
index b724e53..f10d53a 100644
--- a/IPython/gui/wx/wxIPython.py
+++ b/IPython/gui/wx/wxIPython.py
@@ -19,7 +19,7 @@ except ImportError:
     is_sync_frontend_ok = False
 
 #used to create options.conf file in user directory
-from IPython.ipapi import get
+from IPython.core.ipapi import get
 
 __version__ = 0.91
 __author__  = "Laurent Dufrechou"
diff --git a/IPython/iplib.py b/IPython/iplib.py
index d44c015..4589cad 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -57,7 +57,7 @@ from IPython.ipstruct import Struct
 from IPython.lib.backgroundjobs import BackgroundJobManager
 from IPython.utils.genutils import *
 from IPython.strdispatch import StrDispatch
-import IPython.ipapi
+from IPython.core import ipapi
 import IPython.core.history
 import IPython.prefilter as prefilter
 import IPython.shadowns
@@ -463,7 +463,7 @@ class InteractiveShell(object,Magic):
         # These routines return properly built dicts as needed by the rest of
         # the code, and can also be used by extension writers to generate
         # properly initialized namespaces.
-        user_ns, user_global_ns = IPython.ipapi.make_user_namespaces(user_ns,
+        user_ns, user_global_ns = ipapi.make_user_namespaces(user_ns,
             user_global_ns)
 
         # Assign namespaces
@@ -783,7 +783,7 @@ class InteractiveShell(object,Magic):
         self.auto_alias = [s.split(None,1) for s in auto_alias]
         
         # Produce a public API instance
-        self.api = IPython.ipapi.IPApi(self)
+        self.api = ipapi.IPApi(self)
 
         # Initialize all user-visible namespaces
         self.init_namespaces()
@@ -1592,7 +1592,7 @@ class InteractiveShell(object,Magic):
         try:
             self.hooks.fix_error_editor(e.filename,
                 int0(e.lineno),int0(e.offset),e.msg)
-        except IPython.ipapi.TryNext:
+        except ipapi.TryNext:
             warn('Could not open editor')
             return False
         return True
@@ -1706,7 +1706,7 @@ class InteractiveShell(object,Magic):
     
             if etype is SyntaxError:
                 self.showsyntaxerror(filename)
-            elif etype is IPython.ipapi.UsageError:
+            elif etype is ipapi.UsageError:
                 print "UsageError:", value
             else:
                 # WARNING: these variables are somewhat deprecated and not
@@ -2548,7 +2548,7 @@ class InteractiveShell(object,Magic):
             self.log(line,line,continue_prompt)
             return line
 
-        force_auto = isinstance(obj, IPython.ipapi.IPyAutocall)
+        force_auto = isinstance(obj, ipapi.IPyAutocall)
         auto_rewrite = True
         
         if pre == self.ESC_QUOTE:
diff --git a/IPython/kernel/contexts.py b/IPython/kernel/contexts.py
index 949688e..183da3a 100644
--- a/IPython/kernel/contexts.py
+++ b/IPython/kernel/contexts.py
@@ -27,7 +27,7 @@ import sys
 from twisted.internet.error import ConnectionRefusedError
 
 from IPython.ultraTB import _fixed_getinnerframes, findsource
-from IPython import ipapi
+from IPython.core import ipapi
 
 from IPython.kernel import error
 
@@ -108,7 +108,7 @@ class RemoteContextBase(object):
         return strip_whitespace(wsource)
 
     def _findsource_ipython(self,f):
-        from IPython import ipapi
+        from IPython.core import ipapi
         self.ip = ipapi.get()
         buf = self.ip.IP.input_hist_raw[-1].splitlines()[1:]
         wsource = [l+'\n' for l in buf ]
diff --git a/IPython/kernel/core/prompts.py b/IPython/kernel/core/prompts.py
index 3f50546..4e9e68a 100644
--- a/IPython/kernel/core/prompts.py
+++ b/IPython/kernel/core/prompts.py
@@ -29,7 +29,7 @@ from IPython.external.Itpl import ItplNS
 
 from IPython.utils import coloransi
 from IPython import Release
-from IPython.ipapi import TryNext
+from IPython.core.ipapi import TryNext
 from IPython.utils.genutils import *
 import IPython.utils.generics
 
diff --git a/IPython/kernel/multiengineclient.py b/IPython/kernel/multiengineclient.py
index 600a877..71a0bf8 100644
--- a/IPython/kernel/multiengineclient.py
+++ b/IPython/kernel/multiengineclient.py
@@ -312,7 +312,7 @@ class InteractiveMultiEngineClient(object):
         return strip_whitespace(wsource)
 
     def findsource_ipython(self,f):
-        from IPython import ipapi
+        from IPython.core import ipapi
         self.ip = ipapi.get()
         wsource = [l+'\n' for l in
                    self.ip.IP.input_hist_raw[-1].splitlines()[1:]] 
diff --git a/IPython/macro.py b/IPython/macro.py
index cd66083..6e89276 100644
--- a/IPython/macro.py
+++ b/IPython/macro.py
@@ -7,10 +7,10 @@
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
-import IPython.ipapi 
+from IPython.core import ipapi 
 
 from IPython.utils.genutils import Term
-from IPython.ipapi import IPyAutocall
+from IPython.core.ipapi import IPyAutocall
 
 class Macro(IPyAutocall):
     """Simple class to store the value of macros as strings.
diff --git a/IPython/prefilter.py b/IPython/prefilter.py
index 44ab9c7..4bcadc8 100644
--- a/IPython/prefilter.py
+++ b/IPython/prefilter.py
@@ -8,7 +8,7 @@ transforming work.
 __docformat__ = "restructuredtext en"
 
 import re
-import IPython.ipapi
+from IPython.core import ipapi
 
 class LineInfo(object):
     """A single line of input and associated info.
@@ -178,7 +178,7 @@ def checkEmacs(l_info,ip):
 def checkIPyAutocall(l_info,ip):
     "Instances of IPyAutocall in user_ns get autocalled immediately"
     obj = ip.user_ns.get(l_info.iFun, None)
-    if isinstance(obj, IPython.ipapi.IPyAutocall):
+    if isinstance(obj, ipapi.IPyAutocall):
         obj.set_ip(ip.api)
         return ip.handle_auto
     else:
diff --git a/IPython/testing/attic/ipdoctest.py b/IPython/testing/attic/ipdoctest.py
index ff91f92..2660bec 100755
--- a/IPython/testing/attic/ipdoctest.py
+++ b/IPython/testing/attic/ipdoctest.py
@@ -62,8 +62,8 @@ import unittest
 
 from doctest import *
 
-# Our own imports
 from IPython.tools import utils
+from IPython.core import ipapi
 
 ###########################################################################
 #
@@ -85,7 +85,7 @@ sys.displayhook = sys.__displayhook__
 sys.excepthook = sys.__excepthook__
 
 # So that ipython magics and aliases can be doctested
-__builtin__._ip = IPython.ipapi.get()
+__builtin__._ip = ipapi.get()
 
 # for debugging only!!!
 #from IPython.Shell import IPShellEmbed;ipshell=IPShellEmbed(['--noterm_title']) # dbg
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index b654d65..c7ff73e 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -164,7 +164,8 @@ def start_ipython():
     import new
 
     import IPython
-
+    from IPython.core import ipapi
+    
     def xsys(cmd):
         """Execute a command and print its output.
 
@@ -183,7 +184,7 @@ def start_ipython():
     argv = default_argv()
     
     # Start IPython instance.  We customize it to start with minimal frills.
-    user_ns,global_ns = IPython.ipapi.make_user_namespaces(ipnsdict(),dict())
+    user_ns,global_ns = ipapi.make_user_namespaces(ipnsdict(),dict())
     IPython.Shell.IPShell(argv,user_ns,global_ns)
 
     # Deactivate the various python system hooks added by ipython for
diff --git a/IPython/tests/refbug.py b/IPython/tests/refbug.py
index 99aca19..6b2ae2b 100644
--- a/IPython/tests/refbug.py
+++ b/IPython/tests/refbug.py
@@ -18,7 +18,7 @@ test_magic.py calls it.
 #-----------------------------------------------------------------------------
 import sys
 
-from IPython import ipapi
+from IPython.core import ipapi
 
 #-----------------------------------------------------------------------------
 # Globals
diff --git a/IPython/tests/test_iplib.py b/IPython/tests/test_iplib.py
index 723343c..beb3de4 100644
--- a/IPython/tests/test_iplib.py
+++ b/IPython/tests/test_iplib.py
@@ -13,7 +13,8 @@ import tempfile
 import nose.tools as nt
 
 # our own packages
-from IPython import ipapi, iplib
+from IPython import iplib
+from IPython.core import ipapi
 
 #-----------------------------------------------------------------------------
 # Globals
diff --git a/IPython/utils/generics.py b/IPython/utils/generics.py
index b38b978..38a592d 100644
--- a/IPython/utils/generics.py
+++ b/IPython/utils/generics.py
@@ -15,7 +15,7 @@ Here is an example from genutils.py:
 can use the niftier decorator syntax introduced in Python 2.4).
 '''
 
-from IPython.ipapi import TryNext
+from IPython.core.ipapi import TryNext
 from IPython.external.simplegeneric import generic
 
 def result_display(result):
diff --git a/IPython/utils/genutils.py b/IPython/utils/genutils.py
index 6fc5a6a..64ea52f 100644
--- a/IPython/utils/genutils.py
+++ b/IPython/utils/genutils.py
@@ -50,7 +50,7 @@ from IPython.Itpl import Itpl,itpl,printpl
 from IPython import platutils
 from IPython.utils import DPyGetOpt
 from IPython.utils.generics import result_display
-import IPython.ipapi
+from IPython.core import ipapi
 from IPython.external.path import path
 if os.name == "nt":
     from IPython.winconsole import get_console_size
@@ -1625,12 +1625,12 @@ def page(strng,start=0,screen_lines=0,pager_cmd = None):
     start = max(0,start)
 
     # first, try the hook
-    ip = IPython.ipapi.get()
+    ip = ipapi.get()
     if ip:
         try:
             ip.IP.hooks.show_in_pager(strng)
             return
-        except IPython.ipapi.TryNext:
+        except ipapi.TryNext:
             pass
 
     # Ugly kludge, but calling curses.initscr() flat out crashes in emacs