diff --git a/.gitignore b/.gitignore
index f9e44cec3..b4d2c1439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,9 @@ config/production.yml
 config/federated.yml
 config/staging.yml
 config/testing.yml
+service/config/production.yml
+service/config/federated.yml
+service/config/staging.yml
+service/config/testing.yml
 .opsmanage
 put.sh
diff --git a/assembly.xml b/service/assembly.xml
similarity index 90%
rename from assembly.xml
rename to service/assembly.xml
index e8684bc92..10259538c 100644
--- a/assembly.xml
+++ b/service/assembly.xml
@@ -18,7 +18,7 @@
             <directory>${project.build.directory}</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
-                <include>${project.name}-${project.version}.jar</include>
+                <include>${parent.artifactId}-${TextSecureServer.version}.jar</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/config/sample.yml b/service/config/sample.yml
similarity index 100%
rename from config/sample.yml
rename to service/config/sample.yml
diff --git a/service/pom.xml b/service/pom.xml
index 8ff3c60dd..c7d77330f 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -183,6 +183,7 @@
 
 
     <build>
+        <finalName>${parent.artifactId}-${TextSecureServer.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -218,6 +219,26 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>