diff --git a/docs/development.rst b/docs/contributing.rst
similarity index 70%
rename from docs/development.rst
rename to docs/contributing.rst
index 594c885aff..5d1b84136f 100644
--- a/docs/development.rst
+++ b/docs/contributing.rst
@@ -1,22 +1,21 @@
-.. index:: development
+.. index:: contributing
 
-.. _development-chapter:
+.. _contributing-chapter:
 
-Development Discussions
-=======================
+Contributing
+============
 
 .. toctree::
    :maxdepth: 2
 
    codingconventions
    newdeveloperguide
-   glossary
    unittesting
    seleniumtesting
    crashreprofilteringreport
    diskperformancetests
    dumpingdumptables
-   jsondumpstorage
+   glossary/jsondumpstorage
    processeddumpstorage
    fs
    database
diff --git a/docs/ProcessedDumpStorage.1.0.png b/docs/glossary/ProcessedDumpStorage.1.0.png
similarity index 100%
rename from docs/ProcessedDumpStorage.1.0.png
rename to docs/glossary/ProcessedDumpStorage.1.0.png
diff --git a/docs/Socorro.directory.diagram.2.2.png b/docs/glossary/Socorro.directory.diagram.2.2.png
similarity index 100%
rename from docs/Socorro.directory.diagram.2.2.png
rename to docs/glossary/Socorro.directory.diagram.2.2.png
diff --git a/docs/collector.rst b/docs/glossary/collector.rst
similarity index 100%
rename from docs/collector.rst
rename to docs/glossary/collector.rst
diff --git a/docs/crashmover.rst b/docs/glossary/crashmover.rst
similarity index 100%
rename from docs/crashmover.rst
rename to docs/glossary/crashmover.rst
diff --git a/docs/deferredcleanup.rst b/docs/glossary/deferredcleanup.rst
similarity index 100%
rename from docs/deferredcleanup.rst
rename to docs/glossary/deferredcleanup.rst
diff --git a/docs/deferredjobstorage.rst b/docs/glossary/deferredjobstorage.rst
similarity index 100%
rename from docs/deferredjobstorage.rst
rename to docs/glossary/deferredjobstorage.rst
diff --git a/docs/filesystem.rst b/docs/glossary/filesystem.rst
similarity index 100%
rename from docs/filesystem.rst
rename to docs/glossary/filesystem.rst
diff --git a/docs/glossary.rst b/docs/glossary/index.rst
similarity index 100%
rename from docs/glossary.rst
rename to docs/glossary/index.rst
diff --git a/docs/jsondumpstorage.rst b/docs/glossary/jsondumpstorage.rst
similarity index 100%
rename from docs/jsondumpstorage.rst
rename to docs/glossary/jsondumpstorage.rst
diff --git a/docs/monitor.rst b/docs/glossary/monitor.rst
similarity index 100%
rename from docs/monitor.rst
rename to docs/glossary/monitor.rst
diff --git a/docs/processeddumpstorage.rst b/docs/glossary/processeddumpstorage.rst
similarity index 100%
rename from docs/processeddumpstorage.rst
rename to docs/glossary/processeddumpstorage.rst
diff --git a/docs/reporter.rst b/docs/glossary/reporter.rst
similarity index 100%
rename from docs/reporter.rst
rename to docs/glossary/reporter.rst
diff --git a/docs/signaturegeneration.rst b/docs/glossary/signaturegeneration.rst
similarity index 100%
rename from docs/signaturegeneration.rst
rename to docs/glossary/signaturegeneration.rst
diff --git a/docs/standardjobstorage.rst b/docs/glossary/standardjobstorage.rst
similarity index 100%
rename from docs/standardjobstorage.rst
rename to docs/glossary/standardjobstorage.rst
diff --git a/docs/topcrashersbysignature.rst b/docs/glossary/topcrashersbysignature.rst
similarity index 100%
rename from docs/topcrashersbysignature.rst
rename to docs/glossary/topcrashersbysignature.rst
diff --git a/docs/topcrashersbyurl.rst b/docs/glossary/topcrashersbyurl.rst
similarity index 100%
rename from docs/topcrashersbyurl.rst
rename to docs/glossary/topcrashersbyurl.rst
diff --git a/docs/index.rst b/docs/index.rst
index 43dd3b25c6..b5c8c5a4ac 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -36,10 +36,11 @@ Contents:
    crashstorage
    crontabber
    throttling
-   development
+   contributing
    database
    generic_app
    writingdocs
+   glossary/index
 
 
 Indices and tables