diff --git a/IPython/nbconvert.py b/IPython/nbconvert.py
new file mode 100644
index 0000000..8af4342
--- /dev/null
+++ b/IPython/nbconvert.py
@@ -0,0 +1,20 @@
+"""
+Shim to maintain backwards compatibility with old IPython.nbconvert imports.
+"""
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from __future__ import print_function
+
+import sys
+from warnings import warn
+
+warn("The `IPython.nbconvert` package has been deprecated. "
+     "You should import from ipython_nbconvert instead.")
+
+from IPython.utils.shimmodule import ShimModule
+
+# Unconditionally insert the shim into sys.modules so that further import calls
+# trigger the custom attribute access above
+
+sys.modules['IPython.nbconvert'] = ShimModule('nbconvert', mirror='jupyter_nbconvert')
diff --git a/IPython/nbconvert/__init__.py b/jupyter_nbconvert/__init__.py
similarity index 100%
rename from IPython/nbconvert/__init__.py
rename to jupyter_nbconvert/__init__.py
diff --git a/IPython/nbconvert/exporters/__init__.py b/jupyter_nbconvert/exporters/__init__.py
similarity index 100%
rename from IPython/nbconvert/exporters/__init__.py
rename to jupyter_nbconvert/exporters/__init__.py
diff --git a/IPython/nbconvert/exporters/export.py b/jupyter_nbconvert/exporters/export.py
similarity index 100%
rename from IPython/nbconvert/exporters/export.py
rename to jupyter_nbconvert/exporters/export.py
diff --git a/IPython/nbconvert/exporters/exporter.py b/jupyter_nbconvert/exporters/exporter.py
similarity index 100%
rename from IPython/nbconvert/exporters/exporter.py
rename to jupyter_nbconvert/exporters/exporter.py
diff --git a/IPython/nbconvert/exporters/html.py b/jupyter_nbconvert/exporters/html.py
similarity index 100%
rename from IPython/nbconvert/exporters/html.py
rename to jupyter_nbconvert/exporters/html.py
diff --git a/IPython/nbconvert/exporters/latex.py b/jupyter_nbconvert/exporters/latex.py
similarity index 100%
rename from IPython/nbconvert/exporters/latex.py
rename to jupyter_nbconvert/exporters/latex.py
diff --git a/IPython/nbconvert/exporters/markdown.py b/jupyter_nbconvert/exporters/markdown.py
similarity index 100%
rename from IPython/nbconvert/exporters/markdown.py
rename to jupyter_nbconvert/exporters/markdown.py
diff --git a/IPython/nbconvert/exporters/notebook.py b/jupyter_nbconvert/exporters/notebook.py
similarity index 100%
rename from IPython/nbconvert/exporters/notebook.py
rename to jupyter_nbconvert/exporters/notebook.py
diff --git a/IPython/nbconvert/exporters/pdf.py b/jupyter_nbconvert/exporters/pdf.py
similarity index 100%
rename from IPython/nbconvert/exporters/pdf.py
rename to jupyter_nbconvert/exporters/pdf.py
diff --git a/IPython/nbconvert/exporters/python.py b/jupyter_nbconvert/exporters/python.py
similarity index 100%
rename from IPython/nbconvert/exporters/python.py
rename to jupyter_nbconvert/exporters/python.py
diff --git a/IPython/nbconvert/exporters/rst.py b/jupyter_nbconvert/exporters/rst.py
similarity index 100%
rename from IPython/nbconvert/exporters/rst.py
rename to jupyter_nbconvert/exporters/rst.py
diff --git a/IPython/nbconvert/exporters/script.py b/jupyter_nbconvert/exporters/script.py
similarity index 100%
rename from IPython/nbconvert/exporters/script.py
rename to jupyter_nbconvert/exporters/script.py
diff --git a/IPython/nbconvert/exporters/slides.py b/jupyter_nbconvert/exporters/slides.py
similarity index 100%
rename from IPython/nbconvert/exporters/slides.py
rename to jupyter_nbconvert/exporters/slides.py
diff --git a/IPython/nbconvert/exporters/templateexporter.py b/jupyter_nbconvert/exporters/templateexporter.py
similarity index 100%
rename from IPython/nbconvert/exporters/templateexporter.py
rename to jupyter_nbconvert/exporters/templateexporter.py
diff --git a/IPython/nbconvert/exporters/tests/__init__.py b/jupyter_nbconvert/exporters/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/__init__.py
rename to jupyter_nbconvert/exporters/tests/__init__.py
diff --git a/IPython/nbconvert/exporters/tests/base.py b/jupyter_nbconvert/exporters/tests/base.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/base.py
rename to jupyter_nbconvert/exporters/tests/base.py
diff --git a/IPython/nbconvert/exporters/tests/cheese.py b/jupyter_nbconvert/exporters/tests/cheese.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/cheese.py
rename to jupyter_nbconvert/exporters/tests/cheese.py
diff --git a/IPython/nbconvert/exporters/tests/files/notebook2.ipynb b/jupyter_nbconvert/exporters/tests/files/notebook2.ipynb
similarity index 100%
rename from IPython/nbconvert/exporters/tests/files/notebook2.ipynb
rename to jupyter_nbconvert/exporters/tests/files/notebook2.ipynb
diff --git a/IPython/nbconvert/exporters/tests/files/pngmetadata.ipynb b/jupyter_nbconvert/exporters/tests/files/pngmetadata.ipynb
similarity index 100%
rename from IPython/nbconvert/exporters/tests/files/pngmetadata.ipynb
rename to jupyter_nbconvert/exporters/tests/files/pngmetadata.ipynb
diff --git a/IPython/nbconvert/exporters/tests/files/prompt_numbers.ipynb b/jupyter_nbconvert/exporters/tests/files/prompt_numbers.ipynb
similarity index 100%
rename from IPython/nbconvert/exporters/tests/files/prompt_numbers.ipynb
rename to jupyter_nbconvert/exporters/tests/files/prompt_numbers.ipynb
diff --git a/IPython/nbconvert/exporters/tests/files/rawtest.ipynb b/jupyter_nbconvert/exporters/tests/files/rawtest.ipynb
similarity index 100%
rename from IPython/nbconvert/exporters/tests/files/rawtest.ipynb
rename to jupyter_nbconvert/exporters/tests/files/rawtest.ipynb
diff --git a/IPython/nbconvert/exporters/tests/test_export.py b/jupyter_nbconvert/exporters/tests/test_export.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_export.py
rename to jupyter_nbconvert/exporters/tests/test_export.py
diff --git a/IPython/nbconvert/exporters/tests/test_exporter.py b/jupyter_nbconvert/exporters/tests/test_exporter.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_exporter.py
rename to jupyter_nbconvert/exporters/tests/test_exporter.py
diff --git a/IPython/nbconvert/exporters/tests/test_html.py b/jupyter_nbconvert/exporters/tests/test_html.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_html.py
rename to jupyter_nbconvert/exporters/tests/test_html.py
diff --git a/IPython/nbconvert/exporters/tests/test_latex.py b/jupyter_nbconvert/exporters/tests/test_latex.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_latex.py
rename to jupyter_nbconvert/exporters/tests/test_latex.py
diff --git a/IPython/nbconvert/exporters/tests/test_markdown.py b/jupyter_nbconvert/exporters/tests/test_markdown.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_markdown.py
rename to jupyter_nbconvert/exporters/tests/test_markdown.py
diff --git a/IPython/nbconvert/exporters/tests/test_notebook.py b/jupyter_nbconvert/exporters/tests/test_notebook.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_notebook.py
rename to jupyter_nbconvert/exporters/tests/test_notebook.py
diff --git a/IPython/nbconvert/exporters/tests/test_pdf.py b/jupyter_nbconvert/exporters/tests/test_pdf.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_pdf.py
rename to jupyter_nbconvert/exporters/tests/test_pdf.py
diff --git a/IPython/nbconvert/exporters/tests/test_python.py b/jupyter_nbconvert/exporters/tests/test_python.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_python.py
rename to jupyter_nbconvert/exporters/tests/test_python.py
diff --git a/IPython/nbconvert/exporters/tests/test_rst.py b/jupyter_nbconvert/exporters/tests/test_rst.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_rst.py
rename to jupyter_nbconvert/exporters/tests/test_rst.py
diff --git a/IPython/nbconvert/exporters/tests/test_script.py b/jupyter_nbconvert/exporters/tests/test_script.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_script.py
rename to jupyter_nbconvert/exporters/tests/test_script.py
diff --git a/IPython/nbconvert/exporters/tests/test_slides.py b/jupyter_nbconvert/exporters/tests/test_slides.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_slides.py
rename to jupyter_nbconvert/exporters/tests/test_slides.py
diff --git a/IPython/nbconvert/exporters/tests/test_templateexporter.py b/jupyter_nbconvert/exporters/tests/test_templateexporter.py
similarity index 100%
rename from IPython/nbconvert/exporters/tests/test_templateexporter.py
rename to jupyter_nbconvert/exporters/tests/test_templateexporter.py
diff --git a/IPython/nbconvert/filters/__init__.py b/jupyter_nbconvert/filters/__init__.py
similarity index 100%
rename from IPython/nbconvert/filters/__init__.py
rename to jupyter_nbconvert/filters/__init__.py
diff --git a/IPython/nbconvert/filters/ansi.py b/jupyter_nbconvert/filters/ansi.py
similarity index 100%
rename from IPython/nbconvert/filters/ansi.py
rename to jupyter_nbconvert/filters/ansi.py
diff --git a/IPython/nbconvert/filters/citation.py b/jupyter_nbconvert/filters/citation.py
similarity index 100%
rename from IPython/nbconvert/filters/citation.py
rename to jupyter_nbconvert/filters/citation.py
diff --git a/IPython/nbconvert/filters/datatypefilter.py b/jupyter_nbconvert/filters/datatypefilter.py
similarity index 100%
rename from IPython/nbconvert/filters/datatypefilter.py
rename to jupyter_nbconvert/filters/datatypefilter.py
diff --git a/IPython/nbconvert/filters/highlight.py b/jupyter_nbconvert/filters/highlight.py
similarity index 100%
rename from IPython/nbconvert/filters/highlight.py
rename to jupyter_nbconvert/filters/highlight.py
diff --git a/IPython/nbconvert/filters/latex.py b/jupyter_nbconvert/filters/latex.py
similarity index 100%
rename from IPython/nbconvert/filters/latex.py
rename to jupyter_nbconvert/filters/latex.py
diff --git a/IPython/nbconvert/filters/markdown.py b/jupyter_nbconvert/filters/markdown.py
similarity index 100%
rename from IPython/nbconvert/filters/markdown.py
rename to jupyter_nbconvert/filters/markdown.py
diff --git a/IPython/nbconvert/filters/markdown_mistune.py b/jupyter_nbconvert/filters/markdown_mistune.py
similarity index 100%
rename from IPython/nbconvert/filters/markdown_mistune.py
rename to jupyter_nbconvert/filters/markdown_mistune.py
diff --git a/IPython/nbconvert/filters/marked.js b/jupyter_nbconvert/filters/marked.js
similarity index 100%
rename from IPython/nbconvert/filters/marked.js
rename to jupyter_nbconvert/filters/marked.js
diff --git a/IPython/nbconvert/filters/strings.py b/jupyter_nbconvert/filters/strings.py
similarity index 100%
rename from IPython/nbconvert/filters/strings.py
rename to jupyter_nbconvert/filters/strings.py
diff --git a/IPython/nbconvert/filters/tests/__init__.py b/jupyter_nbconvert/filters/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/__init__.py
rename to jupyter_nbconvert/filters/tests/__init__.py
diff --git a/IPython/nbconvert/filters/tests/test_ansi.py b/jupyter_nbconvert/filters/tests/test_ansi.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_ansi.py
rename to jupyter_nbconvert/filters/tests/test_ansi.py
diff --git a/IPython/nbconvert/filters/tests/test_citation.py b/jupyter_nbconvert/filters/tests/test_citation.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_citation.py
rename to jupyter_nbconvert/filters/tests/test_citation.py
diff --git a/IPython/nbconvert/filters/tests/test_datatypefilter.py b/jupyter_nbconvert/filters/tests/test_datatypefilter.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_datatypefilter.py
rename to jupyter_nbconvert/filters/tests/test_datatypefilter.py
diff --git a/IPython/nbconvert/filters/tests/test_highlight.py b/jupyter_nbconvert/filters/tests/test_highlight.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_highlight.py
rename to jupyter_nbconvert/filters/tests/test_highlight.py
diff --git a/IPython/nbconvert/filters/tests/test_latex.py b/jupyter_nbconvert/filters/tests/test_latex.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_latex.py
rename to jupyter_nbconvert/filters/tests/test_latex.py
diff --git a/IPython/nbconvert/filters/tests/test_markdown.py b/jupyter_nbconvert/filters/tests/test_markdown.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_markdown.py
rename to jupyter_nbconvert/filters/tests/test_markdown.py
diff --git a/IPython/nbconvert/filters/tests/test_strings.py b/jupyter_nbconvert/filters/tests/test_strings.py
similarity index 100%
rename from IPython/nbconvert/filters/tests/test_strings.py
rename to jupyter_nbconvert/filters/tests/test_strings.py
diff --git a/IPython/nbconvert/nbconvertapp.py b/jupyter_nbconvert/nbconvertapp.py
similarity index 100%
rename from IPython/nbconvert/nbconvertapp.py
rename to jupyter_nbconvert/nbconvertapp.py
diff --git a/IPython/nbconvert/postprocessors/__init__.py b/jupyter_nbconvert/postprocessors/__init__.py
similarity index 100%
rename from IPython/nbconvert/postprocessors/__init__.py
rename to jupyter_nbconvert/postprocessors/__init__.py
diff --git a/IPython/nbconvert/postprocessors/base.py b/jupyter_nbconvert/postprocessors/base.py
similarity index 100%
rename from IPython/nbconvert/postprocessors/base.py
rename to jupyter_nbconvert/postprocessors/base.py
diff --git a/IPython/nbconvert/postprocessors/serve.py b/jupyter_nbconvert/postprocessors/serve.py
similarity index 100%
rename from IPython/nbconvert/postprocessors/serve.py
rename to jupyter_nbconvert/postprocessors/serve.py
diff --git a/IPython/nbconvert/postprocessors/tests/__init__.py b/jupyter_nbconvert/postprocessors/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/postprocessors/tests/__init__.py
rename to jupyter_nbconvert/postprocessors/tests/__init__.py
diff --git a/IPython/nbconvert/postprocessors/tests/test_serve.py b/jupyter_nbconvert/postprocessors/tests/test_serve.py
similarity index 100%
rename from IPython/nbconvert/postprocessors/tests/test_serve.py
rename to jupyter_nbconvert/postprocessors/tests/test_serve.py
diff --git a/IPython/nbconvert/preprocessors/__init__.py b/jupyter_nbconvert/preprocessors/__init__.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/__init__.py
rename to jupyter_nbconvert/preprocessors/__init__.py
diff --git a/IPython/nbconvert/preprocessors/base.py b/jupyter_nbconvert/preprocessors/base.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/base.py
rename to jupyter_nbconvert/preprocessors/base.py
diff --git a/IPython/nbconvert/preprocessors/clearoutput.py b/jupyter_nbconvert/preprocessors/clearoutput.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/clearoutput.py
rename to jupyter_nbconvert/preprocessors/clearoutput.py
diff --git a/IPython/nbconvert/preprocessors/coalescestreams.py b/jupyter_nbconvert/preprocessors/coalescestreams.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/coalescestreams.py
rename to jupyter_nbconvert/preprocessors/coalescestreams.py
diff --git a/IPython/nbconvert/preprocessors/convertfigures.py b/jupyter_nbconvert/preprocessors/convertfigures.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/convertfigures.py
rename to jupyter_nbconvert/preprocessors/convertfigures.py
diff --git a/IPython/nbconvert/preprocessors/csshtmlheader.py b/jupyter_nbconvert/preprocessors/csshtmlheader.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/csshtmlheader.py
rename to jupyter_nbconvert/preprocessors/csshtmlheader.py
diff --git a/IPython/nbconvert/preprocessors/execute.py b/jupyter_nbconvert/preprocessors/execute.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/execute.py
rename to jupyter_nbconvert/preprocessors/execute.py
diff --git a/IPython/nbconvert/preprocessors/extractoutput.py b/jupyter_nbconvert/preprocessors/extractoutput.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/extractoutput.py
rename to jupyter_nbconvert/preprocessors/extractoutput.py
diff --git a/IPython/nbconvert/preprocessors/highlightmagics.py b/jupyter_nbconvert/preprocessors/highlightmagics.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/highlightmagics.py
rename to jupyter_nbconvert/preprocessors/highlightmagics.py
diff --git a/IPython/nbconvert/preprocessors/latex.py b/jupyter_nbconvert/preprocessors/latex.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/latex.py
rename to jupyter_nbconvert/preprocessors/latex.py
diff --git a/IPython/nbconvert/preprocessors/revealhelp.py b/jupyter_nbconvert/preprocessors/revealhelp.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/revealhelp.py
rename to jupyter_nbconvert/preprocessors/revealhelp.py
diff --git a/IPython/nbconvert/preprocessors/svg2pdf.py b/jupyter_nbconvert/preprocessors/svg2pdf.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/svg2pdf.py
rename to jupyter_nbconvert/preprocessors/svg2pdf.py
diff --git a/IPython/nbconvert/preprocessors/tests/__init__.py b/jupyter_nbconvert/preprocessors/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/__init__.py
rename to jupyter_nbconvert/preprocessors/tests/__init__.py
diff --git a/IPython/nbconvert/preprocessors/tests/base.py b/jupyter_nbconvert/preprocessors/tests/base.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/base.py
rename to jupyter_nbconvert/preprocessors/tests/base.py
diff --git a/IPython/nbconvert/preprocessors/tests/files/Clear Output.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Clear Output.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Clear Output.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Clear Output.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/Disable Stdin.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Disable Stdin.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Disable Stdin.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Disable Stdin.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/Factorials.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Factorials.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Factorials.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Factorials.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/HelloWorld.ipynb b/jupyter_nbconvert/preprocessors/tests/files/HelloWorld.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/HelloWorld.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/HelloWorld.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/Inline Image.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Inline Image.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Inline Image.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Inline Image.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/Interrupt.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Interrupt.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Interrupt.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Interrupt.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/SVG.ipynb b/jupyter_nbconvert/preprocessors/tests/files/SVG.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/SVG.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/SVG.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/Skip Exceptions.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Skip Exceptions.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Skip Exceptions.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Skip Exceptions.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/Unicode.ipynb b/jupyter_nbconvert/preprocessors/tests/files/Unicode.ipynb
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/Unicode.ipynb
rename to jupyter_nbconvert/preprocessors/tests/files/Unicode.ipynb
diff --git a/IPython/nbconvert/preprocessors/tests/files/python.png b/jupyter_nbconvert/preprocessors/tests/files/python.png
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/files/python.png
rename to jupyter_nbconvert/preprocessors/tests/files/python.png
Binary files a/IPython/nbconvert/preprocessors/tests/files/python.png and b/jupyter_nbconvert/preprocessors/tests/files/python.png differ
diff --git a/IPython/nbconvert/preprocessors/tests/test_clearoutput.py b/jupyter_nbconvert/preprocessors/tests/test_clearoutput.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_clearoutput.py
rename to jupyter_nbconvert/preprocessors/tests/test_clearoutput.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_coalescestreams.py b/jupyter_nbconvert/preprocessors/tests/test_coalescestreams.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_coalescestreams.py
rename to jupyter_nbconvert/preprocessors/tests/test_coalescestreams.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_csshtmlheader.py b/jupyter_nbconvert/preprocessors/tests/test_csshtmlheader.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_csshtmlheader.py
rename to jupyter_nbconvert/preprocessors/tests/test_csshtmlheader.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_execute.py b/jupyter_nbconvert/preprocessors/tests/test_execute.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_execute.py
rename to jupyter_nbconvert/preprocessors/tests/test_execute.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_extractoutput.py b/jupyter_nbconvert/preprocessors/tests/test_extractoutput.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_extractoutput.py
rename to jupyter_nbconvert/preprocessors/tests/test_extractoutput.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_highlightmagics.py b/jupyter_nbconvert/preprocessors/tests/test_highlightmagics.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_highlightmagics.py
rename to jupyter_nbconvert/preprocessors/tests/test_highlightmagics.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_latex.py b/jupyter_nbconvert/preprocessors/tests/test_latex.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_latex.py
rename to jupyter_nbconvert/preprocessors/tests/test_latex.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_revealhelp.py b/jupyter_nbconvert/preprocessors/tests/test_revealhelp.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_revealhelp.py
rename to jupyter_nbconvert/preprocessors/tests/test_revealhelp.py
diff --git a/IPython/nbconvert/preprocessors/tests/test_svg2pdf.py b/jupyter_nbconvert/preprocessors/tests/test_svg2pdf.py
similarity index 100%
rename from IPython/nbconvert/preprocessors/tests/test_svg2pdf.py
rename to jupyter_nbconvert/preprocessors/tests/test_svg2pdf.py
diff --git a/IPython/nbconvert/templates/README.md b/jupyter_nbconvert/templates/README.md
similarity index 100%
rename from IPython/nbconvert/templates/README.md
rename to jupyter_nbconvert/templates/README.md
diff --git a/IPython/nbconvert/templates/html/basic.tpl b/jupyter_nbconvert/templates/html/basic.tpl
similarity index 100%
rename from IPython/nbconvert/templates/html/basic.tpl
rename to jupyter_nbconvert/templates/html/basic.tpl
diff --git a/IPython/nbconvert/templates/html/full.tpl b/jupyter_nbconvert/templates/html/full.tpl
similarity index 100%
rename from IPython/nbconvert/templates/html/full.tpl
rename to jupyter_nbconvert/templates/html/full.tpl
diff --git a/IPython/nbconvert/templates/html/mathjax.tpl b/jupyter_nbconvert/templates/html/mathjax.tpl
similarity index 100%
rename from IPython/nbconvert/templates/html/mathjax.tpl
rename to jupyter_nbconvert/templates/html/mathjax.tpl
diff --git a/IPython/nbconvert/templates/html/slides_reveal.tpl b/jupyter_nbconvert/templates/html/slides_reveal.tpl
similarity index 100%
rename from IPython/nbconvert/templates/html/slides_reveal.tpl
rename to jupyter_nbconvert/templates/html/slides_reveal.tpl
diff --git a/IPython/nbconvert/templates/latex/article.tplx b/jupyter_nbconvert/templates/latex/article.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/article.tplx
rename to jupyter_nbconvert/templates/latex/article.tplx
diff --git a/IPython/nbconvert/templates/latex/base.tplx b/jupyter_nbconvert/templates/latex/base.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/base.tplx
rename to jupyter_nbconvert/templates/latex/base.tplx
diff --git a/IPython/nbconvert/templates/latex/report.tplx b/jupyter_nbconvert/templates/latex/report.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/report.tplx
rename to jupyter_nbconvert/templates/latex/report.tplx
diff --git a/IPython/nbconvert/templates/latex/skeleton/display_priority.tplx b/jupyter_nbconvert/templates/latex/skeleton/display_priority.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/skeleton/display_priority.tplx
rename to jupyter_nbconvert/templates/latex/skeleton/display_priority.tplx
diff --git a/IPython/nbconvert/templates/latex/skeleton/null.tplx b/jupyter_nbconvert/templates/latex/skeleton/null.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/skeleton/null.tplx
rename to jupyter_nbconvert/templates/latex/skeleton/null.tplx
diff --git a/IPython/nbconvert/templates/latex/style_bw_ipython.tplx b/jupyter_nbconvert/templates/latex/style_bw_ipython.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/style_bw_ipython.tplx
rename to jupyter_nbconvert/templates/latex/style_bw_ipython.tplx
diff --git a/IPython/nbconvert/templates/latex/style_bw_python.tplx b/jupyter_nbconvert/templates/latex/style_bw_python.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/style_bw_python.tplx
rename to jupyter_nbconvert/templates/latex/style_bw_python.tplx
diff --git a/IPython/nbconvert/templates/latex/style_ipython.tplx b/jupyter_nbconvert/templates/latex/style_ipython.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/style_ipython.tplx
rename to jupyter_nbconvert/templates/latex/style_ipython.tplx
diff --git a/IPython/nbconvert/templates/latex/style_python.tplx b/jupyter_nbconvert/templates/latex/style_python.tplx
similarity index 100%
rename from IPython/nbconvert/templates/latex/style_python.tplx
rename to jupyter_nbconvert/templates/latex/style_python.tplx
diff --git a/IPython/nbconvert/templates/markdown.tpl b/jupyter_nbconvert/templates/markdown.tpl
similarity index 100%
rename from IPython/nbconvert/templates/markdown.tpl
rename to jupyter_nbconvert/templates/markdown.tpl
diff --git a/IPython/nbconvert/templates/python.tpl b/jupyter_nbconvert/templates/python.tpl
similarity index 100%
rename from IPython/nbconvert/templates/python.tpl
rename to jupyter_nbconvert/templates/python.tpl
diff --git a/IPython/nbconvert/templates/rst.tpl b/jupyter_nbconvert/templates/rst.tpl
similarity index 100%
rename from IPython/nbconvert/templates/rst.tpl
rename to jupyter_nbconvert/templates/rst.tpl
diff --git a/IPython/nbconvert/templates/script.tpl b/jupyter_nbconvert/templates/script.tpl
similarity index 100%
rename from IPython/nbconvert/templates/script.tpl
rename to jupyter_nbconvert/templates/script.tpl
diff --git a/IPython/nbconvert/templates/skeleton/Makefile b/jupyter_nbconvert/templates/skeleton/Makefile
similarity index 100%
rename from IPython/nbconvert/templates/skeleton/Makefile
rename to jupyter_nbconvert/templates/skeleton/Makefile
diff --git a/IPython/nbconvert/templates/skeleton/README.md b/jupyter_nbconvert/templates/skeleton/README.md
similarity index 100%
rename from IPython/nbconvert/templates/skeleton/README.md
rename to jupyter_nbconvert/templates/skeleton/README.md
diff --git a/IPython/nbconvert/templates/skeleton/display_priority.tpl b/jupyter_nbconvert/templates/skeleton/display_priority.tpl
similarity index 100%
rename from IPython/nbconvert/templates/skeleton/display_priority.tpl
rename to jupyter_nbconvert/templates/skeleton/display_priority.tpl
diff --git a/IPython/nbconvert/templates/skeleton/null.tpl b/jupyter_nbconvert/templates/skeleton/null.tpl
similarity index 100%
rename from IPython/nbconvert/templates/skeleton/null.tpl
rename to jupyter_nbconvert/templates/skeleton/null.tpl
diff --git a/IPython/nbconvert/tests/README.md b/jupyter_nbconvert/tests/README.md
similarity index 100%
rename from IPython/nbconvert/tests/README.md
rename to jupyter_nbconvert/tests/README.md
diff --git a/IPython/nbconvert/tests/__init__.py b/jupyter_nbconvert/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/tests/__init__.py
rename to jupyter_nbconvert/tests/__init__.py
diff --git a/IPython/nbconvert/tests/base.py b/jupyter_nbconvert/tests/base.py
similarity index 100%
rename from IPython/nbconvert/tests/base.py
rename to jupyter_nbconvert/tests/base.py
diff --git a/IPython/nbconvert/tests/files/hello.py b/jupyter_nbconvert/tests/files/hello.py
similarity index 100%
rename from IPython/nbconvert/tests/files/hello.py
rename to jupyter_nbconvert/tests/files/hello.py
diff --git a/IPython/nbconvert/tests/files/ipython_nbconvert_config.py b/jupyter_nbconvert/tests/files/ipython_nbconvert_config.py
similarity index 100%
rename from IPython/nbconvert/tests/files/ipython_nbconvert_config.py
rename to jupyter_nbconvert/tests/files/ipython_nbconvert_config.py
diff --git a/IPython/nbconvert/tests/files/notebook1.ipynb b/jupyter_nbconvert/tests/files/notebook1.ipynb
similarity index 100%
rename from IPython/nbconvert/tests/files/notebook1.ipynb
rename to jupyter_nbconvert/tests/files/notebook1.ipynb
diff --git a/IPython/nbconvert/tests/files/notebook2.ipynb b/jupyter_nbconvert/tests/files/notebook2.ipynb
similarity index 100%
rename from IPython/nbconvert/tests/files/notebook2.ipynb
rename to jupyter_nbconvert/tests/files/notebook2.ipynb
diff --git a/IPython/nbconvert/tests/files/override.py b/jupyter_nbconvert/tests/files/override.py
similarity index 100%
rename from IPython/nbconvert/tests/files/override.py
rename to jupyter_nbconvert/tests/files/override.py
diff --git a/IPython/nbconvert/tests/test_nbconvertapp.py b/jupyter_nbconvert/tests/test_nbconvertapp.py
similarity index 100%
rename from IPython/nbconvert/tests/test_nbconvertapp.py
rename to jupyter_nbconvert/tests/test_nbconvertapp.py
diff --git a/IPython/nbconvert/utils/__init__.py b/jupyter_nbconvert/utils/__init__.py
similarity index 100%
rename from IPython/nbconvert/utils/__init__.py
rename to jupyter_nbconvert/utils/__init__.py
diff --git a/IPython/nbconvert/utils/base.py b/jupyter_nbconvert/utils/base.py
similarity index 100%
rename from IPython/nbconvert/utils/base.py
rename to jupyter_nbconvert/utils/base.py
diff --git a/IPython/nbconvert/utils/exceptions.py b/jupyter_nbconvert/utils/exceptions.py
similarity index 100%
rename from IPython/nbconvert/utils/exceptions.py
rename to jupyter_nbconvert/utils/exceptions.py
diff --git a/IPython/nbconvert/utils/lexers.py b/jupyter_nbconvert/utils/lexers.py
similarity index 100%
rename from IPython/nbconvert/utils/lexers.py
rename to jupyter_nbconvert/utils/lexers.py
diff --git a/IPython/nbconvert/utils/pandoc.py b/jupyter_nbconvert/utils/pandoc.py
similarity index 100%
rename from IPython/nbconvert/utils/pandoc.py
rename to jupyter_nbconvert/utils/pandoc.py
diff --git a/IPython/nbconvert/utils/tests/__init__.py b/jupyter_nbconvert/utils/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/utils/tests/__init__.py
rename to jupyter_nbconvert/utils/tests/__init__.py
diff --git a/IPython/nbconvert/utils/tests/test_lexers.py b/jupyter_nbconvert/utils/tests/test_lexers.py
similarity index 100%
rename from IPython/nbconvert/utils/tests/test_lexers.py
rename to jupyter_nbconvert/utils/tests/test_lexers.py
diff --git a/IPython/nbconvert/utils/tests/test_pandoc.py b/jupyter_nbconvert/utils/tests/test_pandoc.py
similarity index 100%
rename from IPython/nbconvert/utils/tests/test_pandoc.py
rename to jupyter_nbconvert/utils/tests/test_pandoc.py
diff --git a/IPython/nbconvert/writers/__init__.py b/jupyter_nbconvert/writers/__init__.py
similarity index 100%
rename from IPython/nbconvert/writers/__init__.py
rename to jupyter_nbconvert/writers/__init__.py
diff --git a/IPython/nbconvert/writers/base.py b/jupyter_nbconvert/writers/base.py
similarity index 100%
rename from IPython/nbconvert/writers/base.py
rename to jupyter_nbconvert/writers/base.py
diff --git a/IPython/nbconvert/writers/debug.py b/jupyter_nbconvert/writers/debug.py
similarity index 100%
rename from IPython/nbconvert/writers/debug.py
rename to jupyter_nbconvert/writers/debug.py
diff --git a/IPython/nbconvert/writers/files.py b/jupyter_nbconvert/writers/files.py
similarity index 100%
rename from IPython/nbconvert/writers/files.py
rename to jupyter_nbconvert/writers/files.py
diff --git a/IPython/nbconvert/writers/stdout.py b/jupyter_nbconvert/writers/stdout.py
similarity index 100%
rename from IPython/nbconvert/writers/stdout.py
rename to jupyter_nbconvert/writers/stdout.py
diff --git a/IPython/nbconvert/writers/tests/__init__.py b/jupyter_nbconvert/writers/tests/__init__.py
similarity index 100%
rename from IPython/nbconvert/writers/tests/__init__.py
rename to jupyter_nbconvert/writers/tests/__init__.py
diff --git a/IPython/nbconvert/writers/tests/test_debug.py b/jupyter_nbconvert/writers/tests/test_debug.py
similarity index 100%
rename from IPython/nbconvert/writers/tests/test_debug.py
rename to jupyter_nbconvert/writers/tests/test_debug.py
diff --git a/IPython/nbconvert/writers/tests/test_files.py b/jupyter_nbconvert/writers/tests/test_files.py
similarity index 100%
rename from IPython/nbconvert/writers/tests/test_files.py
rename to jupyter_nbconvert/writers/tests/test_files.py
diff --git a/IPython/nbconvert/writers/tests/test_stdout.py b/jupyter_nbconvert/writers/tests/test_stdout.py
similarity index 100%
rename from IPython/nbconvert/writers/tests/test_stdout.py
rename to jupyter_nbconvert/writers/tests/test_stdout.py