Move IPython.frontend.zmqterminal to IPython.frontend.terminal.console

IPython/frontend/terminal/console/app.py

@@ -29,7 +29,7 b' from IPython.frontend.kernelmixinapp import ('
         IPythonMixinConsoleApp, app_aliases, app_flags, aliases, app_aliases, flags
     )
 
-from IPython.frontend.zmqterminal.interactiveshell import ZMQTerminalInteractiveShell
+from IPython.frontend.terminal.console.interactiveshell import ZMQTerminalInteractiveShell
 
 #-----------------------------------------------------------------------------
 # Globals

IPython/frontend/terminal/console/frontend.py

@@ -30,7 +30,7 b' import rlcompleter'
 from IPython.external.argparse import ArgumentParser
 from IPython.core.inputsplitter import IPythonInputSplitter
 from IPython.zmq.blockingkernelmanager import BlockingKernelManager as KernelManager
-from IPython.frontend.zmqterminal.completer import ClientCompleter2p 
+from IPython.frontend.terminal.console.completer import ClientCompleter2p 
 
 #-----------------------------------------------------------------------------
 # Network Constants

IPython/frontend/terminal/console/interactiveshell.py

@@ -27,7 +27,7 b' from IPython.utils.warn import warn, error, fatal'
 from IPython.utils import io
 
 from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell
-from IPython.frontend.zmqterminal.completer import ZMQCompleter
+from IPython.frontend.terminal.console.completer import ZMQCompleter
 
 
 class ZMQTerminalInteractiveShell(TerminalInteractiveShell):

IPython/frontend/terminal/ipapp.py

@@ -222,7 +222,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
         kernel = ("IPython.zmq.ipkernel.IPKernelApp",
             "Start a kernel without an attached frontend."
         ),
-        console=('IPython.frontend.zmqterminal.app.ZMQTerminalIPythonApp',
+        console=('IPython.frontend.terminal.console.app.ZMQTerminalIPythonApp',
             """Launch the IPython terminal-based Console."""
         ),
     ))