diff --git a/IPython/Shell.py b/IPython/Shell.py
index a4eed7f..768ead6 100644
--- a/IPython/Shell.py
+++ b/IPython/Shell.py
@@ -39,7 +39,7 @@ 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.core.iplib import InteractiveShell
-from IPython.ipmaker import make_IPython
+from IPython.core.ipmaker import make_IPython
 from IPython.ipstruct import Struct
 from IPython.testing import decorators as testdec
 
diff --git a/IPython/ipmaker.py b/IPython/core/ipmaker.py
similarity index 100%
rename from IPython/ipmaker.py
rename to IPython/core/ipmaker.py
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index d994268..d31cceb 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -28,6 +28,8 @@ def test_import_ipapi():
 def test_imort_iplib():
     from IPython.core import iplib
 
+def test_imort_ipmaker():
+    from IPython.core import ipmaker
 
 
 
diff --git a/IPython/deathrow/twshell.py b/IPython/deathrow/twshell.py
index 98c2d81..3a7298c 100644
--- a/IPython/deathrow/twshell.py
+++ b/IPython/deathrow/twshell.py
@@ -6,7 +6,7 @@ import sys
 
 from twisted.internet import reactor, threads
 
-from IPython.ipmaker import make_IPython
+from IPython.core.ipmaker import make_IPython
 from IPython.core.iplib import InteractiveShell 
 from IPython.ipstruct import Struct
 import Queue,thread,threading,signal
diff --git a/IPython/frontend/prefilterfrontend.py b/IPython/frontend/prefilterfrontend.py
index 5892cdc..989c752 100644
--- a/IPython/frontend/prefilterfrontend.py
+++ b/IPython/frontend/prefilterfrontend.py
@@ -27,7 +27,7 @@ import os
 import re
 import __builtin__
 
-from IPython.ipmaker import make_IPython
+from IPython.core.ipmaker import make_IPython
 from IPython.core.ipapi import IPApi
 from IPython.kernel.core.redirector_output_trap import RedirectorOutputTrap