initial ptk sub-package

setup.py

@@ -137,7 +137,7 @@ def main():
         url='https://github.com/scopatz/xonsh',
         platforms='Cross Platform',
         classifiers=['Programming Language :: Python :: 3'],
-        packages=['xonsh'],
+        packages=['xonsh', 'xonsh.ptk'],
         cmdclass={'install': xinstall, 'sdist': xsdist},
         )
     if HAVE_SETUPTOOLS:

xonsh/ptk/shell.py

@@ -15,9 +15,9 @@ from pygments.token import (Keyword, Name, Comment, String, Error, Number,
 
 from xonsh.base_shell import BaseShell
 from xonsh.tools import format_prompt_for_prompt_toolkit, _make_style
-from xonsh.prompt_toolkit_completer import PromptToolkitCompleter
-from xonsh.prompt_toolkit_history import PromptToolkitHistory
-from xonsh.prompt_toolkit_key_bindings import load_xonsh_bindings
+from xonsh.ptk.completer import PromptToolkitCompleter
+from xonsh.ptk.history import PromptToolkitHistory
+from xonsh.ptk.key_bindings import load_xonsh_bindings
 from xonsh.pyghooks import XonshLexer
 
 

xonsh/shell.py

@@ -40,7 +40,7 @@ class Shell(object):
                 shell_type = env['SHELL_TYPE'] = 'readline'
         # actually make the shell
         if shell_type == 'prompt_toolkit':
-            from xonsh.prompt_toolkit_shell import PromptToolkitShell
+            from xonsh.ptk.shell import PromptToolkitShell
             self.shell = PromptToolkitShell(execer=self.execer,
                                             ctx=self.ctx, **kwargs)
         elif shell_type == 'readline':