diff --git a/__init__.py b/nbconvert/__init__.py
similarity index 100%
rename from __init__.py
rename to nbconvert/__init__.py
diff --git a/api/base.py b/nbconvert/api/base.py
similarity index 100%
rename from api/base.py
rename to nbconvert/api/base.py
diff --git a/api/latex.py b/nbconvert/api/latex.py
similarity index 100%
rename from api/latex.py
rename to nbconvert/api/latex.py
diff --git a/filters/datatypefilter.py b/nbconvert/filters/datatypefilter.py
similarity index 100%
rename from filters/datatypefilter.py
rename to nbconvert/filters/datatypefilter.py
diff --git a/filters/latex.py b/nbconvert/filters/latex.py
similarity index 100%
rename from filters/latex.py
rename to nbconvert/filters/latex.py
diff --git a/filters/markdown.py b/nbconvert/filters/markdown.py
similarity index 100%
rename from filters/markdown.py
rename to nbconvert/filters/markdown.py
diff --git a/filters/strings.py b/nbconvert/filters/strings.py
similarity index 100%
rename from filters/strings.py
rename to nbconvert/filters/strings.py
diff --git a/templates/basichtml.tpl b/nbconvert/templates/basichtml.tpl
similarity index 100%
rename from templates/basichtml.tpl
rename to nbconvert/templates/basichtml.tpl
diff --git a/templates/fullhtml.tpl b/nbconvert/templates/fullhtml.tpl
similarity index 100%
rename from templates/fullhtml.tpl
rename to nbconvert/templates/fullhtml.tpl
diff --git a/templates/latex/fncychap.sty b/nbconvert/templates/latex/fncychap.sty
similarity index 100%
rename from templates/latex/fncychap.sty
rename to nbconvert/templates/latex/fncychap.sty
diff --git a/templates/latex/latex_base.tplx b/nbconvert/templates/latex/latex_base.tplx
similarity index 100%
rename from templates/latex/latex_base.tplx
rename to nbconvert/templates/latex/latex_base.tplx
diff --git a/templates/latex/latex_sphinx_base.tplx b/nbconvert/templates/latex/latex_sphinx_base.tplx
similarity index 100%
rename from templates/latex/latex_sphinx_base.tplx
rename to nbconvert/templates/latex/latex_sphinx_base.tplx
diff --git a/templates/latex/latex_sphinx_howto.tplx b/nbconvert/templates/latex/latex_sphinx_howto.tplx
similarity index 100%
rename from templates/latex/latex_sphinx_howto.tplx
rename to nbconvert/templates/latex/latex_sphinx_howto.tplx
diff --git a/templates/latex/latex_sphinx_manual.tplx b/nbconvert/templates/latex/latex_sphinx_manual.tplx
similarity index 100%
rename from templates/latex/latex_sphinx_manual.tplx
rename to nbconvert/templates/latex/latex_sphinx_manual.tplx
diff --git a/templates/latex/skeleton/display_priority.tplx b/nbconvert/templates/latex/skeleton/display_priority.tplx
similarity index 100%
rename from templates/latex/skeleton/display_priority.tplx
rename to nbconvert/templates/latex/skeleton/display_priority.tplx
diff --git a/templates/latex/skeleton/null.tplx b/nbconvert/templates/latex/skeleton/null.tplx
similarity index 100%
rename from templates/latex/skeleton/null.tplx
rename to nbconvert/templates/latex/skeleton/null.tplx
diff --git a/templates/latex/sphinx.sty b/nbconvert/templates/latex/sphinx.sty
similarity index 100%
rename from templates/latex/sphinx.sty
rename to nbconvert/templates/latex/sphinx.sty
diff --git a/templates/latex/sphinxhowto.cls b/nbconvert/templates/latex/sphinxhowto.cls
similarity index 100%
rename from templates/latex/sphinxhowto.cls
rename to nbconvert/templates/latex/sphinxhowto.cls
diff --git a/templates/latex/sphinxmanual.cls b/nbconvert/templates/latex/sphinxmanual.cls
similarity index 100%
rename from templates/latex/sphinxmanual.cls
rename to nbconvert/templates/latex/sphinxmanual.cls
diff --git a/templates/latex/tabulary.sty b/nbconvert/templates/latex/tabulary.sty
similarity index 100%
rename from templates/latex/tabulary.sty
rename to nbconvert/templates/latex/tabulary.sty
diff --git a/templates/markdown.tpl b/nbconvert/templates/markdown.tpl
similarity index 100%
rename from templates/markdown.tpl
rename to nbconvert/templates/markdown.tpl
diff --git a/templates/python-armor.tpl b/nbconvert/templates/python-armor.tpl
similarity index 100%
rename from templates/python-armor.tpl
rename to nbconvert/templates/python-armor.tpl
diff --git a/templates/python.tpl b/nbconvert/templates/python.tpl
similarity index 100%
rename from templates/python.tpl
rename to nbconvert/templates/python.tpl
diff --git a/templates/reveal.tpl b/nbconvert/templates/reveal.tpl
similarity index 100%
rename from templates/reveal.tpl
rename to nbconvert/templates/reveal.tpl
diff --git a/templates/reveal_base.html b/nbconvert/templates/reveal_base.html
similarity index 100%
rename from templates/reveal_base.html
rename to nbconvert/templates/reveal_base.html
diff --git a/templates/reveal_cells.tpl b/nbconvert/templates/reveal_cells.tpl
similarity index 100%
rename from templates/reveal_cells.tpl
rename to nbconvert/templates/reveal_cells.tpl
diff --git a/templates/rst.tpl b/nbconvert/templates/rst.tpl
similarity index 100%
rename from templates/rst.tpl
rename to nbconvert/templates/rst.tpl
diff --git a/templates/skeleton/Makefile b/nbconvert/templates/skeleton/Makefile
similarity index 100%
rename from templates/skeleton/Makefile
rename to nbconvert/templates/skeleton/Makefile
diff --git a/templates/skeleton/README.md b/nbconvert/templates/skeleton/README.md
similarity index 100%
rename from templates/skeleton/README.md
rename to nbconvert/templates/skeleton/README.md
diff --git a/templates/skeleton/display_priority.tpl b/nbconvert/templates/skeleton/display_priority.tpl
similarity index 100%
rename from templates/skeleton/display_priority.tpl
rename to nbconvert/templates/skeleton/display_priority.tpl
diff --git a/templates/skeleton/null.tpl b/nbconvert/templates/skeleton/null.tpl
similarity index 100%
rename from templates/skeleton/null.tpl
rename to nbconvert/templates/skeleton/null.tpl
diff --git a/templates/slides.tpl b/nbconvert/templates/slides.tpl
similarity index 100%
rename from templates/slides.tpl
rename to nbconvert/templates/slides.tpl
diff --git a/templates/subslides.tpl b/nbconvert/templates/subslides.tpl
similarity index 100%
rename from templates/subslides.tpl
rename to nbconvert/templates/subslides.tpl
diff --git a/transformers/activatable.py b/nbconvert/transformers/activatable.py
similarity index 100%
rename from transformers/activatable.py
rename to nbconvert/transformers/activatable.py
diff --git a/transformers/base.py b/nbconvert/transformers/base.py
similarity index 100%
rename from transformers/base.py
rename to nbconvert/transformers/base.py
diff --git a/transformers/csshtmlheader.py b/nbconvert/transformers/csshtmlheader.py
similarity index 100%
rename from transformers/csshtmlheader.py
rename to nbconvert/transformers/csshtmlheader.py
diff --git a/transformers/extractfigure.py b/nbconvert/transformers/extractfigure.py
similarity index 100%
rename from transformers/extractfigure.py
rename to nbconvert/transformers/extractfigure.py
diff --git a/transformers/latex.py b/nbconvert/transformers/latex.py
similarity index 100%
rename from transformers/latex.py
rename to nbconvert/transformers/latex.py
diff --git a/transformers/reavealhelp.py b/nbconvert/transformers/reavealhelp.py
similarity index 100%
rename from transformers/reavealhelp.py
rename to nbconvert/transformers/reavealhelp.py
diff --git a/transformers/sphinx.py b/nbconvert/transformers/sphinx.py
similarity index 100%
rename from transformers/sphinx.py
rename to nbconvert/transformers/sphinx.py
diff --git a/utils/exceptions.py b/nbconvert/utils/exceptions.py
similarity index 100%
rename from utils/exceptions.py
rename to nbconvert/utils/exceptions.py