diff --git a/sphinx/htmlhelp.py b/sphinx/builders/htmlhelp.py similarity index 100% rename from sphinx/htmlhelp.py rename to sphinx/builders/htmlhelp.py diff --git a/sphinx/linkcheck.py b/sphinx/builders/linkcheck.py similarity index 100% rename from sphinx/linkcheck.py rename to sphinx/builders/linkcheck.py diff --git a/sphinx/htmlwriter.py b/sphinx/writers/html.py similarity index 100% rename from sphinx/htmlwriter.py rename to sphinx/writers/html.py diff --git a/sphinx/latexwriter.py b/sphinx/writers/latex.py similarity index 100% rename from sphinx/latexwriter.py rename to sphinx/writers/latex.py diff --git a/sphinx/textwriter.py b/sphinx/writers/text.py similarity index 100% rename from sphinx/textwriter.py rename to sphinx/writers/text.py