diff --git a/pom.xml b/pom.xml
index a77755b..39c11f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,19 +84,54 @@
                         <encoding>UTF-8</encoding>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <serverId>ossrh</serverId>
-                        <nexusUrl>https://aws.oss.sonatype.org</nexusUrl>
-                        <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <!--
+                            TODO-RS: Java 8 is more strict about some javadoc tags.
+                            We'll need to update quite a few to remove this workaround.
+                            -->
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://aws.oss.sonatype.org</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
diff --git a/src/main/java/com/amazonaws/payloadoffloading/CountingOutputStream.java b/src/main/java/software/amazon/payloadoffloading/CountingOutputStream.java
similarity index 94%
rename from src/main/java/com/amazonaws/payloadoffloading/CountingOutputStream.java
rename to src/main/java/software/amazon/payloadoffloading/CountingOutputStream.java
index c7c3309..9dd7f6b 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/CountingOutputStream.java
+++ b/src/main/java/software/amazon/payloadoffloading/CountingOutputStream.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import java.io.OutputStream;
 
diff --git a/src/main/java/com/amazonaws/payloadoffloading/JsonDataConverter.java b/src/main/java/software/amazon/payloadoffloading/JsonDataConverter.java
similarity index 96%
rename from src/main/java/com/amazonaws/payloadoffloading/JsonDataConverter.java
rename to src/main/java/software/amazon/payloadoffloading/JsonDataConverter.java
index 6b64f33..d0a6872 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/JsonDataConverter.java
+++ b/src/main/java/software/amazon/payloadoffloading/JsonDataConverter.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/src/main/java/com/amazonaws/payloadoffloading/PayloadS3Pointer.java b/src/main/java/software/amazon/payloadoffloading/PayloadS3Pointer.java
similarity index 97%
rename from src/main/java/com/amazonaws/payloadoffloading/PayloadS3Pointer.java
rename to src/main/java/software/amazon/payloadoffloading/PayloadS3Pointer.java
index 6f23c8b..31f564a 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/PayloadS3Pointer.java
+++ b/src/main/java/software/amazon/payloadoffloading/PayloadS3Pointer.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.AmazonClientException;
 import org.apache.commons.logging.Log;
diff --git a/src/main/java/com/amazonaws/payloadoffloading/PayloadStorageConfiguration.java b/src/main/java/software/amazon/payloadoffloading/PayloadStorageConfiguration.java
similarity index 99%
rename from src/main/java/com/amazonaws/payloadoffloading/PayloadStorageConfiguration.java
rename to src/main/java/software/amazon/payloadoffloading/PayloadStorageConfiguration.java
index 871eb0a..f1cf7c2 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/PayloadStorageConfiguration.java
+++ b/src/main/java/software/amazon/payloadoffloading/PayloadStorageConfiguration.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.annotation.NotThreadSafe;
diff --git a/src/main/java/com/amazonaws/payloadoffloading/PayloadStore.java b/src/main/java/software/amazon/payloadoffloading/PayloadStore.java
similarity index 98%
rename from src/main/java/com/amazonaws/payloadoffloading/PayloadStore.java
rename to src/main/java/software/amazon/payloadoffloading/PayloadStore.java
index 63f5596..a47d526 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/PayloadStore.java
+++ b/src/main/java/software/amazon/payloadoffloading/PayloadStore.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
diff --git a/src/main/java/com/amazonaws/payloadoffloading/S3BackedPayloadStore.java b/src/main/java/software/amazon/payloadoffloading/S3BackedPayloadStore.java
similarity index 98%
rename from src/main/java/com/amazonaws/payloadoffloading/S3BackedPayloadStore.java
rename to src/main/java/software/amazon/payloadoffloading/S3BackedPayloadStore.java
index f9fbf59..7fe7965 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/S3BackedPayloadStore.java
+++ b/src/main/java/software/amazon/payloadoffloading/S3BackedPayloadStore.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
 import org.apache.commons.logging.Log;
diff --git a/src/main/java/com/amazonaws/payloadoffloading/S3Dao.java b/src/main/java/software/amazon/payloadoffloading/S3Dao.java
similarity index 99%
rename from src/main/java/com/amazonaws/payloadoffloading/S3Dao.java
rename to src/main/java/software/amazon/payloadoffloading/S3Dao.java
index 9aaa56f..a4c5c07 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/S3Dao.java
+++ b/src/main/java/software/amazon/payloadoffloading/S3Dao.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
diff --git a/src/main/java/com/amazonaws/payloadoffloading/Util.java b/src/main/java/software/amazon/payloadoffloading/Util.java
similarity index 96%
rename from src/main/java/com/amazonaws/payloadoffloading/Util.java
rename to src/main/java/software/amazon/payloadoffloading/Util.java
index 4d6674f..5e18fdc 100644
--- a/src/main/java/com/amazonaws/payloadoffloading/Util.java
+++ b/src/main/java/software/amazon/payloadoffloading/Util.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.util.VersionInfoUtils;
diff --git a/src/test/java/com/amazonaws/payloadoffloading/PayloadStorageConfigurationTest.java b/src/test/java/software/amazon/payloadoffloading/PayloadStorageConfigurationTest.java
similarity index 98%
rename from src/test/java/com/amazonaws/payloadoffloading/PayloadStorageConfigurationTest.java
rename to src/test/java/software/amazon/payloadoffloading/PayloadStorageConfigurationTest.java
index 09d7ab4..2c51438 100644
--- a/src/test/java/com/amazonaws/payloadoffloading/PayloadStorageConfigurationTest.java
+++ b/src/test/java/software/amazon/payloadoffloading/PayloadStorageConfigurationTest.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
diff --git a/src/test/java/com/amazonaws/payloadoffloading/S3BackedPayloadStoreTest.java b/src/test/java/software/amazon/payloadoffloading/S3BackedPayloadStoreTest.java
similarity index 99%
rename from src/test/java/com/amazonaws/payloadoffloading/S3BackedPayloadStoreTest.java
rename to src/test/java/software/amazon/payloadoffloading/S3BackedPayloadStoreTest.java
index 5dbe66f..f6bf2dc 100644
--- a/src/test/java/com/amazonaws/payloadoffloading/S3BackedPayloadStoreTest.java
+++ b/src/test/java/software/amazon/payloadoffloading/S3BackedPayloadStoreTest.java
@@ -1,4 +1,4 @@
-package com.amazonaws.payloadoffloading;
+package software.amazon.payloadoffloading;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;