diff --git a/pom.xml b/pom.xml
index e3ce627..48d6bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
     <groupId>org.nhind</groupId>    
     <modelVersion>4.0.0</modelVersion>
     <artifactId>direct-common-audit</artifactId>    
-    <name>Direct Project additional auditing implementations</name>
-    <version>6.0-SNAPSHOT</version>
-    <description>Direct Project additional implementation for auditing interface</description>
+    <name>Direct Project auditing interfaces and implementations</name>
+    <version>6.0</version>
+    <description>Direct Project auditing interfaces and implementations</description>
     <inceptionYear>2010</inceptionYear>
     <url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common-audit/${project.version}</url> 
     <developers>
@@ -26,8 +26,8 @@
         <maven>3.0.0</maven>
    </prerequisites>   
   <scm>
-     <url>http://code.google.com/p/nhin-d/source/browse/#hg/java/direct-common-audit</url>  
-     <connection>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/direct-common-audit</connection>
+     <url>scm:git:https://github.com/DirectProjectJavaRI/direct-common-audit.git</url>  
+     <connection>scm:git:https://github.com/DirectProjectJavaRI/direct-common-audit.git</connection>
   </scm> 
   <licenses>
      <license>
@@ -173,26 +173,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>    
-        <plugin>
-            <groupId>com.atlassian.maven.plugins</groupId>
-            <artifactId>maven-clover2-plugin</artifactId>
-            <version>3.1.0</version>
-            <configuration>
-                <jdk>1.8</jdk>
-			<licenseLocation>
-				${project.basedir}/../licenses/clover.license
-			</licenseLocation>
-            </configuration>
-            <executions>
-                <execution>
-                    <phase>pre-site</phase>
-                    <goals>
-                        <goal>instrument</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>	    
+      </plugin>    	    
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
@@ -213,30 +194,31 @@
          </execution>
        </executions>
      </plugin>   
-         <!--  for releases only
-	     <plugin>
-	      	<groupId>org.apache.maven.plugins</groupId> 
-	        <artifactId>maven-javadoc-plugin</artifactId>
-	        <version>2.6.1</version>
-	        <configuration>
-	          <charset>UTF-8</charset>
-	          <docencoding>UTF-8</docencoding>
-	          <docfilessubdirs>true</docfilessubdirs>
-              <detectJavaApiLink>true</detectJavaApiLink>
-              <detectLinks>true</detectLinks>
-	          <source>1.6</source>
-	          <show>public</show>    	                      	          
-	        </configuration>
-	        <executions>
-	            <execution>
-	                <phase>package</phase>
-	                <id>attach-javadocs</id>
-	                <goals>
-	                  <goal>jar</goal>
-	                </goals>
-	            </execution>
-	        </executions>		        
-	     </plugin>  
+     <plugin>
+     	<groupId>org.apache.maven.plugins</groupId> 
+       	<artifactId>maven-javadoc-plugin</artifactId>
+       	<version>2.6.1</version>
+	       	<configuration>
+		    <additionalparam>-Xdoclint:none</additionalparam>
+			<charset>UTF-8</charset>
+			<docencoding>UTF-8</docencoding>
+			<docfilessubdirs>true</docfilessubdirs>
+			<detectJavaApiLink>true</detectJavaApiLink>
+			<detectLinks>true</detectLinks>
+			<source>1.8</source>
+			<show>public</show> 	                      	          
+        </configuration>
+        <executions>
+            <execution>
+                <phase>package</phase>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+            </execution>
+        </executions>		        
+     </plugin>  
+         <!--  for releases only	     
 	     <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-gpg-plugin</artifactId>
@@ -263,15 +245,16 @@
 	      <plugin>
 	      	<groupId>org.apache.maven.plugins</groupId> 
 	        <artifactId>maven-javadoc-plugin</artifactId>
-			<version>3.0.1</version>
+			<version>2.6.1</version>
 	        <configuration>
