diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py
index ba5ba0d..dbd9b10 100644
--- a/IPython/core/iplib.py
+++ b/IPython/core/iplib.py
@@ -52,14 +52,14 @@ from IPython.core.fakemodule import FakeModule, init_fakemod_dict
 from IPython.external.Itpl import ItplNS
 from IPython.core.logger import Logger
 from IPython.core.magic import Magic
-from IPython.Prompts import CachedOutput
+from IPython.core.prompts import CachedOutput
 from IPython.utils.ipstruct import Struct
 from IPython.lib.backgroundjobs import BackgroundJobManager
 from IPython.utils.genutils import *
 from IPython.strdispatch import StrDispatch
 from IPython.core import ipapi
 import IPython.core.history
-import IPython.prefilter as prefilter
+import IPython.core.prefilter as prefilter
 import IPython.shadowns
 # Globals
 
diff --git a/IPython/Prompts.py b/IPython/core/prompts.py
similarity index 100%
rename from IPython/Prompts.py
rename to IPython/core/prompts.py
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index 609a977..2662d51 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -46,3 +46,8 @@ def test_import_oinspect():
 def test_import_outputtrap():
     from IPython.core import outputtrap
 
+def test_import_prefilter():
+    from IPython.core import prefilter
+
+def test_import_prompts():
+    from IPython.core import prompts
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index f829759..e82876f 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -204,7 +204,7 @@ def make_runners():
        'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py',
        'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py',
        'logger.py', 'macro.py', 'magic.py', 'oinspect.py',
-       'outputtrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py',
+       'outputtrap.py', 'platutils.py', 'prefilter.py', 'prompts.py',
        'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py',
        'shellglobals.py', 'strdispatch.py', 'twshell.py',
        'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py',