diff --git a/.gitattributes b/packaging/.gitattributes
similarity index 100%
rename from .gitattributes
rename to packaging/.gitattributes
diff --git a/.gitbugtraq b/packaging/.gitbugtraq
similarity index 100%
rename from .gitbugtraq
rename to packaging/.gitbugtraq
diff --git a/.gitignore b/packaging/.gitignore
similarity index 100%
rename from .gitignore
rename to packaging/.gitignore
diff --git a/.travis.settings.xml b/packaging/.travis.settings.xml
similarity index 100%
rename from .travis.settings.xml
rename to packaging/.travis.settings.xml
diff --git a/.travis.yml b/packaging/.travis.yml
similarity index 100%
rename from .travis.yml
rename to packaging/.travis.yml
diff --git a/.whitesource b/packaging/.whitesource
similarity index 100%
rename from .whitesource
rename to packaging/.whitesource
diff --git a/.wss-unified-agent.config b/packaging/.wss-unified-agent.config
similarity index 100%
rename from .wss-unified-agent.config
rename to packaging/.wss-unified-agent.config
diff --git a/CHANGELOG.md b/packaging/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to packaging/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/packaging/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to packaging/CONTRIBUTING.md
diff --git a/LICENSE b/packaging/LICENSE
similarity index 100%
rename from LICENSE
rename to packaging/LICENSE
diff --git a/README.md b/packaging/README.md
similarity index 100%
rename from README.md
rename to packaging/README.md
diff --git a/distribution/pom.xml b/packaging/distribution/pom.xml
similarity index 100%
rename from distribution/pom.xml
rename to packaging/distribution/pom.xml
diff --git a/distribution/src/assembly/distribution.xml b/packaging/distribution/src/assembly/distribution.xml
similarity index 100%
rename from distribution/src/assembly/distribution.xml
rename to packaging/distribution/src/assembly/distribution.xml
diff --git a/distribution/src/main/resources/README.txt b/packaging/distribution/src/main/resources/README.txt
similarity index 100%
rename from distribution/src/main/resources/README.txt
rename to packaging/distribution/src/main/resources/README.txt
diff --git a/distribution/src/main/resources/bin/apply_amps.bat b/packaging/distribution/src/main/resources/bin/apply_amps.bat
similarity index 100%
rename from distribution/src/main/resources/bin/apply_amps.bat
rename to packaging/distribution/src/main/resources/bin/apply_amps.bat
diff --git a/distribution/src/main/resources/bin/apply_amps.sh b/packaging/distribution/src/main/resources/bin/apply_amps.sh
similarity index 100%
rename from distribution/src/main/resources/bin/apply_amps.sh
rename to packaging/distribution/src/main/resources/bin/apply_amps.sh
diff --git a/distribution/src/main/resources/bin/clean_tomcat.bat b/packaging/distribution/src/main/resources/bin/clean_tomcat.bat
similarity index 100%
rename from distribution/src/main/resources/bin/clean_tomcat.bat
rename to packaging/distribution/src/main/resources/bin/clean_tomcat.bat
diff --git a/distribution/src/main/resources/bin/clean_tomcat.sh b/packaging/distribution/src/main/resources/bin/clean_tomcat.sh
similarity index 100%
rename from distribution/src/main/resources/bin/clean_tomcat.sh
rename to packaging/distribution/src/main/resources/bin/clean_tomcat.sh
diff --git a/distribution/src/main/resources/keystore/CreateSSLKeystores.txt b/packaging/distribution/src/main/resources/keystore/CreateSSLKeystores.txt
similarity index 100%
rename from distribution/src/main/resources/keystore/CreateSSLKeystores.txt
rename to packaging/distribution/src/main/resources/keystore/CreateSSLKeystores.txt
diff --git a/distribution/src/main/resources/keystore/generate_keystores.bat b/packaging/distribution/src/main/resources/keystore/generate_keystores.bat
similarity index 100%
rename from distribution/src/main/resources/keystore/generate_keystores.bat
rename to packaging/distribution/src/main/resources/keystore/generate_keystores.bat
diff --git a/distribution/src/main/resources/keystore/generate_keystores.sh b/packaging/distribution/src/main/resources/keystore/generate_keystores.sh
similarity index 100%
rename from distribution/src/main/resources/keystore/generate_keystores.sh
rename to packaging/distribution/src/main/resources/keystore/generate_keystores.sh
diff --git a/distribution/src/main/resources/keystore/readme.txt b/packaging/distribution/src/main/resources/keystore/readme.txt
similarity index 100%
rename from distribution/src/main/resources/keystore/readme.txt
rename to packaging/distribution/src/main/resources/keystore/readme.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Apache 2.0.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Apache 2.0.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Apache 2.0.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Apache 2.0.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Apache-like-JDOM.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Apache-like-XPP.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/ApachePortableRuntime.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BEA-JSR181-WebServicesMetadata.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-ASM.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-AntLR.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-Dojo.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeMarker.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-FreeType.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-GIFLIB.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-Hamcrest.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-JGraph.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-Jaxen.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-JiBX.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-PostgreSQL.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-XMP.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-XStream.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-YUI.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-bubblinglibrary.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-dom4j.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-libjpeg.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-libpng.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-libtiff.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-staxutils.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-urlrewritefilter.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/BSDlike-yuicompressor.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/CC-BY-2.5-LightboxJS.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/CC-BY-3.0-jsTextReader.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/CDDL-1.0.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/CDDL-1.0.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/CDDL-1.1.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/CDDL-1.1.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/CPL 1.0.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/CPL 1.0.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/CPL 1.0.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/CPL 1.0.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Eclipse Public License.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Eclipse Public License.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/ICU License.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/ICU License.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/ICU License.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/ICU License.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/JSON.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/JSON.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/JSON.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/JSON.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/LGPL 2.1.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/LGPL 2.1.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/LGPL 3.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/LGPL 3.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/LGPL 3.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/LGPL 3.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/LGPL-2.0.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/LGPL-2.0.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-CodeMirror.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-DateFormatJS.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-EnumJS.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-FullCalendar.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-extMouseWheel.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-jquery.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-jquery.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-jquery.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-jquery.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-jqueryui.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-jutf7.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-jutf7.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MIT-slf4j.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MIT-slf4j.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MPL-1.1.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MPL-1.1.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MPL-1.1.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MPL-1.1.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/MPL-2.0.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/MPL-2.0.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/MPL-2.0.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/MPL-2.0.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/OracleBinaryCode-Java.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Sun Public License.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Sun Public License.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Sun Public License.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Sun Public License.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Sun-JSR250-CommonsAnnotations.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Sun-JSR907-TransactionAPI.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/Unidata Free Software.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/Unidata Free Software.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/bouncycastle-license.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/bouncycastle-license.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/gpl-2.0.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/gpl-2.0.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/gpl-2.0.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/gpl-2.0.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/openssl.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/openssl.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/openssl.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/openssl.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/pdfium.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/pdfium.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/pdfium.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/pdfium.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/tomcat.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/tomcat.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/tomcat.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/tomcat.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/xpdf-japanese.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/xpdf-japanese.txt
diff --git a/distribution/src/main/resources/licenses/3rd-party/zlib.txt b/packaging/distribution/src/main/resources/licenses/3rd-party/zlib.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/3rd-party/zlib.txt
rename to packaging/distribution/src/main/resources/licenses/3rd-party/zlib.txt
diff --git a/distribution/src/main/resources/licenses/license.txt b/packaging/distribution/src/main/resources/licenses/license.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/license.txt
rename to packaging/distribution/src/main/resources/licenses/license.txt
diff --git a/distribution/src/main/resources/licenses/notice.txt b/packaging/distribution/src/main/resources/licenses/notice.txt
similarity index 100%
rename from distribution/src/main/resources/licenses/notice.txt
rename to packaging/distribution/src/main/resources/licenses/notice.txt
diff --git a/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml b/packaging/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
similarity index 100%
rename from distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
rename to packaging/distribution/src/main/resources/web-server/conf/Catalina/localhost/alfresco.xml
diff --git a/docker-alfresco/.maven-dockerignore b/packaging/docker-alfresco/.maven-dockerignore
similarity index 100%
rename from docker-alfresco/.maven-dockerignore
rename to packaging/docker-alfresco/.maven-dockerignore
diff --git a/docker-alfresco/Dockerfile b/packaging/docker-alfresco/Dockerfile
similarity index 100%
rename from docker-alfresco/Dockerfile
rename to packaging/docker-alfresco/Dockerfile
diff --git a/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
similarity index 100%
rename from docker-alfresco/pom.xml
rename to packaging/docker-alfresco/pom.xml
diff --git a/l10n.properties b/packaging/l10n.properties
similarity index 100%
rename from l10n.properties
rename to packaging/l10n.properties
diff --git a/pom.xml b/packaging/pom.xml
similarity index 100%
rename from pom.xml
rename to packaging/pom.xml
diff --git a/public-javadoc/pom.xml b/packaging/public-javadoc/pom.xml
similarity index 100%
rename from public-javadoc/pom.xml
rename to packaging/public-javadoc/pom.xml
diff --git a/scripts/travis/copy_to_release_bucket.sh b/packaging/scripts/travis/copy_to_release_bucket.sh
similarity index 100%
rename from scripts/travis/copy_to_release_bucket.sh
rename to packaging/scripts/travis/copy_to_release_bucket.sh
diff --git a/scripts/travis/maven_release.sh b/packaging/scripts/travis/maven_release.sh
similarity index 100%
rename from scripts/travis/maven_release.sh
rename to packaging/scripts/travis/maven_release.sh
diff --git a/scripts/travis/verify_release_tag.sh b/packaging/scripts/travis/verify_release_tag.sh
similarity index 100%
rename from scripts/travis/verify_release_tag.sh
rename to packaging/scripts/travis/verify_release_tag.sh
diff --git a/tests/environment/.env b/packaging/tests/environment/.env
similarity index 100%
rename from tests/environment/.env
rename to packaging/tests/environment/.env
diff --git a/tests/environment/docker-compose-minimal+transforms.yml b/packaging/tests/environment/docker-compose-minimal+transforms.yml
similarity index 100%
rename from tests/environment/docker-compose-minimal+transforms.yml
rename to packaging/tests/environment/docker-compose-minimal+transforms.yml
diff --git a/tests/environment/docker-compose-minimal.yml b/packaging/tests/environment/docker-compose-minimal.yml
similarity index 100%
rename from tests/environment/docker-compose-minimal.yml
rename to packaging/tests/environment/docker-compose-minimal.yml
diff --git a/tests/pom.xml b/packaging/tests/pom.xml
similarity index 100%
rename from tests/pom.xml
rename to packaging/tests/pom.xml
diff --git a/tests/scripts/start-compose.sh b/packaging/tests/scripts/start-compose.sh
similarity index 100%
rename from tests/scripts/start-compose.sh
rename to packaging/tests/scripts/start-compose.sh
diff --git a/tests/scripts/stop-compose.sh b/packaging/tests/scripts/stop-compose.sh
similarity index 100%
rename from tests/scripts/stop-compose.sh
rename to packaging/tests/scripts/stop-compose.sh
diff --git a/tests/scripts/wait-for-alfresco-start.sh b/packaging/tests/scripts/wait-for-alfresco-start.sh
similarity index 100%
rename from tests/scripts/wait-for-alfresco-start.sh
rename to packaging/tests/scripts/wait-for-alfresco-start.sh
diff --git a/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
similarity index 100%
rename from tests/tas-cmis/pom.xml
rename to packaging/tests/tas-cmis/pom.xml
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/AclTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AclTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/AclTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AclTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/AddObjectToFolderTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AddObjectToFolderTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/AddObjectToFolderTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AddObjectToFolderTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/AllowableActionTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AllowableActionTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/AllowableActionTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AllowableActionTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/AppendContentStreamTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AppendContentStreamTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/AppendContentStreamTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/AppendContentStreamTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CancelCheckOutTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CancelCheckOutTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CancelCheckOutTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CancelCheckOutTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckInTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckInTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckInTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckInTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckOutTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckOutTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckOutTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CheckOutTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CmisTest.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CmisTest.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CmisTest.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CmisTest.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CopyTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CopyTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CopyTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CopyTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentFromSourceTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentFromSourceTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentFromSourceTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentFromSourceTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateDocumentTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateFolderTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateFolderTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateFolderTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/CreateFolderTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DataListsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteAllVersionsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteAllVersionsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteAllVersionsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteAllVersionsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteContentStreamTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteContentStreamTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteContentStreamTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteContentStreamTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTreeTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTreeTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTreeTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/DeleteTreeTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetAllVersionsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetAllVersionsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetAllVersionsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetAllVersionsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetCheckedOutDocumentsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetCheckedOutDocumentsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetCheckedOutDocumentsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetCheckedOutDocumentsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetChildrenTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetChildrenTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetChildrenTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetChildrenTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetContentStreamTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetContentStreamTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetContentStreamTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetContentStreamTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetDescendantsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetDescendantsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetDescendantsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetDescendantsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetExtensionTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetExtensionTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetExtensionTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetExtensionTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderParentTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderParentTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderParentTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderParentTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderTreeTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderTreeTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderTreeTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetFolderTreeTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectOfLatestVersionTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectOfLatestVersionTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectOfLatestVersionTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectOfLatestVersionTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectTypeTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectTypeTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectTypeTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetObjectTypeTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetParentsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetParentsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetParentsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetParentsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetPropertiesTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetPropertiesTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetPropertiesTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetPropertiesTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeChildrenTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeChildrenTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeChildrenTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeChildrenTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDefinitionTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDefinitionTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDefinitionTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDefinitionTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDescendantsTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDescendantsTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDescendantsTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/GetTypeDescendantsTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/IsLatestMajorVersionTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/IsLatestMajorVersionTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/IsLatestMajorVersionTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/IsLatestMajorVersionTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/IsPrivateWorkingCopyTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/IsPrivateWorkingCopyTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/IsPrivateWorkingCopyTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/IsPrivateWorkingCopyTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/MoveTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/MoveTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/MoveTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/MoveTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/RelationshipTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RelationshipTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/RelationshipTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RelationshipTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/RemoveObjectFromFolderTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RemoveObjectFromFolderTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/RemoveObjectFromFolderTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RemoveObjectFromFolderTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/RenameTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RenameTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/RenameTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RenameTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/RenditionTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RenditionTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/RenditionTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RenditionTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/RepositoryInfoTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RepositoryInfoTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/RepositoryInfoTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/RepositoryInfoTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/SetContentTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SetContentTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/SetContentTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SetContentTests.java
diff --git a/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java
similarity index 100%
rename from tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java
rename to packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/UpdatePropertiesTests.java
diff --git a/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml b/packaging/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml
similarity index 100%
rename from tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml
rename to packaging/tests/tas-cmis/src/test/resources/alfresco-cmis-context.xml
diff --git a/tests/tas-cmis/src/test/resources/cmis-suite.xml b/packaging/tests/tas-cmis/src/test/resources/cmis-suite.xml
similarity index 100%
rename from tests/tas-cmis/src/test/resources/cmis-suite.xml
rename to packaging/tests/tas-cmis/src/test/resources/cmis-suite.xml
diff --git a/tests/tas-cmis/src/test/resources/default.properties b/packaging/tests/tas-cmis/src/test/resources/default.properties
similarity index 100%
rename from tests/tas-cmis/src/test/resources/default.properties
rename to packaging/tests/tas-cmis/src/test/resources/default.properties
diff --git a/tests/tas-cmis/src/test/resources/log4j.properties b/packaging/tests/tas-cmis/src/test/resources/log4j.properties
similarity index 100%
rename from tests/tas-cmis/src/test/resources/log4j.properties
rename to packaging/tests/tas-cmis/src/test/resources/log4j.properties
diff --git a/tests/tas-cmis/src/test/resources/shared-resources/model/tas-model.xml b/packaging/tests/tas-cmis/src/test/resources/shared-resources/model/tas-model.xml
similarity index 100%
rename from tests/tas-cmis/src/test/resources/shared-resources/model/tas-model.xml
rename to packaging/tests/tas-cmis/src/test/resources/shared-resources/model/tas-model.xml
diff --git a/tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-checkIn.txt b/packaging/tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-checkIn.txt
similarity index 100%
rename from tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-checkIn.txt
rename to packaging/tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-checkIn.txt
diff --git a/tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-resource b/packaging/tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-resource
similarity index 100%
rename from tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-resource
rename to packaging/tests/tas-cmis/src/test/resources/shared-resources/testdata/cmis-resource
diff --git a/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
similarity index 100%
rename from tests/tas-email/pom.xml
rename to packaging/tests/tas-email/pom.xml
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/EmailTest.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/EmailTest.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/EmailTest.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/EmailTest.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapConnectionTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapConnectionTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapConnectionTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapConnectionTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveMessagesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveMessagesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveMessagesTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameFolderTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameMessagesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameMessagesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapRenameMessagesTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSearchMessagesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSearchMessagesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSearchMessagesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSearchMessagesTests.java
diff --git a/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java
similarity index 100%
rename from tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java
rename to packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java
diff --git a/tests/tas-email/src/test/resources/alfresco-email-context.xml b/packaging/tests/tas-email/src/test/resources/alfresco-email-context.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/alfresco-email-context.xml
rename to packaging/tests/tas-email/src/test/resources/alfresco-email-context.xml
diff --git a/tests/tas-email/src/test/resources/default.properties b/packaging/tests/tas-email/src/test/resources/default.properties
similarity index 100%
rename from tests/tas-email/src/test/resources/default.properties
rename to packaging/tests/tas-email/src/test/resources/default.properties
diff --git a/tests/tas-email/src/test/resources/email-suite.xml b/packaging/tests/tas-email/src/test/resources/email-suite.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/email-suite.xml
rename to packaging/tests/tas-email/src/test/resources/email-suite.xml
diff --git a/tests/tas-email/src/test/resources/log4j.properties b/packaging/tests/tas-email/src/test/resources/log4j.properties
similarity index 100%
rename from tests/tas-email/src/test/resources/log4j.properties
rename to packaging/tests/tas-email/src/test/resources/log4j.properties
diff --git a/tests/tas-email/src/test/resources/shared-resources/email-runner-suite.xml b/packaging/tests/tas-email/src/test/resources/shared-resources/email-runner-suite.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/email-runner-suite.xml
rename to packaging/tests/tas-email/src/test/resources/shared-resources/email-runner-suite.xml
diff --git a/tests/tas-email/src/test/resources/shared-resources/email-sanity-suite.xml b/packaging/tests/tas-email/src/test/resources/shared-resources/email-sanity-suite.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/email-sanity-suite.xml
rename to packaging/tests/tas-email/src/test/resources/shared-resources/email-sanity-suite.xml
diff --git a/tests/tas-email/src/test/resources/shared-resources/email-suites.xml b/packaging/tests/tas-email/src/test/resources/shared-resources/email-suites.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/email-suites.xml
rename to packaging/tests/tas-email/src/test/resources/shared-resources/email-suites.xml
diff --git a/tests/tas-email/src/test/resources/shared-resources/tas-email-sanity-suite.xml b/packaging/tests/tas-email/src/test/resources/shared-resources/tas-email-sanity-suite.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/tas-email-sanity-suite.xml
rename to packaging/tests/tas-email/src/test/resources/shared-resources/tas-email-sanity-suite.xml
diff --git a/tests/tas-email/src/test/resources/shared-resources/testCount.xml b/packaging/tests/tas-email/src/test/resources/shared-resources/testCount.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/testCount.xml
rename to packaging/tests/tas-email/src/test/resources/shared-resources/testCount.xml
diff --git a/tests/tas-email/src/test/resources/shared-resources/testdata/imap-input-data.xml b/packaging/tests/tas-email/src/test/resources/shared-resources/testdata/imap-input-data.xml
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/testdata/imap-input-data.xml
rename to packaging/tests/tas-email/src/test/resources/shared-resources/testdata/imap-input-data.xml
diff --git a/tests/tas-email/src/test/resources/shared-resources/testdata/imap-resource b/packaging/tests/tas-email/src/test/resources/shared-resources/testdata/imap-resource
similarity index 100%
rename from tests/tas-email/src/test/resources/shared-resources/testdata/imap-resource
rename to packaging/tests/tas-email/src/test/resources/shared-resources/testdata/imap-resource
diff --git a/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
similarity index 100%
rename from tests/tas-integration/pom.xml
rename to packaging/tests/tas-integration/pom.xml
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests1.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests1.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests1.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests1.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk3.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk3.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk3.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk3.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationTest.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationTest.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationTest.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationTest.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithCmisTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithCmisTests.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithCmisTests.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithCmisTests.java
diff --git a/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithWebScriptsTests.java b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithWebScriptsTests.java
similarity index 100%
rename from tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithWebScriptsTests.java
rename to packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithWebScriptsTests.java
diff --git a/tests/tas-integration/src/test/resources/alfresco-integration-context.xml b/packaging/tests/tas-integration/src/test/resources/alfresco-integration-context.xml
similarity index 100%
rename from tests/tas-integration/src/test/resources/alfresco-integration-context.xml
rename to packaging/tests/tas-integration/src/test/resources/alfresco-integration-context.xml
diff --git a/tests/tas-integration/src/test/resources/default.properties b/packaging/tests/tas-integration/src/test/resources/default.properties
similarity index 100%
rename from tests/tas-integration/src/test/resources/default.properties
rename to packaging/tests/tas-integration/src/test/resources/default.properties
diff --git a/tests/tas-integration/src/test/resources/integration-suite.xml b/packaging/tests/tas-integration/src/test/resources/integration-suite.xml
similarity index 100%
rename from tests/tas-integration/src/test/resources/integration-suite.xml
rename to packaging/tests/tas-integration/src/test/resources/integration-suite.xml
diff --git a/tests/tas-integration/src/test/resources/log4j.properties b/packaging/tests/tas-integration/src/test/resources/log4j.properties
similarity index 100%
rename from tests/tas-integration/src/test/resources/log4j.properties
rename to packaging/tests/tas-integration/src/test/resources/log4j.properties
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/.keepme b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/.keepme
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/.keepme
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/.keepme
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/extentionPointTestSuiteTemplate.xsd b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/extentionPointTestSuiteTemplate.xsd
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/extentionPointTestSuiteTemplate.xsd
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/extentionPointTestSuiteTemplate.xsd
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/flower.jpg b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/flower.jpg
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/flower.jpg
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/flower.jpg
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/my-file.tif b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/my-file.tif
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/my-file.tif
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/my-file.tif
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/nonemptyupload.txt b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/nonemptyupload.txt
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/nonemptyupload.txt
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/nonemptyupload.txt
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/test.docx b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.docx
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/test.docx
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.docx
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/test.html b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.html
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/test.html
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.html
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/test.msg b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.msg
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/test.msg
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.msg
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/test.rtf b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.rtf
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/test.rtf
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/test.rtf
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/testUploadFile.txt b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/testUploadFile.txt
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/testUploadFile.txt
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/testUploadFile.txt
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/testUserShoudDeleteFiles.txt b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/testUserShoudDeleteFiles.txt
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/testUserShoudDeleteFiles.txt
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/testUserShoudDeleteFiles.txt
diff --git a/tests/tas-integration/src/test/resources/shared-resources/testdata/userCSV.csv b/packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/userCSV.csv
similarity index 100%
rename from tests/tas-integration/src/test/resources/shared-resources/testdata/userCSV.csv
rename to packaging/tests/tas-integration/src/test/resources/shared-resources/testdata/userCSV.csv
diff --git a/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
similarity index 100%
rename from tests/tas-restapi/pom.xml
rename to packaging/tests/tas-restapi/pom.xml
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/RestTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/RestTest.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/RestTest.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/RestTest.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/ActionsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/ActionsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/actions/ActionsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/ActionsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/auth/AuthTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/auth/AuthTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/auth/AuthTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/auth/AuthTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/AddCommentsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/DeleteCommentTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/DeleteCommentTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/comments/DeleteCommentTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/DeleteCommentTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/GetCommentsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/GetCommentsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/comments/GetCommentsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/GetCommentsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/UpdateCommentTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/UpdateCommentTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/comments/UpdateCommentTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/comments/UpdateCommentTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoriteSiteTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoriteSiteTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoriteSiteTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoriteSiteTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoritesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoritesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoritesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/AddFavoritesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteSiteTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteSiteTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteSiteTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteSiteTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/DeleteFavoriteTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/FavoritesIncludePathTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/FavoritesIncludePathTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/FavoritesIncludePathTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/FavoritesIncludePathTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoriteTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/misc/CORSTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/misc/CORSTest.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/misc/CORSTest.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/misc/CORSTest.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/misc/FunctionalCasesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/misc/FunctionalCasesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/misc/FunctionalCasesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/misc/FunctionalCasesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesActionDefinitionTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesActionDefinitionTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesActionDefinitionTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesActionDefinitionTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesParentChildrenTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesParentChildrenTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesParentChildrenTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesParentChildrenTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTargetSourcesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTargetSourcesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTargetSourcesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTargetSourcesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesUnlockTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesUnlockTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesUnlockTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesUnlockTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/DeleteSiteMemberSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetPeopleSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSiteMembershipSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/GetSitesMembershipInformationSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/activities/GetPeopleActivitiesSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferencesSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/queries/QueriesTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/queries/QueriesTest.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/queries/QueriesTest.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/queries/QueriesTest.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/AddRatingTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/AddRatingTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/AddRatingTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/AddRatingTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/DeleteRatingTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/DeleteRatingTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/DeleteRatingTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/DeleteRatingTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/ratings/GetRatingsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/CreateRenditionTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/CreateRenditionTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/CreateRenditionTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/CreateRenditionTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/GetRenditionTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/GetRenditionTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/GetRenditionTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/GetRenditionTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/servlet/DownloadContentServletTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/servlet/DownloadContentServletTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/servlet/DownloadContentServletTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/servlet/DownloadContentServletTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSiteTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSiteTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSiteTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSiteTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSitesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSitesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSitesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSitesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/SitesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/SitesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/SitesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/SitesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainerTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainerTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainerTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainerTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainersTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainersTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainersTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/containers/GetSiteContainersTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMemberTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMemberTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMemberTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMemberTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMembersTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMembersTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMembersTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/GetSiteMembersTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/RemoveSiteMemberTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/RemoveSiteMemberTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/RemoveSiteMemberTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/RemoveSiteMemberTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/DeleteSiteMembershipRequestTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/DeleteSiteMembershipRequestTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/DeleteSiteMembershipRequestTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/DeleteSiteMembershipRequestTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/GetSiteMembershipRequestsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/GetTagsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/TagsDataPrep.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/TagsDataPrep.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/TagsDataPrep.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/TagsDataPrep.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/AddProcessItemSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/DeleteProcessItemSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/items/GetProcessItemsSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/tasks/GetProcessTasksSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariableSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/AddProcessVariablesSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/DeleteProcessVariableSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesFullTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesFullTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesFullTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesFullTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/UpdateProcessVariableTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/UpdateProcessVariableTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/UpdateProcessVariableTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/variables/UpdateProcessVariableTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskFormModelTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskFormModelTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskFormModelTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskFormModelTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTasksTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTasksTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTasksTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/GetTasksTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesRegressionTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesRegressionTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesRegressionTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesRegressionTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/candidates/GetTaskCandidatesSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk1.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk1.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk1.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk1.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk2.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk2.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk2.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk2.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk3.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk3.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk3.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/AddTaskItemTestsBulk3.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsRegressionTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsRegressionTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsRegressionTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsRegressionTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/RemoveTaskItemTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/RemoveTaskItemTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/RemoveTaskItemTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/items/RemoveTaskItemTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk1.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk1.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk1.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk1.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk2.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk2.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk2.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk2.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk3.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk3.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk3.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/AddTaskVariablesTestsBulk3.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/DeleteTaskVariableTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/DeleteTaskVariableTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/DeleteTaskVariableTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/DeleteTaskVariableTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/GetTaskVariablesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/GetTaskVariablesTests.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/GetTaskVariablesTests.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/GetTaskVariablesTests.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk1.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk1.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk1.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk1.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk2.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk2.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk2.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk2.java
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk3.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk3.java
similarity index 100%
rename from tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk3.java
rename to packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableTestsBulk3.java
diff --git a/tests/tas-restapi/src/test/resources/alfresco-restapi-context.xml b/packaging/tests/tas-restapi/src/test/resources/alfresco-restapi-context.xml
similarity index 100%
rename from tests/tas-restapi/src/test/resources/alfresco-restapi-context.xml
rename to packaging/tests/tas-restapi/src/test/resources/alfresco-restapi-context.xml
diff --git a/tests/tas-restapi/src/test/resources/default.properties b/packaging/tests/tas-restapi/src/test/resources/default.properties
similarity index 100%
rename from tests/tas-restapi/src/test/resources/default.properties
rename to packaging/tests/tas-restapi/src/test/resources/default.properties
diff --git a/tests/tas-restapi/src/test/resources/log4j.properties b/packaging/tests/tas-restapi/src/test/resources/log4j.properties
similarity index 100%
rename from tests/tas-restapi/src/test/resources/log4j.properties
rename to packaging/tests/tas-restapi/src/test/resources/log4j.properties
diff --git a/tests/tas-restapi/src/test/resources/restapi-suite.xml b/packaging/tests/tas-restapi/src/test/resources/restapi-suite.xml
similarity index 100%
rename from tests/tas-restapi/src/test/resources/restapi-suite.xml
rename to packaging/tests/tas-restapi/src/test/resources/restapi-suite.xml
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/UTF-8File.txt b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/UTF-8File.txt
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/UTF-8File.txt
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/UTF-8File.txt
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/avatar.jpg b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/avatar.jpg
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/avatar.jpg
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/avatar.jpg
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/content-zip-test.zip b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/content-zip-test.zip
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/content-zip-test.zip
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/content-zip-test.zip
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/iso8859File.txt b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/iso8859File.txt
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/iso8859File.txt
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/iso8859File.txt
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/larger.pdf b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/larger.pdf
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/larger.pdf
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/larger.pdf
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/my-file.tif b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/my-file.tif
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/my-file.tif
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/my-file.tif
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.doc b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.doc
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.doc
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.doc
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.docx b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.docx
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.docx
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.docx
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.gif b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.gif
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.gif
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.gif
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.jpg b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.jpg
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.jpg
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.jpg
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.msg b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.msg
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.msg
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.msg
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pdf b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pdf
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pdf
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pdf
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.png b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.png
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.png
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.png
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.ppt b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.ppt
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.ppt
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.ppt
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pptx b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pptx
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pptx
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.pptx
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.tiff b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.tiff
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.tiff
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.tiff
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.txt b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.txt
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.txt
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.txt
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xls b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xls
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xls
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xls
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xlsx b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xlsx
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xlsx
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/quick/quick.xlsx
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/restapi-resource b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/restapi-resource
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/restapi-resource
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/restapi-resource
diff --git a/tests/tas-restapi/src/test/resources/shared-resources/testdata/sampleContent.txt b/packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/sampleContent.txt
similarity index 100%
rename from tests/tas-restapi/src/test/resources/shared-resources/testdata/sampleContent.txt
rename to packaging/tests/tas-restapi/src/test/resources/shared-resources/testdata/sampleContent.txt
diff --git a/tests/tas-restapi/src/test/resources/test-suites/part1-suite.xml b/packaging/tests/tas-restapi/src/test/resources/test-suites/part1-suite.xml
similarity index 100%
rename from tests/tas-restapi/src/test/resources/test-suites/part1-suite.xml
rename to packaging/tests/tas-restapi/src/test/resources/test-suites/part1-suite.xml
diff --git a/tests/tas-restapi/src/test/resources/test-suites/part2-suite.xml b/packaging/tests/tas-restapi/src/test/resources/test-suites/part2-suite.xml
similarity index 100%
rename from tests/tas-restapi/src/test/resources/test-suites/part2-suite.xml
rename to packaging/tests/tas-restapi/src/test/resources/test-suites/part2-suite.xml
diff --git a/tests/tas-restapi/src/test/resources/test-suites/part3-suite.xml b/packaging/tests/tas-restapi/src/test/resources/test-suites/part3-suite.xml
similarity index 100%
rename from tests/tas-restapi/src/test/resources/test-suites/part3-suite.xml
rename to packaging/tests/tas-restapi/src/test/resources/test-suites/part3-suite.xml
diff --git a/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
similarity index 100%
rename from tests/tas-webdav/pom.xml
rename to packaging/tests/tas-webdav/pom.xml
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/CopyTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/CopyTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/CopyTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/CopyTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFileTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFileTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFileTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFileTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFolderTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFolderTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFolderTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/CreateFolderTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFileTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFileTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFileTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFileTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFolderTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFolderTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFolderTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/DeleteFolderTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/DownloadTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/DownloadTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/DownloadTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/DownloadTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/GetContentsFromParentFolderTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/GetContentsFromParentFolderTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/GetContentsFromParentFolderTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/GetContentsFromParentFolderTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/LockFileTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/LockFileTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/LockFileTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/LockFileTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/MoveTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/MoveTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/MoveTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/MoveTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/NetworkDriveTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/NetworkDriveTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/NetworkDriveTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/NetworkDriveTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFileTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFileTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFileTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFileTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFolderTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFolderTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFolderTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/RenameFolderTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/RequestResponseTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/RequestResponseTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/RequestResponseTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/RequestResponseTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/UnlockFileTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/UnlockFileTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/UnlockFileTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/UnlockFileTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/UpdateContentTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/UpdateContentTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/UpdateContentTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/UpdateContentTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavRootTests.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavRootTests.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavRootTests.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavRootTests.java
diff --git a/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java
similarity index 100%
rename from tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java
rename to packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java
diff --git a/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml b/packaging/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml
similarity index 100%
rename from tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml
rename to packaging/tests/tas-webdav/src/test/resources/alfresco-webdav-context.xml
diff --git a/tests/tas-webdav/src/test/resources/default.properties b/packaging/tests/tas-webdav/src/test/resources/default.properties
similarity index 100%
rename from tests/tas-webdav/src/test/resources/default.properties
rename to packaging/tests/tas-webdav/src/test/resources/default.properties
diff --git a/tests/tas-webdav/src/test/resources/log4j.properties b/packaging/tests/tas-webdav/src/test/resources/log4j.properties
similarity index 100%
rename from tests/tas-webdav/src/test/resources/log4j.properties
rename to packaging/tests/tas-webdav/src/test/resources/log4j.properties
diff --git a/tests/tas-webdav/src/test/resources/shared-resources/testdata/nonemptyupload.txt b/packaging/tests/tas-webdav/src/test/resources/shared-resources/testdata/nonemptyupload.txt
similarity index 100%
rename from tests/tas-webdav/src/test/resources/shared-resources/testdata/nonemptyupload.txt
rename to packaging/tests/tas-webdav/src/test/resources/shared-resources/testdata/nonemptyupload.txt
diff --git a/tests/tas-webdav/src/test/resources/shared-resources/testdata/textFile.txt b/packaging/tests/tas-webdav/src/test/resources/shared-resources/testdata/textFile.txt
similarity index 100%
rename from tests/tas-webdav/src/test/resources/shared-resources/testdata/textFile.txt
rename to packaging/tests/tas-webdav/src/test/resources/shared-resources/testdata/textFile.txt
diff --git a/tests/tas-webdav/src/test/resources/shared-resources/testdata/webdav-resource b/packaging/tests/tas-webdav/src/test/resources/shared-resources/testdata/webdav-resource
similarity index 100%
rename from tests/tas-webdav/src/test/resources/shared-resources/testdata/webdav-resource
rename to packaging/tests/tas-webdav/src/test/resources/shared-resources/testdata/webdav-resource
diff --git a/tests/tas-webdav/src/test/resources/webdav-suite.xml b/packaging/tests/tas-webdav/src/test/resources/webdav-suite.xml
similarity index 100%
rename from tests/tas-webdav/src/test/resources/webdav-suite.xml
rename to packaging/tests/tas-webdav/src/test/resources/webdav-suite.xml
diff --git a/war/pom.xml b/packaging/war/pom.xml
similarity index 100%
rename from war/pom.xml
rename to packaging/war/pom.xml
diff --git a/war/src/main/META-INF/application.xml b/packaging/war/src/main/META-INF/application.xml
similarity index 100%
rename from war/src/main/META-INF/application.xml
rename to packaging/war/src/main/META-INF/application.xml
diff --git a/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java b/packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java
similarity index 100%
rename from war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java
rename to packaging/war/src/main/java/org/alfresco/web/app/ContextLoaderListener.java
diff --git a/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
similarity index 100%
rename from war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
rename to packaging/war/src/main/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
diff --git a/war/src/main/resources/alfresco/alfresco-jmxrmi.access b/packaging/war/src/main/resources/alfresco/alfresco-jmxrmi.access
similarity index 100%
rename from war/src/main/resources/alfresco/alfresco-jmxrmi.access
rename to packaging/war/src/main/resources/alfresco/alfresco-jmxrmi.access
diff --git a/war/src/main/resources/alfresco/alfresco-jmxrmi.password b/packaging/war/src/main/resources/alfresco/alfresco-jmxrmi.password
similarity index 100%
rename from war/src/main/resources/alfresco/alfresco-jmxrmi.password
rename to packaging/war/src/main/resources/alfresco/alfresco-jmxrmi.password
diff --git a/war/src/main/resources/alfresco/version.properties b/packaging/war/src/main/resources/alfresco/version.properties
similarity index 100%
rename from war/src/main/resources/alfresco/version.properties
rename to packaging/war/src/main/resources/alfresco/version.properties
diff --git a/war/src/main/resources/alfresco/web-client-application-context.xml b/packaging/war/src/main/resources/alfresco/web-client-application-context.xml
similarity index 100%
rename from war/src/main/resources/alfresco/web-client-application-context.xml
rename to packaging/war/src/main/resources/alfresco/web-client-application-context.xml
diff --git a/war/src/main/resources/alfresco/web-client-security-config.xml b/packaging/war/src/main/resources/alfresco/web-client-security-config.xml
similarity index 100%
rename from war/src/main/resources/alfresco/web-client-security-config.xml
rename to packaging/war/src/main/resources/alfresco/web-client-security-config.xml
diff --git a/war/src/main/resources/log4j.properties b/packaging/war/src/main/resources/log4j.properties
similarity index 100%
rename from war/src/main/resources/log4j.properties
rename to packaging/war/src/main/resources/log4j.properties
diff --git a/war/src/main/resources/logging.properties b/packaging/war/src/main/resources/logging.properties
similarity index 100%
rename from war/src/main/resources/logging.properties
rename to packaging/war/src/main/resources/logging.properties
diff --git a/war/src/main/webapp/META-INF/context.xml b/packaging/war/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from war/src/main/webapp/META-INF/context.xml
rename to packaging/war/src/main/webapp/META-INF/context.xml
diff --git a/war/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template b/packaging/war/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template
similarity index 100%
rename from war/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template
rename to packaging/war/src/main/webapp/WEB-INF/cmis10/CMIS-Core.xsd.template
diff --git a/war/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template b/packaging/war/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template
similarity index 100%
rename from war/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template
rename to packaging/war/src/main/webapp/WEB-INF/cmis10/CMIS-Messaging.xsd.template
diff --git a/war/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template b/packaging/war/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template
similarity index 100%
rename from war/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template
rename to packaging/war/src/main/webapp/WEB-INF/cmis10/CMISWS-Service.wsdl.template
diff --git a/war/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template b/packaging/war/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template
similarity index 100%
rename from war/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template
rename to packaging/war/src/main/webapp/WEB-INF/cmis11/CMIS-Core.xsd.template
diff --git a/war/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template b/packaging/war/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template
similarity index 100%
rename from war/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template
rename to packaging/war/src/main/webapp/WEB-INF/cmis11/CMIS-Messaging.xsd.template
diff --git a/war/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template b/packaging/war/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template
similarity index 100%
rename from war/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template
rename to packaging/war/src/main/webapp/WEB-INF/cmis11/CMISWS-Service.wsdl.template
diff --git a/war/src/main/webapp/WEB-INF/web-application-context.xml b/packaging/war/src/main/webapp/WEB-INF/web-application-context.xml
similarity index 100%
rename from war/src/main/webapp/WEB-INF/web-application-context.xml
rename to packaging/war/src/main/webapp/WEB-INF/web-application-context.xml
diff --git a/war/src/main/webapp/WEB-INF/web.xml b/packaging/war/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from war/src/main/webapp/WEB-INF/web.xml
rename to packaging/war/src/main/webapp/WEB-INF/web.xml
diff --git a/war/src/main/webapp/admin/css/admin.css b/packaging/war/src/main/webapp/admin/css/admin.css
similarity index 100%
rename from war/src/main/webapp/admin/css/admin.css
rename to packaging/war/src/main/webapp/admin/css/admin.css
diff --git a/war/src/main/webapp/admin/images/disabled.gif b/packaging/war/src/main/webapp/admin/images/disabled.gif
similarity index 100%
rename from war/src/main/webapp/admin/images/disabled.gif
rename to packaging/war/src/main/webapp/admin/images/disabled.gif
diff --git a/war/src/main/webapp/admin/images/enabled.gif b/packaging/war/src/main/webapp/admin/images/enabled.gif
similarity index 100%
rename from war/src/main/webapp/admin/images/enabled.gif
rename to packaging/war/src/main/webapp/admin/images/enabled.gif
diff --git a/war/src/main/webapp/admin/images/upload.png b/packaging/war/src/main/webapp/admin/images/upload.png
similarity index 100%
rename from war/src/main/webapp/admin/images/upload.png
rename to packaging/war/src/main/webapp/admin/images/upload.png
diff --git a/war/src/main/webapp/cmis-browser-app/css/style.css b/packaging/war/src/main/webapp/cmis-browser-app/css/style.css
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/css/style.css
rename to packaging/war/src/main/webapp/cmis-browser-app/css/style.css
diff --git a/war/src/main/webapp/cmis-browser-app/images/apache_chemistry.png b/packaging/war/src/main/webapp/cmis-browser-app/images/apache_chemistry.png
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/apache_chemistry.png
rename to packaging/war/src/main/webapp/cmis-browser-app/images/apache_chemistry.png
diff --git a/war/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png b/packaging/war/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png
rename to packaging/war/src/main/webapp/cmis-browser-app/images/cmis-browser-logo.png
diff --git a/war/src/main/webapp/cmis-browser-app/images/cmis.png b/packaging/war/src/main/webapp/cmis-browser-app/images/cmis.png
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/cmis.png
rename to packaging/war/src/main/webapp/cmis-browser-app/images/cmis.png
diff --git a/war/src/main/webapp/cmis-browser-app/images/divider.jpg b/packaging/war/src/main/webapp/cmis-browser-app/images/divider.jpg
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/divider.jpg
rename to packaging/war/src/main/webapp/cmis-browser-app/images/divider.jpg
diff --git a/war/src/main/webapp/cmis-browser-app/images/document.gif b/packaging/war/src/main/webapp/cmis-browser-app/images/document.gif
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/document.gif
rename to packaging/war/src/main/webapp/cmis-browser-app/images/document.gif
diff --git a/war/src/main/webapp/cmis-browser-app/images/folder-yellow.gif b/packaging/war/src/main/webapp/cmis-browser-app/images/folder-yellow.gif
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/folder-yellow.gif
rename to packaging/war/src/main/webapp/cmis-browser-app/images/folder-yellow.gif
diff --git a/war/src/main/webapp/cmis-browser-app/images/folder.gif b/packaging/war/src/main/webapp/cmis-browser-app/images/folder.gif
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/folder.gif
rename to packaging/war/src/main/webapp/cmis-browser-app/images/folder.gif
diff --git a/war/src/main/webapp/cmis-browser-app/images/header_bg.jpg b/packaging/war/src/main/webapp/cmis-browser-app/images/header_bg.jpg
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/header_bg.jpg
rename to packaging/war/src/main/webapp/cmis-browser-app/images/header_bg.jpg
diff --git a/war/src/main/webapp/cmis-browser-app/images/nav_bg.jpg b/packaging/war/src/main/webapp/cmis-browser-app/images/nav_bg.jpg
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/nav_bg.jpg
rename to packaging/war/src/main/webapp/cmis-browser-app/images/nav_bg.jpg
diff --git a/war/src/main/webapp/cmis-browser-app/images/surf-logo.png b/packaging/war/src/main/webapp/cmis-browser-app/images/surf-logo.png
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/surf-logo.png
rename to packaging/war/src/main/webapp/cmis-browser-app/images/surf-logo.png
diff --git a/war/src/main/webapp/cmis-browser-app/images/table-header.jpg b/packaging/war/src/main/webapp/cmis-browser-app/images/table-header.jpg
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/table-header.jpg
rename to packaging/war/src/main/webapp/cmis-browser-app/images/table-header.jpg
diff --git a/war/src/main/webapp/cmis-browser-app/images/up.gif b/packaging/war/src/main/webapp/cmis-browser-app/images/up.gif
similarity index 100%
rename from war/src/main/webapp/cmis-browser-app/images/up.gif
rename to packaging/war/src/main/webapp/cmis-browser-app/images/up.gif
diff --git a/war/src/main/webapp/cmisfs/browser/browser.css b/packaging/war/src/main/webapp/cmisfs/browser/browser.css
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/browser.css
rename to packaging/war/src/main/webapp/cmisfs/browser/browser.css
diff --git a/war/src/main/webapp/cmisfs/browser/cmis.png b/packaging/war/src/main/webapp/cmisfs/browser/cmis.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/cmis.png
rename to packaging/war/src/main/webapp/cmisfs/browser/cmis.png
diff --git a/war/src/main/webapp/cmisfs/browser/document.png b/packaging/war/src/main/webapp/cmisfs/browser/document.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/document.png
rename to packaging/war/src/main/webapp/cmisfs/browser/document.png
diff --git a/war/src/main/webapp/cmisfs/browser/folder.png b/packaging/war/src/main/webapp/cmisfs/browser/folder.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/folder.png
rename to packaging/war/src/main/webapp/cmisfs/browser/folder.png
diff --git a/war/src/main/webapp/cmisfs/browser/policy.png b/packaging/war/src/main/webapp/cmisfs/browser/policy.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/policy.png
rename to packaging/war/src/main/webapp/cmisfs/browser/policy.png
diff --git a/war/src/main/webapp/cmisfs/browser/relationship.png b/packaging/war/src/main/webapp/cmisfs/browser/relationship.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/relationship.png
rename to packaging/war/src/main/webapp/cmisfs/browser/relationship.png
diff --git a/war/src/main/webapp/cmisfs/browser/type.png b/packaging/war/src/main/webapp/cmisfs/browser/type.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/type.png
rename to packaging/war/src/main/webapp/cmisfs/browser/type.png
diff --git a/war/src/main/webapp/cmisfs/browser/unknown.png b/packaging/war/src/main/webapp/cmisfs/browser/unknown.png
similarity index 100%
rename from war/src/main/webapp/cmisfs/browser/unknown.png
rename to packaging/war/src/main/webapp/cmisfs/browser/unknown.png
diff --git a/war/src/main/webapp/cmisfs/stylesheets/acl.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/acl.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/acl.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/acl.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/actions.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/actions.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/actions.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/actions.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/entry.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/entry.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/entry.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/entry.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/feed.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/feed.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/feed.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/feed.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/relationships.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/relationships.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/relationships.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/relationships.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/renditions.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/renditions.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/renditions.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/renditions.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/service.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/service.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/service.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/service.xsl
diff --git a/war/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl b/packaging/war/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl
similarity index 100%
rename from war/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl
rename to packaging/war/src/main/webapp/cmisfs/stylesheets/thumbnails.xsl
diff --git a/war/src/main/webapp/css/alfresco.css b/packaging/war/src/main/webapp/css/alfresco.css
similarity index 100%
rename from war/src/main/webapp/css/alfresco.css
rename to packaging/war/src/main/webapp/css/alfresco.css
diff --git a/war/src/main/webapp/css/main.css b/packaging/war/src/main/webapp/css/main.css
similarity index 100%
rename from war/src/main/webapp/css/main.css
rename to packaging/war/src/main/webapp/css/main.css
diff --git a/war/src/main/webapp/css/opensans.woff b/packaging/war/src/main/webapp/css/opensans.woff
similarity index 100%
rename from war/src/main/webapp/css/opensans.woff
rename to packaging/war/src/main/webapp/css/opensans.woff
diff --git a/war/src/main/webapp/css/opensansbold.woff b/packaging/war/src/main/webapp/css/opensansbold.woff
similarity index 100%
rename from war/src/main/webapp/css/opensansbold.woff
rename to packaging/war/src/main/webapp/css/opensansbold.woff
diff --git a/war/src/main/webapp/css/opensanscondensed.woff b/packaging/war/src/main/webapp/css/opensanscondensed.woff
similarity index 100%
rename from war/src/main/webapp/css/opensanscondensed.woff
rename to packaging/war/src/main/webapp/css/opensanscondensed.woff
diff --git a/war/src/main/webapp/css/opensearch.css b/packaging/war/src/main/webapp/css/opensearch.css
similarity index 100%
rename from war/src/main/webapp/css/opensearch.css
rename to packaging/war/src/main/webapp/css/opensearch.css
diff --git a/war/src/main/webapp/css/picker.css b/packaging/war/src/main/webapp/css/picker.css
similarity index 100%
rename from war/src/main/webapp/css/picker.css
rename to packaging/war/src/main/webapp/css/picker.css
diff --git a/war/src/main/webapp/css/reset.css b/packaging/war/src/main/webapp/css/reset.css
similarity index 100%
rename from war/src/main/webapp/css/reset.css
rename to packaging/war/src/main/webapp/css/reset.css
diff --git a/war/src/main/webapp/css/webscripts.css b/packaging/war/src/main/webapp/css/webscripts.css
similarity index 100%
rename from war/src/main/webapp/css/webscripts.css
rename to packaging/war/src/main/webapp/css/webscripts.css
diff --git a/war/src/main/webapp/css/yahoo-tree.css b/packaging/war/src/main/webapp/css/yahoo-tree.css
similarity index 100%
rename from war/src/main/webapp/css/yahoo-tree.css
rename to packaging/war/src/main/webapp/css/yahoo-tree.css
diff --git a/war/src/main/webapp/css/yui-3.3.0-dependencies.css b/packaging/war/src/main/webapp/css/yui-3.3.0-dependencies.css
similarity index 100%
rename from war/src/main/webapp/css/yui-3.3.0-dependencies.css
rename to packaging/war/src/main/webapp/css/yui-3.3.0-dependencies.css
diff --git a/war/src/main/webapp/error.jsp b/packaging/war/src/main/webapp/error.jsp
similarity index 100%
rename from war/src/main/webapp/error.jsp
rename to packaging/war/src/main/webapp/error.jsp
diff --git a/war/src/main/webapp/favicon.ico b/packaging/war/src/main/webapp/favicon.ico
similarity index 100%
rename from war/src/main/webapp/favicon.ico
rename to packaging/war/src/main/webapp/favicon.ico
diff --git a/war/src/main/webapp/images/filetypes/_default.gif b/packaging/war/src/main/webapp/images/filetypes/_default.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/_default.gif
rename to packaging/war/src/main/webapp/images/filetypes/_default.gif
diff --git a/war/src/main/webapp/images/filetypes/_default.png b/packaging/war/src/main/webapp/images/filetypes/_default.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/_default.png
rename to packaging/war/src/main/webapp/images/filetypes/_default.png
diff --git a/war/src/main/webapp/images/filetypes/acp.gif b/packaging/war/src/main/webapp/images/filetypes/acp.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/acp.gif
rename to packaging/war/src/main/webapp/images/filetypes/acp.gif
diff --git a/war/src/main/webapp/images/filetypes/asf.gif b/packaging/war/src/main/webapp/images/filetypes/asf.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/asf.gif
rename to packaging/war/src/main/webapp/images/filetypes/asf.gif
diff --git a/war/src/main/webapp/images/filetypes/avi.gif b/packaging/war/src/main/webapp/images/filetypes/avi.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/avi.gif
rename to packaging/war/src/main/webapp/images/filetypes/avi.gif
diff --git a/war/src/main/webapp/images/filetypes/bmp.gif b/packaging/war/src/main/webapp/images/filetypes/bmp.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/bmp.gif
rename to packaging/war/src/main/webapp/images/filetypes/bmp.gif
diff --git a/war/src/main/webapp/images/filetypes/bmp.png b/packaging/war/src/main/webapp/images/filetypes/bmp.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/bmp.png
rename to packaging/war/src/main/webapp/images/filetypes/bmp.png
diff --git a/war/src/main/webapp/images/filetypes/csv.gif b/packaging/war/src/main/webapp/images/filetypes/csv.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/csv.gif
rename to packaging/war/src/main/webapp/images/filetypes/csv.gif
diff --git a/war/src/main/webapp/images/filetypes/doc.gif b/packaging/war/src/main/webapp/images/filetypes/doc.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/doc.gif
rename to packaging/war/src/main/webapp/images/filetypes/doc.gif
diff --git a/war/src/main/webapp/images/filetypes/doc.png b/packaging/war/src/main/webapp/images/filetypes/doc.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/doc.png
rename to packaging/war/src/main/webapp/images/filetypes/doc.png
diff --git a/war/src/main/webapp/images/filetypes/docx.gif b/packaging/war/src/main/webapp/images/filetypes/docx.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/docx.gif
rename to packaging/war/src/main/webapp/images/filetypes/docx.gif
diff --git a/war/src/main/webapp/images/filetypes/docx.png b/packaging/war/src/main/webapp/images/filetypes/docx.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/docx.png
rename to packaging/war/src/main/webapp/images/filetypes/docx.png
diff --git a/war/src/main/webapp/images/filetypes/eml.gif b/packaging/war/src/main/webapp/images/filetypes/eml.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/eml.gif
rename to packaging/war/src/main/webapp/images/filetypes/eml.gif
diff --git a/war/src/main/webapp/images/filetypes/exe.gif b/packaging/war/src/main/webapp/images/filetypes/exe.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/exe.gif
rename to packaging/war/src/main/webapp/images/filetypes/exe.gif
diff --git a/war/src/main/webapp/images/filetypes/ftl.gif b/packaging/war/src/main/webapp/images/filetypes/ftl.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/ftl.gif
rename to packaging/war/src/main/webapp/images/filetypes/ftl.gif
diff --git a/war/src/main/webapp/images/filetypes/gif.gif b/packaging/war/src/main/webapp/images/filetypes/gif.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/gif.gif
rename to packaging/war/src/main/webapp/images/filetypes/gif.gif
diff --git a/war/src/main/webapp/images/filetypes/gif.png b/packaging/war/src/main/webapp/images/filetypes/gif.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/gif.png
rename to packaging/war/src/main/webapp/images/filetypes/gif.png
diff --git a/war/src/main/webapp/images/filetypes/htm.gif b/packaging/war/src/main/webapp/images/filetypes/htm.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/htm.gif
rename to packaging/war/src/main/webapp/images/filetypes/htm.gif
diff --git a/war/src/main/webapp/images/filetypes/htm.png b/packaging/war/src/main/webapp/images/filetypes/htm.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/htm.png
rename to packaging/war/src/main/webapp/images/filetypes/htm.png
diff --git a/war/src/main/webapp/images/filetypes/html.gif b/packaging/war/src/main/webapp/images/filetypes/html.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/html.gif
rename to packaging/war/src/main/webapp/images/filetypes/html.gif
diff --git a/war/src/main/webapp/images/filetypes/html.png b/packaging/war/src/main/webapp/images/filetypes/html.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/html.png
rename to packaging/war/src/main/webapp/images/filetypes/html.png
diff --git a/war/src/main/webapp/images/filetypes/jpg.gif b/packaging/war/src/main/webapp/images/filetypes/jpg.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/jpg.gif
rename to packaging/war/src/main/webapp/images/filetypes/jpg.gif
diff --git a/war/src/main/webapp/images/filetypes/jpg.png b/packaging/war/src/main/webapp/images/filetypes/jpg.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/jpg.png
rename to packaging/war/src/main/webapp/images/filetypes/jpg.png
diff --git a/war/src/main/webapp/images/filetypes/js.gif b/packaging/war/src/main/webapp/images/filetypes/js.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/js.gif
rename to packaging/war/src/main/webapp/images/filetypes/js.gif
diff --git a/war/src/main/webapp/images/filetypes/lnk.gif b/packaging/war/src/main/webapp/images/filetypes/lnk.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/lnk.gif
rename to packaging/war/src/main/webapp/images/filetypes/lnk.gif
diff --git a/war/src/main/webapp/images/filetypes/mp2.gif b/packaging/war/src/main/webapp/images/filetypes/mp2.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/mp2.gif
rename to packaging/war/src/main/webapp/images/filetypes/mp2.gif
diff --git a/war/src/main/webapp/images/filetypes/mp3.gif b/packaging/war/src/main/webapp/images/filetypes/mp3.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/mp3.gif
rename to packaging/war/src/main/webapp/images/filetypes/mp3.gif
diff --git a/war/src/main/webapp/images/filetypes/mp4.gif b/packaging/war/src/main/webapp/images/filetypes/mp4.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/mp4.gif
rename to packaging/war/src/main/webapp/images/filetypes/mp4.gif
diff --git a/war/src/main/webapp/images/filetypes/mpeg.gif b/packaging/war/src/main/webapp/images/filetypes/mpeg.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/mpeg.gif
rename to packaging/war/src/main/webapp/images/filetypes/mpeg.gif
diff --git a/war/src/main/webapp/images/filetypes/mpg.gif b/packaging/war/src/main/webapp/images/filetypes/mpg.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/mpg.gif
rename to packaging/war/src/main/webapp/images/filetypes/mpg.gif
diff --git a/war/src/main/webapp/images/filetypes/msg.gif b/packaging/war/src/main/webapp/images/filetypes/msg.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/msg.gif
rename to packaging/war/src/main/webapp/images/filetypes/msg.gif
diff --git a/war/src/main/webapp/images/filetypes/odf.gif b/packaging/war/src/main/webapp/images/filetypes/odf.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/odf.gif
rename to packaging/war/src/main/webapp/images/filetypes/odf.gif
diff --git a/war/src/main/webapp/images/filetypes/odg.gif b/packaging/war/src/main/webapp/images/filetypes/odg.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/odg.gif
rename to packaging/war/src/main/webapp/images/filetypes/odg.gif
diff --git a/war/src/main/webapp/images/filetypes/odp.gif b/packaging/war/src/main/webapp/images/filetypes/odp.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/odp.gif
rename to packaging/war/src/main/webapp/images/filetypes/odp.gif
diff --git a/war/src/main/webapp/images/filetypes/ods.gif b/packaging/war/src/main/webapp/images/filetypes/ods.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/ods.gif
rename to packaging/war/src/main/webapp/images/filetypes/ods.gif
diff --git a/war/src/main/webapp/images/filetypes/odt.gif b/packaging/war/src/main/webapp/images/filetypes/odt.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/odt.gif
rename to packaging/war/src/main/webapp/images/filetypes/odt.gif
diff --git a/war/src/main/webapp/images/filetypes/pdf.gif b/packaging/war/src/main/webapp/images/filetypes/pdf.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/pdf.gif
rename to packaging/war/src/main/webapp/images/filetypes/pdf.gif
diff --git a/war/src/main/webapp/images/filetypes/pdf.png b/packaging/war/src/main/webapp/images/filetypes/pdf.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/pdf.png
rename to packaging/war/src/main/webapp/images/filetypes/pdf.png
diff --git a/war/src/main/webapp/images/filetypes/png.gif b/packaging/war/src/main/webapp/images/filetypes/png.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/png.gif
rename to packaging/war/src/main/webapp/images/filetypes/png.gif
diff --git a/war/src/main/webapp/images/filetypes/png.png b/packaging/war/src/main/webapp/images/filetypes/png.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/png.png
rename to packaging/war/src/main/webapp/images/filetypes/png.png
diff --git a/war/src/main/webapp/images/filetypes/ppt.gif b/packaging/war/src/main/webapp/images/filetypes/ppt.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/ppt.gif
rename to packaging/war/src/main/webapp/images/filetypes/ppt.gif
diff --git a/war/src/main/webapp/images/filetypes/ppt.png b/packaging/war/src/main/webapp/images/filetypes/ppt.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/ppt.png
rename to packaging/war/src/main/webapp/images/filetypes/ppt.png
diff --git a/war/src/main/webapp/images/filetypes/pptx.gif b/packaging/war/src/main/webapp/images/filetypes/pptx.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/pptx.gif
rename to packaging/war/src/main/webapp/images/filetypes/pptx.gif
diff --git a/war/src/main/webapp/images/filetypes/pptx.png b/packaging/war/src/main/webapp/images/filetypes/pptx.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/pptx.png
rename to packaging/war/src/main/webapp/images/filetypes/pptx.png
diff --git a/war/src/main/webapp/images/filetypes/psd.gif b/packaging/war/src/main/webapp/images/filetypes/psd.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/psd.gif
rename to packaging/war/src/main/webapp/images/filetypes/psd.gif
diff --git a/war/src/main/webapp/images/filetypes/rtf.gif b/packaging/war/src/main/webapp/images/filetypes/rtf.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/rtf.gif
rename to packaging/war/src/main/webapp/images/filetypes/rtf.gif
diff --git a/war/src/main/webapp/images/filetypes/shtml.gif b/packaging/war/src/main/webapp/images/filetypes/shtml.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/shtml.gif
rename to packaging/war/src/main/webapp/images/filetypes/shtml.gif
diff --git a/war/src/main/webapp/images/filetypes/swf.gif b/packaging/war/src/main/webapp/images/filetypes/swf.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/swf.gif
rename to packaging/war/src/main/webapp/images/filetypes/swf.gif
diff --git a/war/src/main/webapp/images/filetypes/tif.gif b/packaging/war/src/main/webapp/images/filetypes/tif.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/tif.gif
rename to packaging/war/src/main/webapp/images/filetypes/tif.gif
diff --git a/war/src/main/webapp/images/filetypes/tiff.gif b/packaging/war/src/main/webapp/images/filetypes/tiff.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/tiff.gif
rename to packaging/war/src/main/webapp/images/filetypes/tiff.gif
diff --git a/war/src/main/webapp/images/filetypes/txt.gif b/packaging/war/src/main/webapp/images/filetypes/txt.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/txt.gif
rename to packaging/war/src/main/webapp/images/filetypes/txt.gif
diff --git a/war/src/main/webapp/images/filetypes/txt.png b/packaging/war/src/main/webapp/images/filetypes/txt.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/txt.png
rename to packaging/war/src/main/webapp/images/filetypes/txt.png
diff --git a/war/src/main/webapp/images/filetypes/url.gif b/packaging/war/src/main/webapp/images/filetypes/url.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/url.gif
rename to packaging/war/src/main/webapp/images/filetypes/url.gif
diff --git a/war/src/main/webapp/images/filetypes/wmv.gif b/packaging/war/src/main/webapp/images/filetypes/wmv.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/wmv.gif
rename to packaging/war/src/main/webapp/images/filetypes/wmv.gif
diff --git a/war/src/main/webapp/images/filetypes/wpd.gif b/packaging/war/src/main/webapp/images/filetypes/wpd.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/wpd.gif
rename to packaging/war/src/main/webapp/images/filetypes/wpd.gif
diff --git a/war/src/main/webapp/images/filetypes/xdp.gif b/packaging/war/src/main/webapp/images/filetypes/xdp.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xdp.gif
rename to packaging/war/src/main/webapp/images/filetypes/xdp.gif
diff --git a/war/src/main/webapp/images/filetypes/xdp.png b/packaging/war/src/main/webapp/images/filetypes/xdp.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xdp.png
rename to packaging/war/src/main/webapp/images/filetypes/xdp.png
diff --git a/war/src/main/webapp/images/filetypes/xls.gif b/packaging/war/src/main/webapp/images/filetypes/xls.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xls.gif
rename to packaging/war/src/main/webapp/images/filetypes/xls.gif
diff --git a/war/src/main/webapp/images/filetypes/xls.png b/packaging/war/src/main/webapp/images/filetypes/xls.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xls.png
rename to packaging/war/src/main/webapp/images/filetypes/xls.png
diff --git a/war/src/main/webapp/images/filetypes/xlsx.gif b/packaging/war/src/main/webapp/images/filetypes/xlsx.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xlsx.gif
rename to packaging/war/src/main/webapp/images/filetypes/xlsx.gif
diff --git a/war/src/main/webapp/images/filetypes/xlsx.png b/packaging/war/src/main/webapp/images/filetypes/xlsx.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xlsx.png
rename to packaging/war/src/main/webapp/images/filetypes/xlsx.png
diff --git a/war/src/main/webapp/images/filetypes/xml.gif b/packaging/war/src/main/webapp/images/filetypes/xml.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xml.gif
rename to packaging/war/src/main/webapp/images/filetypes/xml.gif
diff --git a/war/src/main/webapp/images/filetypes/xsd.gif b/packaging/war/src/main/webapp/images/filetypes/xsd.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xsd.gif
rename to packaging/war/src/main/webapp/images/filetypes/xsd.gif
diff --git a/war/src/main/webapp/images/filetypes/xsl.gif b/packaging/war/src/main/webapp/images/filetypes/xsl.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xsl.gif
rename to packaging/war/src/main/webapp/images/filetypes/xsl.gif
diff --git a/war/src/main/webapp/images/filetypes/xslx.gif b/packaging/war/src/main/webapp/images/filetypes/xslx.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xslx.gif
rename to packaging/war/src/main/webapp/images/filetypes/xslx.gif
diff --git a/war/src/main/webapp/images/filetypes/xslx.png b/packaging/war/src/main/webapp/images/filetypes/xslx.png
similarity index 100%
rename from war/src/main/webapp/images/filetypes/xslx.png
rename to packaging/war/src/main/webapp/images/filetypes/xslx.png
diff --git a/war/src/main/webapp/images/filetypes/zip.gif b/packaging/war/src/main/webapp/images/filetypes/zip.gif
similarity index 100%
rename from war/src/main/webapp/images/filetypes/zip.gif
rename to packaging/war/src/main/webapp/images/filetypes/zip.gif
diff --git a/war/src/main/webapp/images/icons/sort_down.gif b/packaging/war/src/main/webapp/images/icons/sort_down.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/sort_down.gif
rename to packaging/war/src/main/webapp/images/icons/sort_down.gif
diff --git a/war/src/main/webapp/images/icons/sort_flat.gif b/packaging/war/src/main/webapp/images/icons/sort_flat.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/sort_flat.gif
rename to packaging/war/src/main/webapp/images/icons/sort_flat.gif
diff --git a/war/src/main/webapp/images/icons/sort_up.gif b/packaging/war/src/main/webapp/images/icons/sort_up.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/sort_up.gif
rename to packaging/war/src/main/webapp/images/icons/sort_up.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-cd-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-cd-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-cd-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-cd-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-cd-16.png b/packaging/war/src/main/webapp/images/icons/space-icon-cd-16.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-cd-16.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-cd-16.png
diff --git a/war/src/main/webapp/images/icons/space-icon-cd-64.png b/packaging/war/src/main/webapp/images/icons/space-icon-cd-64.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-cd-64.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-cd-64.png
diff --git a/war/src/main/webapp/images/icons/space-icon-cd.gif b/packaging/war/src/main/webapp/images/icons/space-icon-cd.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-cd.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-cd.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-default-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-default-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-default-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-default-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-default-16.png b/packaging/war/src/main/webapp/images/icons/space-icon-default-16.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-default-16.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-default-16.png
diff --git a/war/src/main/webapp/images/icons/space-icon-default-64.png b/packaging/war/src/main/webapp/images/icons/space-icon-default-64.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-default-64.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-default-64.png
diff --git a/war/src/main/webapp/images/icons/space-icon-default.gif b/packaging/war/src/main/webapp/images/icons/space-icon-default.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-default.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-default.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-doc-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-doc-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-doc-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-doc-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-doc-16.png b/packaging/war/src/main/webapp/images/icons/space-icon-doc-16.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-doc-16.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-doc-16.png
diff --git a/war/src/main/webapp/images/icons/space-icon-doc-64.png b/packaging/war/src/main/webapp/images/icons/space-icon-doc-64.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-doc-64.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-doc-64.png
diff --git a/war/src/main/webapp/images/icons/space-icon-doc.gif b/packaging/war/src/main/webapp/images/icons/space-icon-doc.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-doc.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-doc.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-image-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-image-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-image-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-image-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-image-16.png b/packaging/war/src/main/webapp/images/icons/space-icon-image-16.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-image-16.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-image-16.png
diff --git a/war/src/main/webapp/images/icons/space-icon-image-64.png b/packaging/war/src/main/webapp/images/icons/space-icon-image-64.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-image-64.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-image-64.png
diff --git a/war/src/main/webapp/images/icons/space-icon-image.gif b/packaging/war/src/main/webapp/images/icons/space-icon-image.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-image.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-image.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-link-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-link-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-link-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-link-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-link.gif b/packaging/war/src/main/webapp/images/icons/space-icon-link.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-link.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-link.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-pen-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-pen-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-pen-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-pen-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-pen-16.png b/packaging/war/src/main/webapp/images/icons/space-icon-pen-16.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-pen-16.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-pen-16.png
diff --git a/war/src/main/webapp/images/icons/space-icon-pen-64.png b/packaging/war/src/main/webapp/images/icons/space-icon-pen-64.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-pen-64.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-pen-64.png
diff --git a/war/src/main/webapp/images/icons/space-icon-pen.gif b/packaging/war/src/main/webapp/images/icons/space-icon-pen.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-pen.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-pen.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-star-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-star-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-star-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-star-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-star-16.png b/packaging/war/src/main/webapp/images/icons/space-icon-star-16.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-star-16.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-star-16.png
diff --git a/war/src/main/webapp/images/icons/space-icon-star-64.png b/packaging/war/src/main/webapp/images/icons/space-icon-star-64.png
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-star-64.png
rename to packaging/war/src/main/webapp/images/icons/space-icon-star-64.png
diff --git a/war/src/main/webapp/images/icons/space-icon-star.gif b/packaging/war/src/main/webapp/images/icons/space-icon-star.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-star.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-star.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-website-16.gif b/packaging/war/src/main/webapp/images/icons/space-icon-website-16.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-website-16.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-website-16.gif
diff --git a/war/src/main/webapp/images/icons/space-icon-website.gif b/packaging/war/src/main/webapp/images/icons/space-icon-website.gif
similarity index 100%
rename from war/src/main/webapp/images/icons/space-icon-website.gif
rename to packaging/war/src/main/webapp/images/icons/space-icon-website.gif
diff --git a/war/src/main/webapp/images/logo/AlfrescoFadedBG.png b/packaging/war/src/main/webapp/images/logo/AlfrescoFadedBG.png
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoFadedBG.png
rename to packaging/war/src/main/webapp/images/logo/AlfrescoFadedBG.png
diff --git a/war/src/main/webapp/images/logo/AlfrescoLogo16.gif b/packaging/war/src/main/webapp/images/logo/AlfrescoLogo16.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoLogo16.gif
rename to packaging/war/src/main/webapp/images/logo/AlfrescoLogo16.gif
diff --git a/war/src/main/webapp/images/logo/AlfrescoLogo16.ico b/packaging/war/src/main/webapp/images/logo/AlfrescoLogo16.ico
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoLogo16.ico
rename to packaging/war/src/main/webapp/images/logo/AlfrescoLogo16.ico
diff --git a/war/src/main/webapp/images/logo/AlfrescoLogo200.png b/packaging/war/src/main/webapp/images/logo/AlfrescoLogo200.png
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoLogo200.png
rename to packaging/war/src/main/webapp/images/logo/AlfrescoLogo200.png
diff --git a/war/src/main/webapp/images/logo/AlfrescoLogo32.gif b/packaging/war/src/main/webapp/images/logo/AlfrescoLogo32.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoLogo32.gif
rename to packaging/war/src/main/webapp/images/logo/AlfrescoLogo32.gif
diff --git a/war/src/main/webapp/images/logo/AlfrescoLogo32.png b/packaging/war/src/main/webapp/images/logo/AlfrescoLogo32.png
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoLogo32.png
rename to packaging/war/src/main/webapp/images/logo/AlfrescoLogo32.png
diff --git a/war/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif b/packaging/war/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif
rename to packaging/war/src/main/webapp/images/logo/AlfrescoLogo32_bluebg.gif
diff --git a/war/src/main/webapp/images/logo/alf_task_bg.png b/packaging/war/src/main/webapp/images/logo/alf_task_bg.png
similarity index 100%
rename from war/src/main/webapp/images/logo/alf_task_bg.png
rename to packaging/war/src/main/webapp/images/logo/alf_task_bg.png
diff --git a/war/src/main/webapp/images/logo/alfresco3d.jpg b/packaging/war/src/main/webapp/images/logo/alfresco3d.jpg
similarity index 100%
rename from war/src/main/webapp/images/logo/alfresco3d.jpg
rename to packaging/war/src/main/webapp/images/logo/alfresco3d.jpg
diff --git a/war/src/main/webapp/images/logo/alfresco_logo.gif b/packaging/war/src/main/webapp/images/logo/alfresco_logo.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/alfresco_logo.gif
rename to packaging/war/src/main/webapp/images/logo/alfresco_logo.gif
diff --git a/war/src/main/webapp/images/logo/asf_logo_wide.gif b/packaging/war/src/main/webapp/images/logo/asf_logo_wide.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/asf_logo_wide.gif
rename to packaging/war/src/main/webapp/images/logo/asf_logo_wide.gif
diff --git a/war/src/main/webapp/images/logo/cglib.png b/packaging/war/src/main/webapp/images/logo/cglib.png
similarity index 100%
rename from war/src/main/webapp/images/logo/cglib.png
rename to packaging/war/src/main/webapp/images/logo/cglib.png
diff --git a/war/src/main/webapp/images/logo/cmis_logo.png b/packaging/war/src/main/webapp/images/logo/cmis_logo.png
similarity index 100%
rename from war/src/main/webapp/images/logo/cmis_logo.png
rename to packaging/war/src/main/webapp/images/logo/cmis_logo.png
diff --git a/war/src/main/webapp/images/logo/cmis_logo_100.png b/packaging/war/src/main/webapp/images/logo/cmis_logo_100.png
similarity index 100%
rename from war/src/main/webapp/images/logo/cmis_logo_100.png
rename to packaging/war/src/main/webapp/images/logo/cmis_logo_100.png
diff --git a/war/src/main/webapp/images/logo/eclipse_logo.jpg b/packaging/war/src/main/webapp/images/logo/eclipse_logo.jpg
similarity index 100%
rename from war/src/main/webapp/images/logo/eclipse_logo.jpg
rename to packaging/war/src/main/webapp/images/logo/eclipse_logo.jpg
diff --git a/war/src/main/webapp/images/logo/freemarker.png b/packaging/war/src/main/webapp/images/logo/freemarker.png
similarity index 100%
rename from war/src/main/webapp/images/logo/freemarker.png
rename to packaging/war/src/main/webapp/images/logo/freemarker.png
diff --git a/war/src/main/webapp/images/logo/hazelcast.png b/packaging/war/src/main/webapp/images/logo/hazelcast.png
similarity index 100%
rename from war/src/main/webapp/images/logo/hazelcast.png
rename to packaging/war/src/main/webapp/images/logo/hazelcast.png
diff --git a/war/src/main/webapp/images/logo/ibatis.png b/packaging/war/src/main/webapp/images/logo/ibatis.png
similarity index 100%
rename from war/src/main/webapp/images/logo/ibatis.png
rename to packaging/war/src/main/webapp/images/logo/ibatis.png
diff --git a/war/src/main/webapp/images/logo/jakarta-logo.gif b/packaging/war/src/main/webapp/images/logo/jakarta-logo.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/jakarta-logo.gif
rename to packaging/war/src/main/webapp/images/logo/jakarta-logo.gif
diff --git a/war/src/main/webapp/images/logo/java.gif b/packaging/war/src/main/webapp/images/logo/java.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/java.gif
rename to packaging/war/src/main/webapp/images/logo/java.gif
diff --git a/war/src/main/webapp/images/logo/jbosslogo.gif b/packaging/war/src/main/webapp/images/logo/jbosslogo.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/jbosslogo.gif
rename to packaging/war/src/main/webapp/images/logo/jbosslogo.gif
diff --git a/war/src/main/webapp/images/logo/jooreports.png b/packaging/war/src/main/webapp/images/logo/jooreports.png
similarity index 100%
rename from war/src/main/webapp/images/logo/jooreports.png
rename to packaging/war/src/main/webapp/images/logo/jooreports.png
diff --git a/war/src/main/webapp/images/logo/libreoffice.png b/packaging/war/src/main/webapp/images/logo/libreoffice.png
similarity index 100%
rename from war/src/main/webapp/images/logo/libreoffice.png
rename to packaging/war/src/main/webapp/images/logo/libreoffice.png
diff --git a/war/src/main/webapp/images/logo/logo.png b/packaging/war/src/main/webapp/images/logo/logo.png
similarity index 100%
rename from war/src/main/webapp/images/logo/logo.png
rename to packaging/war/src/main/webapp/images/logo/logo.png
diff --git a/war/src/main/webapp/images/logo/lucene.gif b/packaging/war/src/main/webapp/images/logo/lucene.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/lucene.gif
rename to packaging/war/src/main/webapp/images/logo/lucene.gif
diff --git a/war/src/main/webapp/images/logo/mybatis.png b/packaging/war/src/main/webapp/images/logo/mybatis.png
similarity index 100%
rename from war/src/main/webapp/images/logo/mybatis.png
rename to packaging/war/src/main/webapp/images/logo/mybatis.png
diff --git a/war/src/main/webapp/images/logo/myfaces.png b/packaging/war/src/main/webapp/images/logo/myfaces.png
similarity index 100%
rename from war/src/main/webapp/images/logo/myfaces.png
rename to packaging/war/src/main/webapp/images/logo/myfaces.png
diff --git a/war/src/main/webapp/images/logo/pdfbox.gif b/packaging/war/src/main/webapp/images/logo/pdfbox.gif
similarity index 100%
rename from war/src/main/webapp/images/logo/pdfbox.gif
rename to packaging/war/src/main/webapp/images/logo/pdfbox.gif
diff --git a/war/src/main/webapp/images/logo/sflogo.php.png b/packaging/war/src/main/webapp/images/logo/sflogo.php.png
similarity index 100%
rename from war/src/main/webapp/images/logo/sflogo.php.png
rename to packaging/war/src/main/webapp/images/logo/sflogo.php.png
diff --git a/war/src/main/webapp/images/logo/solr.png b/packaging/war/src/main/webapp/images/logo/solr.png
similarity index 100%
rename from war/src/main/webapp/images/logo/solr.png
rename to packaging/war/src/main/webapp/images/logo/solr.png
diff --git a/war/src/main/webapp/images/logo/spring_logo.jpg b/packaging/war/src/main/webapp/images/logo/spring_logo.jpg
similarity index 100%
rename from war/src/main/webapp/images/logo/spring_logo.jpg
rename to packaging/war/src/main/webapp/images/logo/spring_logo.jpg
diff --git a/war/src/main/webapp/images/logo/subversion_logo.png b/packaging/war/src/main/webapp/images/logo/subversion_logo.png
similarity index 100%
rename from war/src/main/webapp/images/logo/subversion_logo.png
rename to packaging/war/src/main/webapp/images/logo/subversion_logo.png
diff --git a/war/src/main/webapp/images/logo/tinymce.png b/packaging/war/src/main/webapp/images/logo/tinymce.png
similarity index 100%
rename from war/src/main/webapp/images/logo/tinymce.png
rename to packaging/war/src/main/webapp/images/logo/tinymce.png
diff --git a/war/src/main/webapp/index.jsp b/packaging/war/src/main/webapp/index.jsp
similarity index 100%
rename from war/src/main/webapp/index.jsp
rename to packaging/war/src/main/webapp/index.jsp
diff --git a/war/src/main/webapp/scripts/FileSaver.js b/packaging/war/src/main/webapp/scripts/FileSaver.js
similarity index 100%
rename from war/src/main/webapp/scripts/FileSaver.js
rename to packaging/war/src/main/webapp/scripts/FileSaver.js
diff --git a/war/src/main/webapp/scripts/smoothie.js b/packaging/war/src/main/webapp/scripts/smoothie.js
similarity index 100%
rename from war/src/main/webapp/scripts/smoothie.js
rename to packaging/war/src/main/webapp/scripts/smoothie.js
diff --git a/war/src/main/webapp/scripts/yui-3.3.0-dependencies.js b/packaging/war/src/main/webapp/scripts/yui-3.3.0-dependencies.js
similarity index 100%
rename from war/src/main/webapp/scripts/yui-3.3.0-dependencies.js
rename to packaging/war/src/main/webapp/scripts/yui-3.3.0-dependencies.js