diff --git a/IPython/Extensions/ipy_system_conf.py b/IPython/Extensions/ipy_system_conf.py
index 027594d..624b479 100644
--- a/IPython/Extensions/ipy_system_conf.py
+++ b/IPython/Extensions/ipy_system_conf.py
@@ -21,4 +21,4 @@ import clearcmd # %clear
 
 import ipy_stock_completers
 
-ip.load('IPython.history')
+ip.load('IPython.core.history')
diff --git a/IPython/history.py b/IPython/core/history.py
similarity index 100%
rename from IPython/history.py
rename to IPython/core/history.py
diff --git a/IPython/iplib.py b/IPython/iplib.py
index 6a0754a..16553dd 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -58,7 +58,7 @@ from IPython.lib.backgroundjobs import BackgroundJobManager
 from IPython.utils.genutils import *
 from IPython.strdispatch import StrDispatch
 import IPython.ipapi
-import IPython.history
+import IPython.core.history
 import IPython.prefilter as prefilter
 import IPython.shadowns
 # Globals
@@ -832,7 +832,7 @@ class InteractiveShell(object,Magic):
             print r"only has ASCII characters, e.g. c:\home"
             print "Now it is",rc.ipythondir
             sys.exit()
-        self.shadowhist = IPython.history.ShadowHist(self.db)
+        self.shadowhist = IPython.core.history.ShadowHist(self.db)
 
     def post_config_initialization(self):
         """Post configuration init method
diff --git a/docs/source/development/reorg.txt b/docs/source/development/reorg.txt
index ff01965..6c46cc6 100644
--- a/docs/source/development/reorg.txt
+++ b/docs/source/development/reorg.txt
@@ -116,16 +116,22 @@ Where things will be moved
 
 * :file:`genutils.py`.  Move to :file:`IPython.utils`.
 
-* :file:`Extensions`. This needs to be gone through separately.  Minimally,
-  the package should be renamed to :file:`extensions`.
-
-
 * :file:`Gnuplot2.py`.  Move to :file:`IPython.sandbox`.
 
 * :file:`GnuplotInteractive.py`.  Move to :file:`IPython.sandbox`.
 
 * :file:`GnuplotRuntime.py`.  Move to :file:`IPython.sandbox`.
 
+* :file:`numutils.py`.  Move to :file:`IPython.sandbox`.
+
+* :file:`twshell.py`.  Move to :file:`IPython.sandbox`.
+
+* :file:`Extensions`. This needs to be gone through separately.  Minimally,
+  the package should be renamed to :file:`extensions`.
+
+* :file:`history.py`.  Move to :file:`IPython.core`.
+
+
 * :file:`Itpl.py`.  Remove.  Version already in :file:`IPython.external`.
 
 * :file:`Logger.py`.  Move to :file:`IPython/core/logger.py`.
@@ -164,7 +170,7 @@ Where things will be moved
 * :file:`gui`.  Eventually this should be moved to a subdir of   
   :file:`IPython.frontend`.
 
-* :file:`history.py`.  Move to :file:`IPython.core`.
+
 
 * :file:`hooks.py`.  Move to :file:`IPython.core`.
 
@@ -182,7 +188,7 @@ Where things will be moved
 
 * :file:`macro.py`.  Move to :file:`IPython.core`.
 
-* :file:`numutils.py`.  Move to :file:`IPython.sandbox`.
+
 
 * :file:`platutils.py`.  Move to :file:`IPython.python`.