diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index a8935d9..e39e1fe 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1993,7 +1993,6 @@ class InteractiveShell(SingletonConfigurable):
     #-------------------------------------------------------------------------
 
     def init_magics(self):
-        from IPython.core import magic_functions as mf
         from IPython.core import magics as m
         self.magics_manager = magic.MagicsManager(shell=self,
                                    confg=self.config,
@@ -2006,7 +2005,7 @@ class InteractiveShell(SingletonConfigurable):
         self.define_magic = self.magics_manager.define_magic
 
         self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics,
-            m.ConfigMagics, mf.DeprecatedMagics, m.ExecutionMagics,
+            m.ConfigMagics, m.DeprecatedMagics, m.ExecutionMagics,
             m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics,
             m.NamespaceMagics, m.OSMagics, m.PylabMagics )
 
diff --git a/IPython/core/magics/__init__.py b/IPython/core/magics/__init__.py
index 15b9cef..b4b8cac 100644
--- a/IPython/core/magics/__init__.py
+++ b/IPython/core/magics/__init__.py
@@ -17,6 +17,7 @@ from .auto import AutoMagics
 from .basic import BasicMagics
 from .code import CodeMagics, MacroToEdit
 from .config import ConfigMagics
+from .deprecated import DeprecatedMagics
 from .execution import ExecutionMagics
 from .extension import ExtensionMagics
 from .history import HistoryMagics
diff --git a/IPython/core/magic_functions.py b/IPython/core/magics/deprecated.py
similarity index 84%
rename from IPython/core/magic_functions.py
rename to IPython/core/magics/deprecated.py
index 3d166c8..4f544c6 100644
--- a/IPython/core/magic_functions.py
+++ b/IPython/core/magics/deprecated.py
@@ -1,13 +1,11 @@
-"""Magic functions for InteractiveShell.
+"""Deprecated Magic functions.
 """
-
 #-----------------------------------------------------------------------------
-#  Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
-#  Copyright (C) 2001 Fernando Perez <fperez@colorado.edu>
-#  Copyright (C) 2008 The IPython Development Team
-
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
+#  Copyright (c) 2012 The IPython Development Team.
+#
+#  Distributed under the terms of the Modified BSD License.
+#
+#  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -21,7 +19,6 @@ from IPython.core.magic import Magics, register_magics, line_magic
 # Magic implementation classes
 #-----------------------------------------------------------------------------
 
-
 @register_magics
 class DeprecatedMagics(Magics):
     """Magics slated for later removal."""