diff --git a/distribution/pom.xml b/distribution/pom.xml
index d043fdf57..8f7efb558 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
-    <name>Alfresco Content Services Community Full Distribution zip</name>
+    <artifactId>alfresco-content-services-community-distribution</artifactId>
+    <name>Alfresco Content Services Community Distribution zip</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -12,18 +12,50 @@
     </parent>
 
     <dependencies>
+        <!-- WAR files -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-community-distribution</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-data-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-server-root</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-mmt</artifactId>
+        </dependency>
+        <!-- 3rd party libs -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependency.postgresql.version}</version>
+        </dependency>
+        <!-- Alfresco Pdf Renderer -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>linux</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>win64</classifier>
+            <type>tgz</type>
+        </dependency>
+        <!-- SOLR Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-solr4-distribution</artifactId>
@@ -35,6 +67,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- SHARE Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-content-services-share-distribution</artifactId>
@@ -49,7 +82,7 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${installer.version.name}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -68,11 +101,13 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+                                <!-- Extract keystore from alfresco-repository -->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
-                                    <type>zip</type>
+                                    <artifactId>alfresco-repository</artifactId>
+                                    <includes>alfresco/keystore/**</includes>
                                 </artifactItem>
+
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr4-distribution</artifactId>
@@ -87,6 +122,43 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>extract-jlan-dll</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-jlan-embed</artifactId>
+                                    <classifier>windll</classifier>
+                                    <includes>*.dll</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+
+                    <!-- Copy ROOT.war -->
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-server-root</artifactId>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
+                                    <destFileName>ROOT.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -102,7 +174,7 @@
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/assembly/full-distribution.xml</descriptor>
+                                <descriptor>src/assembly/distribution.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
diff --git a/zip/src/assemblies/distribution.xml b/distribution/src/assembly/distribution.xml
similarity index 73%
rename from zip/src/assemblies/distribution.xml
rename to distribution/src/assembly/distribution.xml
index 7c12fe293..e7958fc8e 100644
--- a/zip/src/assemblies/distribution.xml
+++ b/distribution/src/assembly/distribution.xml
@@ -1,6 +1,8 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>warinstallation</id>
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>distribution</id>
+
+
     <formats>
         <format>zip</format>
     </formats>
@@ -29,14 +31,37 @@
                 <include>*.dll</include>
             </includes>
         </fileSet>
-        <!-- Empty endorsed folder -->
+
+        <!-- Solr4 Distribution -->
         <fileSet>
-            <directory>src/assembly</directory>
-            <outputDirectory>web-server/endorsed</outputDirectory>
+            <directory>${project.build.directory}/dependency/solr4</directory>
+            <outputDirectory>solr4</outputDirectory>
             <excludes>
-                <exclude>*</exclude>
+                <exclude>solr4.war</exclude>
             </excludes>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/solr4</directory>
+            <outputDirectory>web-server/webapps</outputDirectory>
+            <includes>
+                <include>solr4.war</include>
+            </includes>
+        </fileSet>
+
+        <!-- Share -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
+            <outputDirectory/>
+            <includes>
+                <include>web-server/**</include>
+                <include>modules/**</include>
+                <include>amps/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <dependencySets>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
deleted file mode 100644
index 3aeb874f7..000000000
--- a/distribution/src/assembly/full-distribution.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>distribution</id>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Local resources: README, etc. -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <!-- Platform Community Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${project.version}</directory>
-            <outputDirectory/>
-        </fileSet>
-
-        <!-- Solr4 Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>solr4</outputDirectory>
-            <excludes>
-                <exclude>solr4.war</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>web-server/webapps</outputDirectory>
-            <includes>
-                <include>solr4.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Share -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
-            <outputDirectory/>
-            <includes>
-                <include>web-server/**</include>
-		<include>modules/**</include>
-		<include>amps/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
-            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/zip/src/main/resources/bin/apply_amps.bat b/distribution/src/main/resources/bin/apply_amps.bat
similarity index 100%
rename from zip/src/main/resources/bin/apply_amps.bat
rename to distribution/src/main/resources/bin/apply_amps.bat
diff --git a/zip/src/main/resources/bin/apply_amps.sh b/distribution/src/main/resources/bin/apply_amps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from zip/src/main/resources/bin/apply_amps.sh
rename to distribution/src/main/resources/bin/apply_amps.sh
diff --git a/zip/src/main/resources/bin/clean_tomcat.bat b/distribution/src/main/resources/bin/clean_tomcat.bat
similarity index 100%
rename from zip/src/main/resources/bin/clean_tomcat.bat
rename to distribution/src/main/resources/bin/clean_tomcat.bat
diff --git a/zip/src/main/resources/bin/clean_tomcat.sh b/distribution/src/main/resources/bin/clean_tomcat.sh
old mode 100755
new mode 100644
similarity index 100%
rename from zip/src/main/resources/bin/clean_tomcat.sh
rename to distribution/src/main/resources/bin/clean_tomcat.sh
diff --git a/zip/src/main/resources/licenses/3rd-party/Apache 2.0.txt b/distribution/src/main/resources/licenses/3rd-party/Apache 2.0.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Apache 2.0.txt
rename to distribution/src/main/resources/licenses/3rd-party/Apache 2.0.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt b/distribution/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
rename to distribution/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt b/distribution/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
rename to distribution/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt b/distribution/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
rename to distribution/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt b/distribution/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
rename to distribution/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt b/distribution/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
rename to distribution/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt b/distribution/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
rename to distribution/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt b/distribution/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
rename to distribution/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/CDDL-1.0.txt b/distribution/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
rename to distribution/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/CDDL-1.1.txt b/distribution/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
rename to distribution/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/CPL 1.0.txt b/distribution/src/main/resources/licenses/3rd-party/CPL 1.0.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/CPL 1.0.txt
rename to distribution/src/main/resources/licenses/3rd-party/CPL 1.0.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Eclipse Public License.txt b/distribution/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
rename to distribution/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/ICU License.txt b/distribution/src/main/resources/licenses/3rd-party/ICU License.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/ICU License.txt
rename to distribution/src/main/resources/licenses/3rd-party/ICU License.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt b/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
similarity index 99%
rename from zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
rename to distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
index 1f4c6c89d..fac88bf9e 100644
--- a/zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
+++ b/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
@@ -107,4 +107,4 @@ To apply the ImageMagick License to your work, attach the following boilerplate
    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
    License for the specific language governing permissions and limitations
-   under the License.
+   under the License.
\ No newline at end of file
diff --git a/zip/src/main/resources/licenses/3rd-party/JSON.txt b/distribution/src/main/resources/licenses/3rd-party/JSON.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/JSON.txt
rename to distribution/src/main/resources/licenses/3rd-party/JSON.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/LGPL 2.1.txt b/distribution/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
rename to distribution/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/LGPL 3.txt b/distribution/src/main/resources/licenses/3rd-party/LGPL 3.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/LGPL 3.txt
rename to distribution/src/main/resources/licenses/3rd-party/LGPL 3.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/LGPL-2.0.txt b/distribution/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
rename to distribution/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-jquery.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-jquery.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-jquery.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-jquery.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-jutf7.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MIT-slf4j.txt b/distribution/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
rename to distribution/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MPL-1.1.txt b/distribution/src/main/resources/licenses/3rd-party/MPL-1.1.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MPL-1.1.txt
rename to distribution/src/main/resources/licenses/3rd-party/MPL-1.1.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/MPL-2.0.txt b/distribution/src/main/resources/licenses/3rd-party/MPL-2.0.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/MPL-2.0.txt
rename to distribution/src/main/resources/licenses/3rd-party/MPL-2.0.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt b/distribution/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
rename to distribution/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Sun Public License.txt b/distribution/src/main/resources/licenses/3rd-party/Sun Public License.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Sun Public License.txt
rename to distribution/src/main/resources/licenses/3rd-party/Sun Public License.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt b/distribution/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
rename to distribution/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt b/distribution/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
rename to distribution/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/Unidata Free Software.txt b/distribution/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
rename to distribution/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/bouncycastle-license.txt b/distribution/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
rename to distribution/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/gpl-2.0.txt b/distribution/src/main/resources/licenses/3rd-party/gpl-2.0.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/gpl-2.0.txt
rename to distribution/src/main/resources/licenses/3rd-party/gpl-2.0.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/libreoffice.txt b/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/libreoffice.txt
rename to distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/openssl.txt b/distribution/src/main/resources/licenses/3rd-party/openssl.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/openssl.txt
rename to distribution/src/main/resources/licenses/3rd-party/openssl.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/pdfium.txt b/distribution/src/main/resources/licenses/3rd-party/pdfium.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/pdfium.txt
rename to distribution/src/main/resources/licenses/3rd-party/pdfium.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/tomcat.txt b/distribution/src/main/resources/licenses/3rd-party/tomcat.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/tomcat.txt
rename to distribution/src/main/resources/licenses/3rd-party/tomcat.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/xpdf-japanese.txt b/distribution/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
rename to distribution/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
diff --git a/zip/src/main/resources/licenses/3rd-party/zlib.txt b/distribution/src/main/resources/licenses/3rd-party/zlib.txt
similarity index 100%
rename from zip/src/main/resources/licenses/3rd-party/zlib.txt
rename to distribution/src/main/resources/licenses/3rd-party/zlib.txt
diff --git a/zip/src/main/resources/licenses/license.txt b/distribution/src/main/resources/licenses/license.txt
similarity index 100%
rename from zip/src/main/resources/licenses/license.txt
rename to distribution/src/main/resources/licenses/license.txt
diff --git a/zip/src/main/resources/licenses/notice.txt b/distribution/src/main/resources/licenses/notice.txt
similarity index 100%
rename from zip/src/main/resources/licenses/notice.txt
rename to distribution/src/main/resources/licenses/notice.txt
diff --git a/zip/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml b/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
similarity index 100%
rename from zip/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
rename to distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
diff --git a/pom.xml b/pom.xml
index a33e13165..a3c8d0b4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
             </activation>
             <modules>
                 <module>war</module>
-                <module>zip</module>
                 <module>distribution</module>
                 <module>public-javadoc</module>
                 <module>docker-alfresco</module>
diff --git a/zip/pom.xml b/zip/pom.xml
deleted file mode 100644
index 8e8357793..000000000
--- a/zip/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-community-distribution</artifactId>
-    <name>Alfresco Content Services Community zip (WAR Installation)</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <!-- WAR files -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-repository</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-data-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-mmt</artifactId>
-        </dependency>
-        <!-- 3rd party libs -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${dependency.postgresql.version}</version>
-        </dependency>
-        <!-- Alfresco Pdf Renderer -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>linux</classifier>
-            <type>tgz</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>win64</classifier>
-            <type>tgz</type>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <!-- Filtering is required to make maven substitute variables in resources -->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <!-- Extract keystore from alfresco-repository -->
-                    <execution>
-                        <id>extract-keystore</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-repository</artifactId>
-                                    <includes>alfresco/keystore/**</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                    <!-- Extract JLAN DLLs -->
-                    <execution>
-                        <id>extract-jlan-dll</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-jlan-embed</artifactId>
-                                    <classifier>windll</classifier>
-                                    <includes>*.dll</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                    <!-- Copy ROOT.war -->
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-server-root</artifactId>
-                                    <type>war</type>
-                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
-                                    <destFileName>ROOT.war</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/assemblies/distribution.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/zip/src/main/resources/README.txt b/zip/src/main/resources/README.txt
deleted file mode 100644
index 5eb415d32..000000000
--- a/zip/src/main/resources/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Alfresco Content Services Community ${project.version}
-======================
-
-For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm.
-
-