-	          <charset>UTF-8</charset>
-	          <docencoding>UTF-8</docencoding>
-	          <docfilessubdirs>true</docfilessubdirs>
-              <detectJavaApiLink>true</detectJavaApiLink>
-              <detectLinks>true</detectLinks>
-	          <source>1.8</source>
-	          <show>public</show>         	           	          
+			    <additionalparam>-Xdoclint:none</additionalparam>
+				<charset>UTF-8</charset>
+				<docencoding>UTF-8</docencoding>
+				<docfilessubdirs>true</docfilessubdirs>
+				<detectJavaApiLink>true</detectJavaApiLink>
+				<detectLinks>true</detectLinks>
+				<source>1.8</source>
+				<show>public</show>      	           	          
 	        </configuration>
 	      </plugin>
 			<plugin>
@@ -292,7 +275,7 @@
 	        <plugin>
 	            <groupId>org.codehaus.mojo</groupId> 
 	            <artifactId>findbugs-maven-plugin</artifactId>
-	            <version>2.3</version> 
+	            <version>2.3.2</version> 
 	            <configuration>
 	                <effort>Max</effort>
 	                <excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
@@ -309,17 +292,7 @@
 	                    <tag>@deprecated</tag>
 	                </tags>
 	            </configuration>
-	        </plugin>	
-			<plugin>
-	            <groupId>com.atlassian.maven.plugins</groupId>
-	            <artifactId>maven-clover2-plugin</artifactId>
-	            <version>3.1.0</version>
-				<configuration>
-					<licenseLocation>
-						${project.basedir}/../licenses/clover.license
-					</licenseLocation>
-				</configuration>
-			</plugin>	                   
+	        </plugin>	                   
 		</plugins>
   </reporting>
   <distributionManagement>
diff --git a/src/main/java/org/nhindirect/common/audit/impl/package-info.java b/src/main/java/org/nhindirect/common/audit/impl/package-info.java
index 0fe82f9..832b900 100644
--- a/src/main/java/org/nhindirect/common/audit/impl/package-info.java
+++ b/src/main/java/org/nhindirect/common/audit/impl/package-info.java
@@ -20,7 +20,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 */
 
 /**
- * Database backed auditing implementation
+ * Multiple auditing implementations.  This includes file, logging, and database backed implementations.
  */
 
 package org.nhindirect.common.audit.impl;
\ No newline at end of file
diff --git a/src/main/java/org/nhindirect/common/audit/package-info.java b/src/main/java/org/nhindirect/common/audit/package-info.java
index 81cc492..36c7534 100644
--- a/src/main/java/org/nhindirect/common/audit/package-info.java
+++ b/src/main/java/org/nhindirect/common/audit/package-info.java
@@ -1,3 +1,24 @@
+/* 
+Copyright (c) 2010, NHIN Direct Project
+All rights reserved.
+
+Authors:
+   Greg Meyer      gm2552@cerner.com
+ 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer 
+in the documentation and/or other materials provided with the distribution.  Neither the name of the The NHIN Direct Project (nhindirect.org). 
+nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS 
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 /**
  * Direct project auditing API.  Auditors should be obtained using one of the three methods in the {@link AuditorFactory} class.
  */
diff --git a/src/site/apt/releaseNotes.apt b/src/site/apt/releaseNotes.apt
index bbf467b..41d1719 100644
--- a/src/site/apt/releaseNotes.apt
+++ b/src/site/apt/releaseNotes.apt
@@ -6,6 +6,28 @@
         Greg Meyer
         ---
 
+{6.0}
+
+    Changes included with release 6.0
+    
+    []
+    
+    Enhancements
+    
+ 	* Requires Java 8
+ 	
+ 	* Incorporation/Upgrade to Spring 5 and SpringBoot 2.1
+    
+    * Removal of Google Guice IoC framework
+    
+    * Refactored auditing base classes and interfaces to be move from direct-common to this library.
+
+    [] 
+     
+    Bug Fixes
+
+    * NA
+
 {1.0}
 
     Changes included with release 1.0