diff --git a/LICENSE b/LICENSE.txt
similarity index 100%
rename from LICENSE
rename to LICENSE.txt
diff --git a/NOTICES.txt b/NOTICES.txt
new file mode 100644
index 000000000..f3ccac1cf
--- /dev/null
+++ b/NOTICES.txt
@@ -0,0 +1,11 @@
+DependencyCheck
+Copyright (c) 2012 Jeremy Long. All Rights Reserved.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed by
+Joda.org (http://www.joda.org/).
+
+This product includes software developed by
+Jquery.com (http://jquery.com/).
\ No newline at end of file
diff --git a/README b/README.txt
similarity index 57%
rename from README
rename to README.txt
index f59347e83..b4dc2e4ea 100644
--- a/README
+++ b/README.txt
@@ -1,6 +1,7 @@
 About:
-DependencyCheck is a simple utility that attempts to determine if there is a 
-Common Product Enumeration (CPE) identifier for a given project dependency. 
+DependencyCheck is a simple utility that attempts to detect publically disclosed
+vulnerabilities contained within project dependencies. It does this by determining
+if there is a Common Product Enumeration (CPE) identifier for a given dependency. 
 If found, it will generate a report linking to the associated CVE entries.
 
 Usage:
@@ -10,11 +11,6 @@ $ java -jar dependencycheck-0.1.jar -h
 $ java -jar DependencyCheck-0.1.jar -a Testing -out . -scan ./test-classes/org.mortbay.jetty.jar -scan struts2-core-2.1.2.jar -scan ./lib
 
 
-TODO: 
-Add CVE download/indexing and CPE lookup.
-Finish report generation (xml).
-Consider utilizing the OSVDB in addition to CPE/CVE.
-
 Author: Jeremy Long (jeremy.long@gmail.com)
 
 Copyright (c) 2012 Jeremy Long. All Rights Reserved.
diff --git a/pom.xml b/pom.xml
index 3fbaadb3b..f600c1195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,7 +270,7 @@ along with DependencyCheck.  If not, see <http://www.gnu.org/licenses/>.
                             <version>2.9.1</version>
                             <configuration>
                                 <enableRulesSummary>false</enableRulesSummary>
-                                <configLocation>checkstyle-checks.xml</configLocation>
+                                <configLocation>src/main/config/checkstyle-checks.xml</configLocation>
                             </configuration>
                         </plugin>
                     </reportPlugins>
diff --git a/checkstyle-checks.xml b/src/main/config/checkstyle-checks.xml
similarity index 97%
rename from checkstyle-checks.xml
rename to src/main/config/checkstyle-checks.xml
index 7f0131d20..2145400c8 100644
--- a/checkstyle-checks.xml
+++ b/src/main/config/checkstyle-checks.xml
@@ -41,7 +41,7 @@ under the License.
     </module-->
     
     <module name="SuppressionFilter">
-        <property name="file" value="checkstyle-suppressions.xml"/>
+        <property name="file" value="src/main/config/checkstyle-suppressions.xml"/>
     </module>
 
     <!-- Checks that property files contain the same keys.         -->
@@ -53,7 +53,7 @@ under the License.
     <!-- Checks for Headers                              -->
     <!-- See http://checkstyle.sf.net/config_header.html -->
     <module name="RegexpHeader">
-      <property name="headerFile" value="checkstyle-header.txt"/>
+      <property name="headerFile" value="src/main/config/checkstyle-header.txt"/>
     </module>
     
     <module name="FileTabCharacter">
diff --git a/checkstyle-header.txt b/src/main/config/checkstyle-header.txt
similarity index 100%
rename from checkstyle-header.txt
rename to src/main/config/checkstyle-header.txt
diff --git a/checkstyle-suppressions.xml b/src/main/config/checkstyle-suppressions.xml
similarity index 100%
rename from checkstyle-suppressions.xml
rename to src/main/config/checkstyle-suppressions.xml