diff --git a/Doc/tools/c_annotations.py b/Doc/tools/extensions/c_annotations.py
similarity index 100%
rename from Doc/tools/c_annotations.py
rename to Doc/tools/extensions/c_annotations.py
diff --git a/Doc/tools/patchlevel.py b/Doc/tools/extensions/patchlevel.py
similarity index 100%
rename from Doc/tools/patchlevel.py
rename to Doc/tools/extensions/patchlevel.py
diff --git a/Doc/tools/pyspecific.py b/Doc/tools/extensions/pyspecific.py
similarity index 100%
rename from Doc/tools/pyspecific.py
rename to Doc/tools/extensions/pyspecific.py
diff --git a/Doc/tools/suspicious.py b/Doc/tools/extensions/suspicious.py
similarity index 98%
rename from Doc/tools/suspicious.py
rename to Doc/tools/extensions/suspicious.py
index ee87733..d3ed849 100644
--- a/Doc/tools/suspicious.py
+++ b/Doc/tools/extensions/suspicious.py
@@ -91,7 +91,7 @@
         self.log_file_name = os.path.join(self.outdir, 'suspicious.csv')
         open(self.log_file_name, 'w').close()
         # load database of previously ignored issues
-        self.load_rules(os.path.join(os.path.dirname(__file__),
+        self.load_rules(os.path.join(os.path.dirname(__file__), '..',
                                      'susp-ignored.csv'))
 
     def get_outdated_docs(self):
diff --git a/Doc/tools/download.html b/Doc/tools/templates/download.html
similarity index 100%
rename from Doc/tools/download.html
rename to Doc/tools/templates/download.html
diff --git a/Doc/tools/indexcontent.html b/Doc/tools/templates/indexcontent.html
similarity index 100%
rename from Doc/tools/indexcontent.html
rename to Doc/tools/templates/indexcontent.html
diff --git a/Doc/tools/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
similarity index 100%
rename from Doc/tools/indexsidebar.html
rename to Doc/tools/templates/indexsidebar.html
diff --git a/Doc/tools/layout.html b/Doc/tools/templates/layout.html
similarity index 100%
rename from Doc/tools/layout.html
rename to Doc/tools/templates/layout.html
diff --git a/Doc/tools/opensearch.xml b/Doc/tools/templates/opensearch.xml
similarity index 100%
rename from Doc/tools/opensearch.xml
rename to Doc/tools/templates/opensearch.xml