diff --git a/IPython/tests/obj_del.py b/IPython/core/tests/obj_del.py
similarity index 100%
rename from IPython/tests/obj_del.py
rename to IPython/core/tests/obj_del.py
diff --git a/IPython/tests/refbug.py b/IPython/core/tests/refbug.py
similarity index 100%
rename from IPython/tests/refbug.py
rename to IPython/core/tests/refbug.py
diff --git a/IPython/tests/tclass.py b/IPython/core/tests/tclass.py
similarity index 100%
rename from IPython/tests/tclass.py
rename to IPython/core/tests/tclass.py
diff --git a/IPython/tests/test_magic.py b/IPython/core/tests/test_magic.py
similarity index 99%
rename from IPython/tests/test_magic.py
rename to IPython/core/tests/test_magic.py
index 74c2bcc..ac3b901 100644
--- a/IPython/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -74,7 +74,7 @@ def test_shist():
     import os, shutil, tempfile
 
     from IPython.Extensions import pickleshare
-    from IPython.history import ShadowHist
+    from IPython.core.history import ShadowHist
     
     tfile = tempfile.mktemp('','tmp-ipython-')
     
diff --git a/docs/source/development/reorg.txt b/docs/source/development/reorg.txt
index d11dae3..41795db 100644
--- a/docs/source/development/reorg.txt
+++ b/docs/source/development/reorg.txt
@@ -87,6 +87,8 @@ Need to update the top level IPython/__init__.py file.
 Where things will be moved
 ==========================
 
+Top-level modules:
+
 * :file:`background_jobs.py`.  Move to :file:`IPython/lib/backgroundjobs.py`.
 
 * :file:`ColorANSI.py`.  Move to :file:`IPython/utils/coloransi.py`.
@@ -186,18 +188,29 @@ Where things will be moved
 
 * :file:`strdispatch.py`.  Move to :file:`IPython.python`.
 
+* :file:`twshell.py`.  Move to :file:`IPython.sandbox`.
+
+* :file:`ultraTB.py`.  Move to :file:`IPython/core/ultratb.py`.
+
+* :file:`upgrade_dir.py`.  Move to :file:`IPython/utils/upgradedir.py`.
+
+* :file:`usage.py`.  Move to :file:`IPython.core`.
+
+* :file:`wildcard.py`.  Move to :file:`IPython.utils`.
+
+* :file:`winconsole.py`.  Move to :file:`IPython.utils`.
+
+Top-level sub-packages:
+
 * :file:`testing`.  Good where it is.
 
 * :file:`tests`.  Good where it is.
 
 * :file:`tools`.  Things in here need to be looked at and moved elsewhere like
-    :file:`IPython.python`.
+    :file:`IPython.utils`.
 
 * :file:`UserConfig`.  Move to a subdirectory of :file:`IPython.config`.
 
-
-
-
 * :file:`config`.  Good where it is!
 
 * :file:`external`.  Good where it is!
@@ -209,16 +222,6 @@ Where things will be moved
 * :file:`gui`.  Eventually this should be moved to a subdir of   
   :file:`IPython.frontend`.
 
-
-
-
-
-
-
-
-
-
-
 * :file:`kernel`.  Good where it is.
 
 
@@ -235,17 +238,7 @@ Where things will be moved
 
 
 
-* :file:`twshell.py`.  Move to :file:`IPython.sandbox`.
-
-* :file:`ultraTB.py`.  Move to :file:`IPython/core/ultratb.py`.
-
-* :file:`upgrade_dir.py`.  Move to :file:`IPython/utils/upgradedir.py`.
-
-* :file:`usage.py`.  Move to :file:`IPython.core`.
-
-* :file:`wildcard.py`.  Move to :file:`IPython.utils`.
 
-* :file:`winconsole.py`.  Move to :file:`IPython.lib`.
 
 Other things
 ============