diff --git a/pom.xml b/pom.xml
index de67b0180..dfc3657e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -354,8 +354,8 @@ Copyright (c) 2012 - Jeremy Long
dependency-infodependency-managementdistribution-management
- -->
index
+ -->
summarymailing-listissue-tracking
diff --git a/src/site/markdown/archive-analyzer.md b/src/site/markdown/analyzers/archive-analyzer.md
similarity index 100%
rename from src/site/markdown/archive-analyzer.md
rename to src/site/markdown/analyzers/archive-analyzer.md
diff --git a/src/site/markdown/assembly-analyzer.md b/src/site/markdown/analyzers/assembly-analyzer.md
similarity index 100%
rename from src/site/markdown/assembly-analyzer.md
rename to src/site/markdown/analyzers/assembly-analyzer.md
diff --git a/src/site/markdown/central-analyzer.md b/src/site/markdown/analyzers/central-analyzer.md
similarity index 100%
rename from src/site/markdown/central-analyzer.md
rename to src/site/markdown/analyzers/central-analyzer.md
diff --git a/src/site/markdown/jar-analyzer.md b/src/site/markdown/analyzers/jar-analyzer.md
similarity index 100%
rename from src/site/markdown/jar-analyzer.md
rename to src/site/markdown/analyzers/jar-analyzer.md
diff --git a/src/site/markdown/nexus-analyzer.md b/src/site/markdown/analyzers/nexus-analyzer.md
similarity index 100%
rename from src/site/markdown/nexus-analyzer.md
rename to src/site/markdown/analyzers/nexus-analyzer.md
diff --git a/src/site/markdown/nuspec-analyzer.md b/src/site/markdown/analyzers/nuspec-analyzer.md
similarity index 100%
rename from src/site/markdown/nuspec-analyzer.md
rename to src/site/markdown/analyzers/nuspec-analyzer.md
diff --git a/src/site/markdown/internals.md b/src/site/markdown/general/internals.md
similarity index 100%
rename from src/site/markdown/internals.md
rename to src/site/markdown/general/internals.md
diff --git a/src/site/markdown/suppression.md b/src/site/markdown/general/suppression.md
similarity index 100%
rename from src/site/markdown/suppression.md
rename to src/site/markdown/general/suppression.md
diff --git a/src/site/markdown/thereport.md b/src/site/markdown/general/thereport.md
similarity index 100%
rename from src/site/markdown/thereport.md
rename to src/site/markdown/general/thereport.md
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 50dc4c451..2ba258ecf 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,6 +1,6 @@
About
====================
-Dependency-check is an open source solution the OWASP Top 10 2013 entry: [A9 -
+OWASP dependency-check is an open source solution the OWASP Top 10 2013 entry: [A9 -
Using Components with Known Vulnerabilities](https://www.owasp.org/index.php/Top_10_2013-A9-Using_Components_with_Known_Vulnerabilities).
Dependency-check can currently be used to scan Java applications (and their
dependent libraries) to identify known vulnerable components.
@@ -16,13 +16,9 @@ More information about dependency-check can be found here:
* [How does dependency-check work](./internals.html)
* [How to read the report](./thereport.html)
+* [The OWASP dependency-check mailing list](./mail-lists.html)
-**IMPORTANT NOTE**: Dependency-check automatically updates itself using the NVD Data Feeds hosted by
-NIST. **The initial download of the data may take fifteen minutes
-or more**, if you run the tool at least once every seven days only a small XML file
-needs to be downloaded to keep the local copy of the data current.
-
-Dependency-check's core analysis library is exposed in various forms:
+OWASP dependency-check's core analysis engine can be used as:
- [Command Line Tool](dependency-check-cli/index.html)
- [Maven Plugin](dependency-check-maven/usage.html)
diff --git a/src/site/resources/SampleReport.html b/src/site/resources/general/SampleReport.html
similarity index 100%
rename from src/site/resources/SampleReport.html
rename to src/site/resources/general/SampleReport.html
diff --git a/src/site/resources/dependency-check.pdf b/src/site/resources/general/dependency-check.pdf
similarity index 100%
rename from src/site/resources/dependency-check.pdf
rename to src/site/resources/general/dependency-check.pdf
diff --git a/src/site/resources/dependency-check.pptx b/src/site/resources/general/dependency-check.pptx
similarity index 100%
rename from src/site/resources/dependency-check.pptx
rename to src/site/resources/general/dependency-check.pptx
diff --git a/src/site/site.xml b/src/site/site.xml
index 29394edde..66c4fa137 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -73,67 +73,68 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
+