Fixing the setup.py script under setuptools and the __init__.py script.

IPython/__init__.py

@@ -48,7 +48,7 b' import os'
 sys.path.append(os.path.dirname(__file__) + "/Extensions")
 
 # Define what gets imported with a 'from IPython import *'
-__all__ = ['ipapi','generics','ipstruct','Release','Shell']
+__all__ = ['IPython.core.ipapi','utils.generics','utils.ipstruct','Release','Shell']
 
 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
 # access to them via IPython.<name>

setup.py

@@ -30,7 +30,7 b" if os.path.exists('MANIFEST'): os.remove('MANIFEST')"
 from distutils.core import setup
 
 # Local imports
-from IPython.genutils import target_update
+from IPython.utils.genutils import target_update
 
 from setupbase import (
     setup_args, 
@@ -143,7 +143,7 b" if 'setuptools' in sys.modules:"
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': [
-            'ipython = IPython.ipapi:launch_new_instance',
+            'ipython = IPython.core.ipapi:launch_new_instance',
             'pycolor = IPython.PyColorize:main',
             'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
             'ipengine = IPython.kernel.scripts.ipengine:main',