diff --git a/.externalToolBuilders/JibX.launch b/repository/.externalToolBuilders/JibX.launch
similarity index 100%
rename from .externalToolBuilders/JibX.launch
rename to repository/.externalToolBuilders/JibX.launch
diff --git a/.gitbugtraq b/repository/.gitbugtraq
similarity index 100%
rename from .gitbugtraq
rename to repository/.gitbugtraq
diff --git a/.gitignore b/repository/.gitignore
similarity index 100%
rename from .gitignore
rename to repository/.gitignore
diff --git a/.travis.settings.xml b/repository/.travis.settings.xml
similarity index 100%
rename from .travis.settings.xml
rename to repository/.travis.settings.xml
diff --git a/.travis.yml b/repository/.travis.yml
similarity index 100%
rename from .travis.yml
rename to repository/.travis.yml
diff --git a/.whitesource b/repository/.whitesource
similarity index 100%
rename from .whitesource
rename to repository/.whitesource
diff --git a/.wss-unified-agent.config b/repository/.wss-unified-agent.config
similarity index 100%
rename from .wss-unified-agent.config
rename to repository/.wss-unified-agent.config
diff --git a/CONTRIBUTING.md b/repository/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to repository/CONTRIBUTING.md
diff --git a/LICENSE b/repository/LICENSE
similarity index 100%
rename from LICENSE
rename to repository/LICENSE
diff --git a/README.md b/repository/README.md
similarity index 100%
rename from README.md
rename to repository/README.md
diff --git a/docs/README.md b/repository/docs/README.md
similarity index 100%
rename from docs/README.md
rename to repository/docs/README.md
diff --git a/docs/event-log/audit/resource/data/audit-data.png b/repository/docs/event-log/audit/resource/data/audit-data.png
similarity index 100%
rename from docs/event-log/audit/resource/data/audit-data.png
rename to repository/docs/event-log/audit/resource/data/audit-data.png
diff --git a/docs/event-log/audit/resource/data/audit-data.puml b/repository/docs/event-log/audit/resource/data/audit-data.puml
similarity index 100%
rename from docs/event-log/audit/resource/data/audit-data.puml
rename to repository/docs/event-log/audit/resource/data/audit-data.puml
diff --git a/docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities.png b/repository/docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities.png
similarity index 100%
rename from docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities.png
rename to repository/docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities.png
diff --git a/docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities_mnt_16220.png b/repository/docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities_mnt_16220.png
similarity index 100%
rename from docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities_mnt_16220.png
rename to repository/docs/event-log/audit/resource/data/audit_and_attribute_high_level_entities_mnt_16220.png
diff --git a/docs/event-log/audit/resource/data/audit_and_attribute_sql_entities.png b/repository/docs/event-log/audit/resource/data/audit_and_attribute_sql_entities.png
similarity index 100%
rename from docs/event-log/audit/resource/data/audit_and_attribute_sql_entities.png
rename to repository/docs/event-log/audit/resource/data/audit_and_attribute_sql_entities.png
diff --git a/docs/event-log/audit/resource/data/audit_and_attribute_sql_entities_mnt_16220.png b/repository/docs/event-log/audit/resource/data/audit_and_attribute_sql_entities_mnt_16220.png
similarity index 100%
rename from docs/event-log/audit/resource/data/audit_and_attribute_sql_entities_mnt_16220.png
rename to repository/docs/event-log/audit/resource/data/audit_and_attribute_sql_entities_mnt_16220.png
diff --git a/docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.png b/repository/docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.png
similarity index 100%
rename from docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.png
rename to repository/docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.png
diff --git a/docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.puml b/repository/docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.puml
similarity index 100%
rename from docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.puml
rename to repository/docs/file-protocols/ftp-protocol/resource/class/ftp-class-diagram.puml
diff --git a/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.png b/repository/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.png
similarity index 100%
rename from docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.png
rename to repository/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.png
diff --git a/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml b/repository/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml
similarity index 100%
rename from docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml
rename to repository/docs/file-protocols/webdav-protocol/resource/class/webdav-class-diagram.puml
diff --git a/docs/identity-provider/authentication/README.md b/repository/docs/identity-provider/authentication/README.md
similarity index 100%
rename from docs/identity-provider/authentication/README.md
rename to repository/docs/identity-provider/authentication/README.md
diff --git a/docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.png b/repository/docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.png
similarity index 100%
rename from docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.png
rename to repository/docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.png
diff --git a/docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.puml b/repository/docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.puml
similarity index 100%
rename from docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.puml
rename to repository/docs/identity-provider/authentication/resource/sequence/login-using-default-authentication.puml
diff --git a/docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.png b/repository/docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.png
similarity index 100%
rename from docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.png
rename to repository/docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.png
diff --git a/docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.puml b/repository/docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.puml
similarity index 100%
rename from docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.puml
rename to repository/docs/identity-provider/resource/class/org.alfresco.repo.security.authentication.puml
diff --git a/docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.png b/repository/docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.png
similarity index 100%
rename from docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.png
rename to repository/docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.png
diff --git a/docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.puml b/repository/docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.puml
similarity index 100%
rename from docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.puml
rename to repository/docs/identity-provider/resource/class/org.alfresco.service.cmr.security.class.puml
diff --git a/docs/infrastructure/README.md b/repository/docs/infrastructure/README.md
similarity index 100%
rename from docs/infrastructure/README.md
rename to repository/docs/infrastructure/README.md
diff --git a/docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.png b/repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.png
rename to repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.png
diff --git a/docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.puml b/repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-aws.puml
diff --git a/docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.png b/repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.png
rename to repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.png
diff --git a/docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.puml b/repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class-generated.puml
diff --git a/docs/infrastructure/multi-tenancy/resource/class/tenant-class.png b/repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/class/tenant-class.png
rename to repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class.png
diff --git a/docs/infrastructure/multi-tenancy/resource/class/tenant-class.puml b/repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/class/tenant-class.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/class/tenant-class.puml
diff --git a/docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.png b/repository/docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.png
rename to repository/docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.png
diff --git a/docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.puml b/repository/docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/component/tenant-component-aws.puml
diff --git a/docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.png b/repository/docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.png
rename to repository/docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.png
diff --git a/docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.puml b/repository/docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/component/tenant-scopes.puml
diff --git a/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.png b/repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.png
rename to repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.png
diff --git a/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.puml b/repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence-aws.puml
diff --git a/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.png b/repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.png
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.png
rename to repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.png
diff --git a/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.puml b/repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.puml
similarity index 100%
rename from docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.puml
rename to repository/docs/infrastructure/multi-tenancy/resource/sequence/create-tenant-sequence.puml
diff --git a/docs/infrastructure/policies-and-behaviours/resource/class/policy-class.png b/repository/docs/infrastructure/policies-and-behaviours/resource/class/policy-class.png
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/class/policy-class.png
rename to repository/docs/infrastructure/policies-and-behaviours/resource/class/policy-class.png
diff --git a/docs/infrastructure/policies-and-behaviours/resource/class/policy-class.puml b/repository/docs/infrastructure/policies-and-behaviours/resource/class/policy-class.puml
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/class/policy-class.puml
rename to repository/docs/infrastructure/policies-and-behaviours/resource/class/policy-class.puml
diff --git a/docs/infrastructure/policies-and-behaviours/resource/class/policy-class_001.png b/repository/docs/infrastructure/policies-and-behaviours/resource/class/policy-class_001.png
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/class/policy-class_001.png
rename to repository/docs/infrastructure/policies-and-behaviours/resource/class/policy-class_001.png
diff --git a/docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.png b/repository/docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.png
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.png
rename to repository/docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.png
diff --git a/docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.puml b/repository/docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.puml
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.puml
rename to repository/docs/infrastructure/policies-and-behaviours/resource/component/queued-policies-component.puml
diff --git a/docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.png b/repository/docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.png
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.png
rename to repository/docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.png
diff --git a/docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.puml b/repository/docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.puml
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.puml
rename to repository/docs/infrastructure/policies-and-behaviours/resource/sequence/register-policy-endpoint.puml
diff --git a/docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.png b/repository/docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.png
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.png
rename to repository/docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.png
diff --git a/docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.puml b/repository/docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.puml
similarity index 100%
rename from docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.puml
rename to repository/docs/infrastructure/policies-and-behaviours/resource/sequence/reload-policy-endpoints.puml
diff --git a/docs/meta-data-services/node-storage-and-retrieval/README.md b/repository/docs/meta-data-services/node-storage-and-retrieval/README.md
similarity index 100%
rename from docs/meta-data-services/node-storage-and-retrieval/README.md
rename to repository/docs/meta-data-services/node-storage-and-retrieval/README.md
diff --git a/docs/meta-data-services/versions/README.md b/repository/docs/meta-data-services/versions/README.md
similarity index 100%
rename from docs/meta-data-services/versions/README.md
rename to repository/docs/meta-data-services/versions/README.md
diff --git a/docs/meta-data-services/versions/resource/sequence/autoversionprops.png b/repository/docs/meta-data-services/versions/resource/sequence/autoversionprops.png
similarity index 100%
rename from docs/meta-data-services/versions/resource/sequence/autoversionprops.png
rename to repository/docs/meta-data-services/versions/resource/sequence/autoversionprops.png
diff --git a/docs/meta-data-services/versions/resource/sequence/autoversionprops.puml b/repository/docs/meta-data-services/versions/resource/sequence/autoversionprops.puml
similarity index 100%
rename from docs/meta-data-services/versions/resource/sequence/autoversionprops.puml
rename to repository/docs/meta-data-services/versions/resource/sequence/autoversionprops.puml
diff --git a/docs/meta-data-services/versions/resource/sequence/noautoversionprops.png b/repository/docs/meta-data-services/versions/resource/sequence/noautoversionprops.png
similarity index 100%
rename from docs/meta-data-services/versions/resource/sequence/noautoversionprops.png
rename to repository/docs/meta-data-services/versions/resource/sequence/noautoversionprops.png
diff --git a/docs/meta-data-services/versions/resource/sequence/noautoversionprops.puml b/repository/docs/meta-data-services/versions/resource/sequence/noautoversionprops.puml
similarity index 100%
rename from docs/meta-data-services/versions/resource/sequence/noautoversionprops.puml
rename to repository/docs/meta-data-services/versions/resource/sequence/noautoversionprops.puml
diff --git a/docs/rules-engine/actions/resource/class/async-actions-class.png b/repository/docs/rules-engine/actions/resource/class/async-actions-class.png
similarity index 100%
rename from docs/rules-engine/actions/resource/class/async-actions-class.png
rename to repository/docs/rules-engine/actions/resource/class/async-actions-class.png
diff --git a/docs/rules-engine/actions/resource/class/async-actions-class.puml b/repository/docs/rules-engine/actions/resource/class/async-actions-class.puml
similarity index 100%
rename from docs/rules-engine/actions/resource/class/async-actions-class.puml
rename to repository/docs/rules-engine/actions/resource/class/async-actions-class.puml
diff --git a/docs/rules-engine/actions/resource/class/queued-actions-class.png b/repository/docs/rules-engine/actions/resource/class/queued-actions-class.png
similarity index 100%
rename from docs/rules-engine/actions/resource/class/queued-actions-class.png
rename to repository/docs/rules-engine/actions/resource/class/queued-actions-class.png
diff --git a/docs/rules-engine/actions/resource/class/queued-actions-class.puml b/repository/docs/rules-engine/actions/resource/class/queued-actions-class.puml
similarity index 100%
rename from docs/rules-engine/actions/resource/class/queued-actions-class.puml
rename to repository/docs/rules-engine/actions/resource/class/queued-actions-class.puml
diff --git a/docs/rules-engine/rules/resource/class/rule-definition.png b/repository/docs/rules-engine/rules/resource/class/rule-definition.png
similarity index 100%
rename from docs/rules-engine/rules/resource/class/rule-definition.png
rename to repository/docs/rules-engine/rules/resource/class/rule-definition.png
diff --git a/docs/rules-engine/rules/resource/class/rule-definition.puml b/repository/docs/rules-engine/rules/resource/class/rule-definition.puml
similarity index 100%
rename from docs/rules-engine/rules/resource/class/rule-definition.puml
rename to repository/docs/rules-engine/rules/resource/class/rule-definition.puml
diff --git a/docs/transformation/renditions/resource/component/transformation-farm.png b/repository/docs/transformation/renditions/resource/component/transformation-farm.png
similarity index 100%
rename from docs/transformation/renditions/resource/component/transformation-farm.png
rename to repository/docs/transformation/renditions/resource/component/transformation-farm.png
diff --git a/docs/transformation/renditions/resource/component/transformation-farm.puml b/repository/docs/transformation/renditions/resource/component/transformation-farm.puml
similarity index 100%
rename from docs/transformation/renditions/resource/component/transformation-farm.puml
rename to repository/docs/transformation/renditions/resource/component/transformation-farm.puml
diff --git a/l10n.properties b/repository/l10n.properties
similarity index 100%
rename from l10n.properties
rename to repository/l10n.properties
diff --git a/pom.xml b/repository/pom.xml
similarity index 100%
rename from pom.xml
rename to repository/pom.xml
diff --git a/src/main/META-INF/bm-remote-manifest.mf b/repository/src/main/META-INF/bm-remote-manifest.mf
similarity index 100%
rename from src/main/META-INF/bm-remote-manifest.mf
rename to repository/src/main/META-INF/bm-remote-manifest.mf
diff --git a/src/main/META-INF/mmt-manifest.mf b/repository/src/main/META-INF/mmt-manifest.mf
similarity index 100%
rename from src/main/META-INF/mmt-manifest.mf
rename to repository/src/main/META-INF/mmt-manifest.mf
diff --git a/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java b/repository/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java
similarity index 100%
rename from src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java
rename to repository/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java
diff --git a/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/CallContextAwareCmisService.java b/repository/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/CallContextAwareCmisService.java
similarity index 100%
rename from src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/CallContextAwareCmisService.java
rename to repository/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/CallContextAwareCmisService.java
diff --git a/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java b/repository/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java
similarity index 100%
rename from src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java
rename to repository/src/main/java/lib3party/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java
diff --git a/src/main/java/org/alfresco/email/server/AliasableAspect.java b/repository/src/main/java/org/alfresco/email/server/AliasableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/AliasableAspect.java
rename to repository/src/main/java/org/alfresco/email/server/AliasableAspect.java
diff --git a/src/main/java/org/alfresco/email/server/AliasableAspectCopyBehaviourCallback.java b/repository/src/main/java/org/alfresco/email/server/AliasableAspectCopyBehaviourCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/AliasableAspectCopyBehaviourCallback.java
rename to repository/src/main/java/org/alfresco/email/server/AliasableAspectCopyBehaviourCallback.java
diff --git a/src/main/java/org/alfresco/email/server/EmailServer.java b/repository/src/main/java/org/alfresco/email/server/EmailServer.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/EmailServer.java
rename to repository/src/main/java/org/alfresco/email/server/EmailServer.java
diff --git a/src/main/java/org/alfresco/email/server/EmailServerModel.java b/repository/src/main/java/org/alfresco/email/server/EmailServerModel.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/EmailServerModel.java
rename to repository/src/main/java/org/alfresco/email/server/EmailServerModel.java
diff --git a/src/main/java/org/alfresco/email/server/EmailServiceImpl.java b/repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/EmailServiceImpl.java
rename to repository/src/main/java/org/alfresco/email/server/EmailServiceImpl.java
diff --git a/src/main/java/org/alfresco/email/server/EmailServiceRemotable.java b/repository/src/main/java/org/alfresco/email/server/EmailServiceRemotable.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/EmailServiceRemotable.java
rename to repository/src/main/java/org/alfresco/email/server/EmailServiceRemotable.java
diff --git a/src/main/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/handler/AbstractForumEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/AbstractForumEmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/AbstractForumEmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/AbstractForumEmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/handler/DocumentEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/DocumentEmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/DocumentEmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/DocumentEmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/handler/EmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/EmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/EmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/EmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/FolderEmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/handler/ForumEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/ForumEmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/ForumEmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/ForumEmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/handler/TopicEmailMessageHandler.java b/repository/src/main/java/org/alfresco/email/server/handler/TopicEmailMessageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/handler/TopicEmailMessageHandler.java
rename to repository/src/main/java/org/alfresco/email/server/handler/TopicEmailMessageHandler.java
diff --git a/src/main/java/org/alfresco/email/server/impl/EmailMessageImpl.java b/repository/src/main/java/org/alfresco/email/server/impl/EmailMessageImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/impl/EmailMessageImpl.java
rename to repository/src/main/java/org/alfresco/email/server/impl/EmailMessageImpl.java
diff --git a/src/main/java/org/alfresco/email/server/impl/EmailMessagePartImpl.java b/repository/src/main/java/org/alfresco/email/server/impl/EmailMessagePartImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/impl/EmailMessagePartImpl.java
rename to repository/src/main/java/org/alfresco/email/server/impl/EmailMessagePartImpl.java
diff --git a/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java
rename to repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessage.java
diff --git a/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java
rename to repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailMessagePart.java
diff --git a/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java b/repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java
similarity index 100%
rename from src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java
rename to repository/src/main/java/org/alfresco/email/server/impl/subetha/SubethaEmailServer.java
diff --git a/src/main/java/org/alfresco/encryption/BootstrapReEncryptor.java b/repository/src/main/java/org/alfresco/encryption/BootstrapReEncryptor.java
similarity index 100%
rename from src/main/java/org/alfresco/encryption/BootstrapReEncryptor.java
rename to repository/src/main/java/org/alfresco/encryption/BootstrapReEncryptor.java
diff --git a/src/main/java/org/alfresco/encryption/EncryptionChecker.java b/repository/src/main/java/org/alfresco/encryption/EncryptionChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/encryption/EncryptionChecker.java
rename to repository/src/main/java/org/alfresco/encryption/EncryptionChecker.java
diff --git a/src/main/java/org/alfresco/encryption/EncryptionKeysRegistryImpl.java b/repository/src/main/java/org/alfresco/encryption/EncryptionKeysRegistryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/encryption/EncryptionKeysRegistryImpl.java
rename to repository/src/main/java/org/alfresco/encryption/EncryptionKeysRegistryImpl.java
diff --git a/src/main/java/org/alfresco/encryption/KeyStoreChecker.java b/repository/src/main/java/org/alfresco/encryption/KeyStoreChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/encryption/KeyStoreChecker.java
rename to repository/src/main/java/org/alfresco/encryption/KeyStoreChecker.java
diff --git a/src/main/java/org/alfresco/encryption/ReEncryptor.java b/repository/src/main/java/org/alfresco/encryption/ReEncryptor.java
similarity index 100%
rename from src/main/java/org/alfresco/encryption/ReEncryptor.java
rename to repository/src/main/java/org/alfresco/encryption/ReEncryptor.java
diff --git a/src/main/java/org/alfresco/filesys/AbstractServerConfigurationBean.java b/repository/src/main/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
rename to repository/src/main/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
diff --git a/src/main/java/org/alfresco/filesys/AlfrescoConfigSection.java b/repository/src/main/java/org/alfresco/filesys/AlfrescoConfigSection.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/AlfrescoConfigSection.java
rename to repository/src/main/java/org/alfresco/filesys/AlfrescoConfigSection.java
diff --git a/src/main/java/org/alfresco/filesys/ExtendedServerConfigurationAccessor.java b/repository/src/main/java/org/alfresco/filesys/ExtendedServerConfigurationAccessor.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/ExtendedServerConfigurationAccessor.java
rename to repository/src/main/java/org/alfresco/filesys/ExtendedServerConfigurationAccessor.java
diff --git a/src/main/java/org/alfresco/filesys/FTPServerBean.java b/repository/src/main/java/org/alfresco/filesys/FTPServerBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/FTPServerBean.java
rename to repository/src/main/java/org/alfresco/filesys/FTPServerBean.java
diff --git a/src/main/java/org/alfresco/filesys/FileServerConfig.java b/repository/src/main/java/org/alfresco/filesys/FileServerConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/FileServerConfig.java
rename to repository/src/main/java/org/alfresco/filesys/FileServerConfig.java
diff --git a/src/main/java/org/alfresco/filesys/FileServerConfigMBean.java b/repository/src/main/java/org/alfresco/filesys/FileServerConfigMBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/FileServerConfigMBean.java
rename to repository/src/main/java/org/alfresco/filesys/FileServerConfigMBean.java
diff --git a/src/main/java/org/alfresco/filesys/NullSessionListener.java b/repository/src/main/java/org/alfresco/filesys/NullSessionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/NullSessionListener.java
rename to repository/src/main/java/org/alfresco/filesys/NullSessionListener.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfo.java b/repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfo.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfo.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfoFactory.java b/repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfoFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfoFactory.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoClientInfoFactory.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/AlfrescoContext.java b/repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java b/repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/AlfrescoNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/AlfrescoNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/AlfrescoTxDiskDriver.java b/repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoTxDiskDriver.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/AlfrescoTxDiskDriver.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/AlfrescoTxDiskDriver.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/ExtendedDiskInterface.java b/repository/src/main/java/org/alfresco/filesys/alfresco/ExtendedDiskInterface.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/ExtendedDiskInterface.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/ExtendedDiskInterface.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/FilesysTransaction.java b/repository/src/main/java/org/alfresco/filesys/alfresco/FilesysTransaction.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/FilesysTransaction.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/FilesysTransaction.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java b/repository/src/main/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/NetworkFileLegacyReferenceCount.java b/repository/src/main/java/org/alfresco/filesys/alfresco/NetworkFileLegacyReferenceCount.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/NetworkFileLegacyReferenceCount.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/NetworkFileLegacyReferenceCount.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java b/repository/src/main/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/RepositoryDiskInterface.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/ShuffleCache.java b/repository/src/main/java/org/alfresco/filesys/alfresco/ShuffleCache.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/ShuffleCache.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/ShuffleCache.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/ShuffleCacheImpl.java b/repository/src/main/java/org/alfresco/filesys/alfresco/ShuffleCacheImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/ShuffleCacheImpl.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/ShuffleCacheImpl.java
diff --git a/src/main/java/org/alfresco/filesys/alfresco/package-info.java b/repository/src/main/java/org/alfresco/filesys/alfresco/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/alfresco/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/alfresco/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/auth/ftp/AlfrescoFtpAuthenticator.java b/repository/src/main/java/org/alfresco/filesys/auth/ftp/AlfrescoFtpAuthenticator.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/ftp/AlfrescoFtpAuthenticator.java
rename to repository/src/main/java/org/alfresco/filesys/auth/ftp/AlfrescoFtpAuthenticator.java
diff --git a/src/main/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java b/repository/src/main/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java
rename to repository/src/main/java/org/alfresco/filesys/auth/ftp/FTPAuthenticatorBase.java
diff --git a/src/main/java/org/alfresco/filesys/auth/ftp/package-info.java b/repository/src/main/java/org/alfresco/filesys/auth/ftp/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/ftp/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/auth/ftp/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java b/repository/src/main/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java
rename to repository/src/main/java/org/alfresco/filesys/auth/nfs/AlfrescoRpcAuthenticator.java
diff --git a/src/main/java/org/alfresco/filesys/auth/nfs/UserMapping.java b/repository/src/main/java/org/alfresco/filesys/auth/nfs/UserMapping.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/nfs/UserMapping.java
rename to repository/src/main/java/org/alfresco/filesys/auth/nfs/UserMapping.java
diff --git a/src/main/java/org/alfresco/filesys/auth/nfs/package-info.java b/repository/src/main/java/org/alfresco/filesys/auth/nfs/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/nfs/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/auth/nfs/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/auth/package-info.java b/repository/src/main/java/org/alfresco/filesys/auth/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/auth/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/auth/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/config/CoreServerConfigBean.java b/repository/src/main/java/org/alfresco/filesys/config/CoreServerConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/CoreServerConfigBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/CoreServerConfigBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/DomainMappingConfigBean.java b/repository/src/main/java/org/alfresco/filesys/config/DomainMappingConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/DomainMappingConfigBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/DomainMappingConfigBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/FTPConfigBean.java b/repository/src/main/java/org/alfresco/filesys/config/FTPConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/FTPConfigBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/FTPConfigBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/FileServerConfigurationFactory.java b/repository/src/main/java/org/alfresco/filesys/config/FileServerConfigurationFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/FileServerConfigurationFactory.java
rename to repository/src/main/java/org/alfresco/filesys/config/FileServerConfigurationFactory.java
diff --git a/src/main/java/org/alfresco/filesys/config/MemoryPacketConfigBean.java b/repository/src/main/java/org/alfresco/filesys/config/MemoryPacketConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/MemoryPacketConfigBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/MemoryPacketConfigBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/SecurityConfigBean.java b/repository/src/main/java/org/alfresco/filesys/config/SecurityConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/SecurityConfigBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/SecurityConfigBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/repository/src/main/java/org/alfresco/filesys/config/ServerConfigurationBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/ServerConfigurationBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/ServerConfigurationBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/AccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/AccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/AccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/AccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/AccessControlListBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/AccessControlListBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/AccessControlListBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/AccessControlListBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/DomainAccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/DomainAccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/DomainAccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/DomainAccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/GidAccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/GidAccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/GidAccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/GidAccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/IpAddressAccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/IpAddressAccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/IpAddressAccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/IpAddressAccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/ProtocolAccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/ProtocolAccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/ProtocolAccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/ProtocolAccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/UidAccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/UidAccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/UidAccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/UidAccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/UserAccessControlBean.java b/repository/src/main/java/org/alfresco/filesys/config/acl/UserAccessControlBean.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/UserAccessControlBean.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/UserAccessControlBean.java
diff --git a/src/main/java/org/alfresco/filesys/config/acl/package-info.java b/repository/src/main/java/org/alfresco/filesys/config/acl/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/acl/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/config/acl/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/config/package-info.java b/repository/src/main/java/org/alfresco/filesys/config/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/config/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/config/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/debug/FileServerDebugInterface.java b/repository/src/main/java/org/alfresco/filesys/debug/FileServerDebugInterface.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/debug/FileServerDebugInterface.java
rename to repository/src/main/java/org/alfresco/filesys/debug/FileServerDebugInterface.java
diff --git a/src/main/java/org/alfresco/filesys/debug/package-info.java b/repository/src/main/java/org/alfresco/filesys/debug/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/debug/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/debug/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/package-info.java b/repository/src/main/java/org/alfresco/filesys/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/repo/AlfrescoFolder.java b/repository/src/main/java/org/alfresco/filesys/repo/AlfrescoFolder.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/AlfrescoFolder.java
rename to repository/src/main/java/org/alfresco/filesys/repo/AlfrescoFolder.java
diff --git a/src/main/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java b/repository/src/main/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java
rename to repository/src/main/java/org/alfresco/filesys/repo/BufferedContentDiskDriver.java
diff --git a/src/main/java/org/alfresco/filesys/repo/BufferedWrite.java b/repository/src/main/java/org/alfresco/filesys/repo/BufferedWrite.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/BufferedWrite.java
rename to repository/src/main/java/org/alfresco/filesys/repo/BufferedWrite.java
diff --git a/src/main/java/org/alfresco/filesys/repo/CIFSContentComparator.java b/repository/src/main/java/org/alfresco/filesys/repo/CIFSContentComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/CIFSContentComparator.java
rename to repository/src/main/java/org/alfresco/filesys/repo/CIFSContentComparator.java
diff --git a/src/main/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java b/repository/src/main/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java
rename to repository/src/main/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java
diff --git a/src/main/java/org/alfresco/filesys/repo/CifsHelper.java b/repository/src/main/java/org/alfresco/filesys/repo/CifsHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/CifsHelper.java
rename to repository/src/main/java/org/alfresco/filesys/repo/CifsHelper.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ClientHelper.java b/repository/src/main/java/org/alfresco/filesys/repo/ClientHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ClientHelper.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ClientHelper.java
diff --git a/src/main/java/org/alfresco/filesys/repo/CommandExecutor.java b/repository/src/main/java/org/alfresco/filesys/repo/CommandExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/CommandExecutor.java
rename to repository/src/main/java/org/alfresco/filesys/repo/CommandExecutor.java
diff --git a/src/main/java/org/alfresco/filesys/repo/CommandExecutorImpl.java b/repository/src/main/java/org/alfresco/filesys/repo/CommandExecutorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/CommandExecutorImpl.java
rename to repository/src/main/java/org/alfresco/filesys/repo/CommandExecutorImpl.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentComparator.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentComparator.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentComparator.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentContext.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentContext.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentContext.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentContext.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentDiskCallback.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentDiskCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentDiskCallback.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentDiskCallback.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentDiskDriver.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentDiskDriver.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentDiskDriver.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentDiskDriver.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentDiskDriver2.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentDiskInterface.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentDiskInterface.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentDiskInterface.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentDiskInterface.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentFileInfo.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentFileInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentFileInfo.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentFileInfo.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentQuotaManager.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentQuotaManager.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentQuotaManager.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentQuotaManager.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ContentSearchContext.java b/repository/src/main/java/org/alfresco/filesys/repo/ContentSearchContext.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ContentSearchContext.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ContentSearchContext.java
diff --git a/src/main/java/org/alfresco/filesys/repo/CreateNodeEvent.java b/repository/src/main/java/org/alfresco/filesys/repo/CreateNodeEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/CreateNodeEvent.java
rename to repository/src/main/java/org/alfresco/filesys/repo/CreateNodeEvent.java
diff --git a/src/main/java/org/alfresco/filesys/repo/DeleteNodeEvent.java b/repository/src/main/java/org/alfresco/filesys/repo/DeleteNodeEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/DeleteNodeEvent.java
rename to repository/src/main/java/org/alfresco/filesys/repo/DeleteNodeEvent.java
diff --git a/src/main/java/org/alfresco/filesys/repo/DotDotContentSearchContext.java b/repository/src/main/java/org/alfresco/filesys/repo/DotDotContentSearchContext.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/DotDotContentSearchContext.java
rename to repository/src/main/java/org/alfresco/filesys/repo/DotDotContentSearchContext.java
diff --git a/src/main/java/org/alfresco/filesys/repo/FilesystemTransactionAdvice.java b/repository/src/main/java/org/alfresco/filesys/repo/FilesystemTransactionAdvice.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/FilesystemTransactionAdvice.java
rename to repository/src/main/java/org/alfresco/filesys/repo/FilesystemTransactionAdvice.java
diff --git a/src/main/java/org/alfresco/filesys/repo/InFlightCorrectable.java b/repository/src/main/java/org/alfresco/filesys/repo/InFlightCorrectable.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/InFlightCorrectable.java
rename to repository/src/main/java/org/alfresco/filesys/repo/InFlightCorrectable.java
diff --git a/src/main/java/org/alfresco/filesys/repo/InFlightCorrector.java b/repository/src/main/java/org/alfresco/filesys/repo/InFlightCorrector.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/InFlightCorrector.java
rename to repository/src/main/java/org/alfresco/filesys/repo/InFlightCorrector.java
diff --git a/src/main/java/org/alfresco/filesys/repo/InFlightCorrectorImpl.java b/repository/src/main/java/org/alfresco/filesys/repo/InFlightCorrectorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/InFlightCorrectorImpl.java
rename to repository/src/main/java/org/alfresco/filesys/repo/InFlightCorrectorImpl.java
diff --git a/src/main/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java b/repository/src/main/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java
rename to repository/src/main/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java
diff --git a/src/main/java/org/alfresco/filesys/repo/LinkMemoryNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/repo/LinkMemoryNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/LinkMemoryNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/LinkMemoryNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/LockKeeper.java b/repository/src/main/java/org/alfresco/filesys/repo/LockKeeper.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/LockKeeper.java
rename to repository/src/main/java/org/alfresco/filesys/repo/LockKeeper.java
diff --git a/src/main/java/org/alfresco/filesys/repo/LockKeeperImpl.java b/repository/src/main/java/org/alfresco/filesys/repo/LockKeeperImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/LockKeeperImpl.java
rename to repository/src/main/java/org/alfresco/filesys/repo/LockKeeperImpl.java
diff --git a/src/main/java/org/alfresco/filesys/repo/LockKeeperRefreshJob.java b/repository/src/main/java/org/alfresco/filesys/repo/LockKeeperRefreshJob.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/LockKeeperRefreshJob.java
rename to repository/src/main/java/org/alfresco/filesys/repo/LockKeeperRefreshJob.java
diff --git a/src/main/java/org/alfresco/filesys/repo/LockNodeEvent.java b/repository/src/main/java/org/alfresco/filesys/repo/LockNodeEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/LockNodeEvent.java
rename to repository/src/main/java/org/alfresco/filesys/repo/LockNodeEvent.java
diff --git a/src/main/java/org/alfresco/filesys/repo/MSOfficeContentNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/repo/MSOfficeContentNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/MSOfficeContentNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/MSOfficeContentNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/MoveNodeEvent.java b/repository/src/main/java/org/alfresco/filesys/repo/MoveNodeEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/MoveNodeEvent.java
rename to repository/src/main/java/org/alfresco/filesys/repo/MoveNodeEvent.java
diff --git a/src/main/java/org/alfresco/filesys/repo/NodeEvent.java b/repository/src/main/java/org/alfresco/filesys/repo/NodeEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/NodeEvent.java
rename to repository/src/main/java/org/alfresco/filesys/repo/NodeEvent.java
diff --git a/src/main/java/org/alfresco/filesys/repo/NodeEventQueue.java b/repository/src/main/java/org/alfresco/filesys/repo/NodeEventQueue.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/NodeEventQueue.java
rename to repository/src/main/java/org/alfresco/filesys/repo/NodeEventQueue.java
diff --git a/src/main/java/org/alfresco/filesys/repo/NodeMonitor.java b/repository/src/main/java/org/alfresco/filesys/repo/NodeMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/NodeMonitor.java
rename to repository/src/main/java/org/alfresco/filesys/repo/NodeMonitor.java
diff --git a/src/main/java/org/alfresco/filesys/repo/NodeMonitorFactory.java b/repository/src/main/java/org/alfresco/filesys/repo/NodeMonitorFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/NodeMonitorFactory.java
rename to repository/src/main/java/org/alfresco/filesys/repo/NodeMonitorFactory.java
diff --git a/src/main/java/org/alfresco/filesys/repo/NodeRefNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/repo/NodeRefNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/NodeRefNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/NodeRefNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java b/repository/src/main/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
rename to repository/src/main/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
diff --git a/src/main/java/org/alfresco/filesys/repo/OpenFileMode.java b/repository/src/main/java/org/alfresco/filesys/repo/OpenFileMode.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/OpenFileMode.java
rename to repository/src/main/java/org/alfresco/filesys/repo/OpenFileMode.java
diff --git a/src/main/java/org/alfresco/filesys/repo/OpenOfficeContentNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/repo/OpenOfficeContentNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/OpenOfficeContentNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/OpenOfficeContentNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/ResultCallback.java b/repository/src/main/java/org/alfresco/filesys/repo/ResultCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/ResultCallback.java
rename to repository/src/main/java/org/alfresco/filesys/repo/ResultCallback.java
diff --git a/src/main/java/org/alfresco/filesys/repo/TempNetworkFile.java b/repository/src/main/java/org/alfresco/filesys/repo/TempNetworkFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/TempNetworkFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/TempNetworkFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/UserQuotaDetails.java b/repository/src/main/java/org/alfresco/filesys/repo/UserQuotaDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/UserQuotaDetails.java
rename to repository/src/main/java/org/alfresco/filesys/repo/UserQuotaDetails.java
diff --git a/src/main/java/org/alfresco/filesys/repo/package-info.java b/repository/src/main/java/org/alfresco/filesys/repo/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/repo/package-info.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/Command.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/Command.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/Command.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/Command.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/DependentInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/DependentInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/DependentInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/DependentInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/EvaluatorContext.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/EvaluatorContext.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/EvaluatorContext.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/EvaluatorContext.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/Operation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/Operation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/Operation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/Operation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/OperationExecutor.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/OperationExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/OperationExecutor.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/OperationExecutor.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluator.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluator.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluator.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/RuleEvaluatorImpl.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/Scenario.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/Scenario.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/Scenario.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/Scenario.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateDeleteRenameShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioCreateShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreate.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreate.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreate.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreate.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreateInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreateInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreateInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRenameOrCreateInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestore.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDeleteRestoreInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioDoubleRenameShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstanceRenameAware.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstanceRenameAware.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstanceRenameAware.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioInstanceRenameAware.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioLockedDeleteShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioMultipleRenameShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFile.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFile.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFile.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFile.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioOpenFileInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameCreateShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMove.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMove.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMove.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMove.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMoveInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMoveInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMoveInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameDeleteMoveInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioRenameShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioResult.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioResult.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioResult.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioResult.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBuffered.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBuffered.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBuffered.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBuffered.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBufferedInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBufferedInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBufferedInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioSimpleNonBufferedInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffle.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffle.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffle.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffle.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffleInstance.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffleInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffleInstance.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/ScenarioTempDeleteShuffleInstance.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/VirtualFilesystem.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/VirtualFilesystem.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/VirtualFilesystem.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/VirtualFilesystem.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/CallbackCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CallbackCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/CallbackCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CallbackCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/CloseFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CloseFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/CloseFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CloseFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/CompoundCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CompoundCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/CompoundCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CompoundCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/CopyContentCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CopyContentCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/CopyContentCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CopyContentCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/CreateFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CreateFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/CreateFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/CreateFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/DeleteFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/DoNothingCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/DoNothingCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/DoNothingCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/DoNothingCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/MoveFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/MoveFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/MoveFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/MoveFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/OpenFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/OpenFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/OpenFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/OpenFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/PostCommitCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/PostCommitCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/PostCommitCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/PostCommitCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/ReduceQuotaCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/ReduceQuotaCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/ReduceQuotaCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/ReduceQuotaCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveNoContentFileOnError.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveNoContentFileOnError.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveNoContentFileOnError.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveNoContentFileOnError.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveTempFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveTempFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveTempFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RemoveTempFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/RenameFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RenameFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/RenameFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RenameFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/RestoreFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/ReturnValueCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/ReturnValueCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/ReturnValueCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/ReturnValueCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/SoftRenameFileCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/SoftRenameFileCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/SoftRenameFileCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/SoftRenameFileCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/commands/UpdateQuotaCommand.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/commands/UpdateQuotaCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/commands/UpdateQuotaCommand.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/commands/UpdateQuotaCommand.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/operations/CloseFileOperation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/operations/CloseFileOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/operations/CloseFileOperation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/operations/CloseFileOperation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/operations/CreateFileOperation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/operations/CreateFileOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/operations/CreateFileOperation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/operations/CreateFileOperation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/operations/DeleteFileOperation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/operations/DeleteFileOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/operations/DeleteFileOperation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/operations/DeleteFileOperation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/operations/MoveFileOperation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/operations/MoveFileOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/operations/MoveFileOperation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/operations/MoveFileOperation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/operations/OpenFileOperation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/operations/OpenFileOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/operations/OpenFileOperation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/operations/OpenFileOperation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/operations/RenameFileOperation.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/operations/RenameFileOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/operations/RenameFileOperation.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/operations/RenameFileOperation.java
diff --git a/src/main/java/org/alfresco/filesys/repo/rules/package-info.java b/repository/src/main/java/org/alfresco/filesys/repo/rules/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/filesys/repo/rules/package-info.java
rename to repository/src/main/java/org/alfresco/filesys/repo/rules/package-info.java
diff --git a/src/main/java/org/alfresco/heartbeat/AuthoritiesDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/AuthoritiesDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/AuthoritiesDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/AuthoritiesDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/ConfigurationDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/ConfigurationDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/ConfigurationDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/ConfigurationDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/HBBaseDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/HBBaseDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/HBBaseDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/HBBaseDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/HBDataCollectorServiceImpl.java b/repository/src/main/java/org/alfresco/heartbeat/HBDataCollectorServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/HBDataCollectorServiceImpl.java
rename to repository/src/main/java/org/alfresco/heartbeat/HBDataCollectorServiceImpl.java
diff --git a/src/main/java/org/alfresco/heartbeat/HBDataSenderServiceFactory.java b/repository/src/main/java/org/alfresco/heartbeat/HBDataSenderServiceFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/HBDataSenderServiceFactory.java
rename to repository/src/main/java/org/alfresco/heartbeat/HBDataSenderServiceFactory.java
diff --git a/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/InfoDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/InfoDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/ModelUsageDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/ModelUsageDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/ModelUsageDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/ModelUsageDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/SessionsUsageDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/SessionsUsageDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/SessionsUsageDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/SessionsUsageDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/SystemUsageDataCollector.java b/repository/src/main/java/org/alfresco/heartbeat/SystemUsageDataCollector.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/SystemUsageDataCollector.java
rename to repository/src/main/java/org/alfresco/heartbeat/SystemUsageDataCollector.java
diff --git a/src/main/java/org/alfresco/heartbeat/jobs/HeartBeatJobScheduler.java b/repository/src/main/java/org/alfresco/heartbeat/jobs/HeartBeatJobScheduler.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/jobs/HeartBeatJobScheduler.java
rename to repository/src/main/java/org/alfresco/heartbeat/jobs/HeartBeatJobScheduler.java
diff --git a/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java b/repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java
rename to repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java
diff --git a/src/main/java/org/alfresco/heartbeat/jobs/LockingJobScheduler.java b/repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJobScheduler.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/jobs/LockingJobScheduler.java
rename to repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJobScheduler.java
diff --git a/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java b/repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java
rename to repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java
diff --git a/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJobScheduler.java b/repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJobScheduler.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/jobs/NonLockingJobScheduler.java
rename to repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJobScheduler.java
diff --git a/src/main/java/org/alfresco/heartbeat/jobs/QuartzJobScheduler.java b/repository/src/main/java/org/alfresco/heartbeat/jobs/QuartzJobScheduler.java
similarity index 100%
rename from src/main/java/org/alfresco/heartbeat/jobs/QuartzJobScheduler.java
rename to repository/src/main/java/org/alfresco/heartbeat/jobs/QuartzJobScheduler.java
diff --git a/src/main/java/org/alfresco/ibatis/AlfrescoDefaultSqlSessionFactory.java b/repository/src/main/java/org/alfresco/ibatis/AlfrescoDefaultSqlSessionFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/AlfrescoDefaultSqlSessionFactory.java
rename to repository/src/main/java/org/alfresco/ibatis/AlfrescoDefaultSqlSessionFactory.java
diff --git a/src/main/java/org/alfresco/ibatis/AlfrescoSqlSessionFactoryBuilder.java b/repository/src/main/java/org/alfresco/ibatis/AlfrescoSqlSessionFactoryBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/AlfrescoSqlSessionFactoryBuilder.java
rename to repository/src/main/java/org/alfresco/ibatis/AlfrescoSqlSessionFactoryBuilder.java
diff --git a/src/main/java/org/alfresco/ibatis/BatchingDAO.java b/repository/src/main/java/org/alfresco/ibatis/BatchingDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/BatchingDAO.java
rename to repository/src/main/java/org/alfresco/ibatis/BatchingDAO.java
diff --git a/src/main/java/org/alfresco/ibatis/ByteArrayTypeHandler.java b/repository/src/main/java/org/alfresco/ibatis/ByteArrayTypeHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/ByteArrayTypeHandler.java
rename to repository/src/main/java/org/alfresco/ibatis/ByteArrayTypeHandler.java
diff --git a/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
rename to repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
diff --git a/src/main/java/org/alfresco/ibatis/HierarchicalXMLConfigBuilder.java b/repository/src/main/java/org/alfresco/ibatis/HierarchicalXMLConfigBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/HierarchicalXMLConfigBuilder.java
rename to repository/src/main/java/org/alfresco/ibatis/HierarchicalXMLConfigBuilder.java
diff --git a/src/main/java/org/alfresco/ibatis/IdsEntity.java b/repository/src/main/java/org/alfresco/ibatis/IdsEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/IdsEntity.java
rename to repository/src/main/java/org/alfresco/ibatis/IdsEntity.java
diff --git a/src/main/java/org/alfresco/ibatis/RetryingCallbackHelper.java b/repository/src/main/java/org/alfresco/ibatis/RetryingCallbackHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/RetryingCallbackHelper.java
rename to repository/src/main/java/org/alfresco/ibatis/RetryingCallbackHelper.java
diff --git a/src/main/java/org/alfresco/ibatis/RollupResultHandler.java b/repository/src/main/java/org/alfresco/ibatis/RollupResultHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/RollupResultHandler.java
rename to repository/src/main/java/org/alfresco/ibatis/RollupResultHandler.java
diff --git a/src/main/java/org/alfresco/ibatis/SerializableTypeHandler.java b/repository/src/main/java/org/alfresco/ibatis/SerializableTypeHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/SerializableTypeHandler.java
rename to repository/src/main/java/org/alfresco/ibatis/SerializableTypeHandler.java
diff --git a/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java b/repository/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java
similarity index 100%
rename from src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java
rename to repository/src/main/java/org/alfresco/ibatis/SqlSessionMetricsWrapper.java
diff --git a/src/main/java/org/alfresco/mbeans/ConnectorServerFactory.java b/repository/src/main/java/org/alfresco/mbeans/ConnectorServerFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/mbeans/ConnectorServerFactory.java
rename to repository/src/main/java/org/alfresco/mbeans/ConnectorServerFactory.java
diff --git a/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java b/repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java
rename to repository/src/main/java/org/alfresco/messaging/camel/SpringContextRouteLoader.java
diff --git a/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java b/repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
similarity index 100%
rename from src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
rename to repository/src/main/java/org/alfresco/messaging/camel/configuration/ConnectionFactoryConfiguration.java
diff --git a/src/main/java/org/alfresco/messaging/camel/routes/OnContentUpdateRenditionRoute.java b/repository/src/main/java/org/alfresco/messaging/camel/routes/OnContentUpdateRenditionRoute.java
similarity index 100%
rename from src/main/java/org/alfresco/messaging/camel/routes/OnContentUpdateRenditionRoute.java
rename to repository/src/main/java/org/alfresco/messaging/camel/routes/OnContentUpdateRenditionRoute.java
diff --git a/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java b/repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java
rename to repository/src/main/java/org/alfresco/messaging/camel/routes/RepoNodeEventsRouteBuilder.java
diff --git a/src/main/java/org/alfresco/messaging/camel/routes/TransformRequestConsumer.java b/repository/src/main/java/org/alfresco/messaging/camel/routes/TransformRequestConsumer.java
similarity index 100%
rename from src/main/java/org/alfresco/messaging/camel/routes/TransformRequestConsumer.java
rename to repository/src/main/java/org/alfresco/messaging/camel/routes/TransformRequestConsumer.java
diff --git a/src/main/java/org/alfresco/metrics/MetricsReporter.java b/repository/src/main/java/org/alfresco/metrics/MetricsReporter.java
similarity index 100%
rename from src/main/java/org/alfresco/metrics/MetricsReporter.java
rename to repository/src/main/java/org/alfresco/metrics/MetricsReporter.java
diff --git a/src/main/java/org/alfresco/metrics/db/DBMetricsReporter.java b/repository/src/main/java/org/alfresco/metrics/db/DBMetricsReporter.java
similarity index 100%
rename from src/main/java/org/alfresco/metrics/db/DBMetricsReporter.java
rename to repository/src/main/java/org/alfresco/metrics/db/DBMetricsReporter.java
diff --git a/src/main/java/org/alfresco/metrics/db/DBMetricsReporterProxy.java b/repository/src/main/java/org/alfresco/metrics/db/DBMetricsReporterProxy.java
similarity index 100%
rename from src/main/java/org/alfresco/metrics/db/DBMetricsReporterProxy.java
rename to repository/src/main/java/org/alfresco/metrics/db/DBMetricsReporterProxy.java
diff --git a/src/main/java/org/alfresco/metrics/rest/RestMetricsReporter.java b/repository/src/main/java/org/alfresco/metrics/rest/RestMetricsReporter.java
similarity index 100%
rename from src/main/java/org/alfresco/metrics/rest/RestMetricsReporter.java
rename to repository/src/main/java/org/alfresco/metrics/rest/RestMetricsReporter.java
diff --git a/src/main/java/org/alfresco/metrics/rest/RestMetricsReporterProxy.java b/repository/src/main/java/org/alfresco/metrics/rest/RestMetricsReporterProxy.java
similarity index 100%
rename from src/main/java/org/alfresco/metrics/rest/RestMetricsReporterProxy.java
rename to repository/src/main/java/org/alfresco/metrics/rest/RestMetricsReporterProxy.java
diff --git a/src/main/java/org/alfresco/model/ApplicationModel.java b/repository/src/main/java/org/alfresco/model/ApplicationModel.java
similarity index 100%
rename from src/main/java/org/alfresco/model/ApplicationModel.java
rename to repository/src/main/java/org/alfresco/model/ApplicationModel.java
diff --git a/src/main/java/org/alfresco/model/BlogIntegrationModel.java b/repository/src/main/java/org/alfresco/model/BlogIntegrationModel.java
similarity index 100%
rename from src/main/java/org/alfresco/model/BlogIntegrationModel.java
rename to repository/src/main/java/org/alfresco/model/BlogIntegrationModel.java
diff --git a/src/main/java/org/alfresco/model/DataListModel.java b/repository/src/main/java/org/alfresco/model/DataListModel.java
similarity index 100%
rename from src/main/java/org/alfresco/model/DataListModel.java
rename to repository/src/main/java/org/alfresco/model/DataListModel.java
diff --git a/src/main/java/org/alfresco/model/ForumModel.java b/repository/src/main/java/org/alfresco/model/ForumModel.java
similarity index 100%
rename from src/main/java/org/alfresco/model/ForumModel.java
rename to repository/src/main/java/org/alfresco/model/ForumModel.java
diff --git a/src/main/java/org/alfresco/model/ImapModel.java b/repository/src/main/java/org/alfresco/model/ImapModel.java
similarity index 100%
rename from src/main/java/org/alfresco/model/ImapModel.java
rename to repository/src/main/java/org/alfresco/model/ImapModel.java
diff --git a/src/main/java/org/alfresco/model/QuickShareModel.java b/repository/src/main/java/org/alfresco/model/QuickShareModel.java
similarity index 100%
rename from src/main/java/org/alfresco/model/QuickShareModel.java
rename to repository/src/main/java/org/alfresco/model/QuickShareModel.java
diff --git a/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java b/repository/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java
rename to repository/src/main/java/org/alfresco/opencmis/ActivityPosterImpl.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptor.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptor.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptor.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisService.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisService.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisService.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisService.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceCall.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceCall.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceCall.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceCall.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceFactory.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceFactory.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceFactory.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceInterceptor.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceInterceptor.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceInterceptor.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java
diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoLocalCmisServiceFactory.java b/repository/src/main/java/org/alfresco/opencmis/AlfrescoLocalCmisServiceFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/AlfrescoLocalCmisServiceFactory.java
rename to repository/src/main/java/org/alfresco/opencmis/AlfrescoLocalCmisServiceFactory.java
diff --git a/src/main/java/org/alfresco/opencmis/CMISChangeLogDataExtractor.java b/repository/src/main/java/org/alfresco/opencmis/CMISChangeLogDataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CMISChangeLogDataExtractor.java
rename to repository/src/main/java/org/alfresco/opencmis/CMISChangeLogDataExtractor.java
diff --git a/src/main/java/org/alfresco/opencmis/CMISConnector.java b/repository/src/main/java/org/alfresco/opencmis/CMISConnector.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CMISConnector.java
rename to repository/src/main/java/org/alfresco/opencmis/CMISConnector.java
diff --git a/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java b/repository/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java
rename to repository/src/main/java/org/alfresco/opencmis/CMISLifecycleBean.java
diff --git a/src/main/java/org/alfresco/opencmis/CMISNodeInfoImpl.java b/repository/src/main/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
rename to repository/src/main/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
diff --git a/src/main/java/org/alfresco/opencmis/CMISRenditionMapping.java b/repository/src/main/java/org/alfresco/opencmis/CMISRenditionMapping.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CMISRenditionMapping.java
rename to repository/src/main/java/org/alfresco/opencmis/CMISRenditionMapping.java
diff --git a/src/main/java/org/alfresco/opencmis/CMISTransactionAwareHolderInterceptor.java b/repository/src/main/java/org/alfresco/opencmis/CMISTransactionAwareHolderInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CMISTransactionAwareHolderInterceptor.java
rename to repository/src/main/java/org/alfresco/opencmis/CMISTransactionAwareHolderInterceptor.java
diff --git a/src/main/java/org/alfresco/opencmis/CmisActivityPoster.java b/repository/src/main/java/org/alfresco/opencmis/CmisActivityPoster.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/CmisActivityPoster.java
rename to repository/src/main/java/org/alfresco/opencmis/CmisActivityPoster.java
diff --git a/src/main/java/org/alfresco/opencmis/ObjectFilter.java b/repository/src/main/java/org/alfresco/opencmis/ObjectFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/ObjectFilter.java
rename to repository/src/main/java/org/alfresco/opencmis/ObjectFilter.java
diff --git a/src/main/java/org/alfresco/opencmis/PassthroughObjectFilter.java b/repository/src/main/java/org/alfresco/opencmis/PassthroughObjectFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/PassthroughObjectFilter.java
rename to repository/src/main/java/org/alfresco/opencmis/PassthroughObjectFilter.java
diff --git a/src/main/java/org/alfresco/opencmis/PathObjectFilter.java b/repository/src/main/java/org/alfresco/opencmis/PathObjectFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/PathObjectFilter.java
rename to repository/src/main/java/org/alfresco/opencmis/PathObjectFilter.java
diff --git a/src/main/java/org/alfresco/opencmis/PersistedContentStream.java b/repository/src/main/java/org/alfresco/opencmis/PersistedContentStream.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/PersistedContentStream.java
rename to repository/src/main/java/org/alfresco/opencmis/PersistedContentStream.java
diff --git a/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java b/repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java
rename to repository/src/main/java/org/alfresco/opencmis/PublicApiCallContextHandler.java
diff --git a/src/main/java/org/alfresco/opencmis/RangeInputStream.java b/repository/src/main/java/org/alfresco/opencmis/RangeInputStream.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/RangeInputStream.java
rename to repository/src/main/java/org/alfresco/opencmis/RangeInputStream.java
diff --git a/src/main/java/org/alfresco/opencmis/TransactionAwareHolder.java b/repository/src/main/java/org/alfresco/opencmis/TransactionAwareHolder.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/TransactionAwareHolder.java
rename to repository/src/main/java/org/alfresco/opencmis/TransactionAwareHolder.java
diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISAllowedActionEnum.java b/repository/src/main/java/org/alfresco/opencmis/dictionary/CMISAllowedActionEnum.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/dictionary/CMISAllowedActionEnum.java
rename to repository/src/main/java/org/alfresco/opencmis/dictionary/CMISAllowedActionEnum.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/AbstractProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/AbstractProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/AbstractProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/AbstractProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/AllowedChildObjectTypeIdsProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/AllowedChildObjectTypeIdsProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/AllowedChildObjectTypeIdsProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/AllowedChildObjectTypeIdsProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CanCheckOutActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CanCheckOutActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CanCheckOutActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CanCheckOutActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CanDeleteDocumentEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CanDeleteDocumentEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CanDeleteDocumentEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CanDeleteDocumentEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CheckinCommentProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CheckinCommentProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CheckinCommentProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CheckinCommentProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ContentStreamIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ContentStreamIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CreationDateProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CreationDateProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CreationDateProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CreationDateProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/DescriptionProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/DirectProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/DirectProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/DirectProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/DirectProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/FixedValueActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/FixedValueActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/FixedValueActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/FixedValueActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/FixedValueProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/FixedValueProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/FixedValueProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/FixedValueProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/IsImmutableProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/IsImmutableProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/IsImmutableProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/IsImmutableProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/IsLatestMajorVersionProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/IsLatestMajorVersionProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/IsLatestMajorVersionProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/IsLatestMajorVersionProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/IsLatestVersionProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/IsLatestVersionProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/IsLatestVersionProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/IsLatestVersionProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/IsMajorVersionProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/IsMajorVersionProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/IsMajorVersionProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/IsMajorVersionProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/IsPrivateWorkingCopy.java b/repository/src/main/java/org/alfresco/opencmis/mapping/IsPrivateWorkingCopy.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/IsPrivateWorkingCopy.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/IsPrivateWorkingCopy.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/IsVersionSeriesCheckedOutProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/IsVersionSeriesCheckedOutProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/IsVersionSeriesCheckedOutProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/IsVersionSeriesCheckedOutProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ModificationDateProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ModificationDateProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ModificationDateProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ModificationDateProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/NameProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/NameProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/NameProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/NameProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/NodeRefProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/NodeRefProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/NodeRefProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/NodeRefProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ParentActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ParentActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ParentActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ParentActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/ParentProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/ParentProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/ParentProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/ParentProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/PathProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/PathProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/PathProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/PathProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/PermissionActionEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/PermissionActionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/PermissionActionEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/PermissionActionEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java b/repository/src/main/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java b/repository/src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/SecondaryTypesProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/SecondaryTypesProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/SecondaryTypesProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/SecondaryTypesProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/SourceIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/SourceIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/SourceIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/SourceIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/TargetIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/TargetIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/TargetIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/TargetIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/VersionLabelProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/VersionLabelProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/VersionLabelProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/VersionLabelProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutByProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutByProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutByProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutByProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesIdProperty.java b/repository/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesIdProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/mapping/VersionSeriesIdProperty.java
rename to repository/src/main/java/org/alfresco/opencmis/mapping/VersionSeriesIdProperty.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISQueryService.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISQueryService.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISQueryService.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISQueryService.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISQueryServiceImpl.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISQueryServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISQueryServiceImpl.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISQueryServiceImpl.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISResultSet.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISResultSet.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISResultSet.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISResultSetColumn.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetColumn.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISResultSetColumn.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetColumn.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISResultSetMetaData.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetMetaData.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISResultSetMetaData.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetMetaData.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISResultSetRow.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISResultSetRow.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetRow.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISResultSetRowIterator.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/opencmis/search/CMISResultSetSelector.java b/repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/opencmis/search/CMISResultSetSelector.java
rename to repository/src/main/java/org/alfresco/opencmis/search/CMISResultSetSelector.java
diff --git a/src/main/java/org/alfresco/repo/action/AbstractAsynchronousActionFilter.java b/repository/src/main/java/org/alfresco/repo/action/AbstractAsynchronousActionFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/AbstractAsynchronousActionFilter.java
rename to repository/src/main/java/org/alfresco/repo/action/AbstractAsynchronousActionFilter.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionCancelledException.java b/repository/src/main/java/org/alfresco/repo/action/ActionCancelledException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionCancelledException.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionCancelledException.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionConditionDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionConditionDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionConditionDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionConditionDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionConditionImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionConditionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionConditionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionConditionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionListImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionListImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionListImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionListImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionModel.java b/repository/src/main/java/org/alfresco/repo/action/ActionModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionModel.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionModel.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionServiceMonitor.java b/repository/src/main/java/org/alfresco/repo/action/ActionServiceMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionServiceMonitor.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionServiceMonitor.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionStatistics.java b/repository/src/main/java/org/alfresco/repo/action/ActionStatistics.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionStatistics.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionStatistics.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionTrackingServiceImpl.java b/repository/src/main/java/org/alfresco/repo/action/ActionTrackingServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionTrackingServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionTrackingServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionTransactionListener.java b/repository/src/main/java/org/alfresco/repo/action/ActionTransactionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionTransactionListener.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionTransactionListener.java
diff --git a/src/main/java/org/alfresco/repo/action/ActionsAspect.java b/repository/src/main/java/org/alfresco/repo/action/ActionsAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ActionsAspect.java
rename to repository/src/main/java/org/alfresco/repo/action/ActionsAspect.java
diff --git a/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueue.java b/repository/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueue.java
rename to repository/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueue.java
diff --git a/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueueImpl.java b/repository/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueueImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueueImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueueImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueuePolicies.java b/repository/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueuePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueuePolicies.java
rename to repository/src/main/java/org/alfresco/repo/action/AsynchronousActionExecutionQueuePolicies.java
diff --git a/src/main/java/org/alfresco/repo/action/CommonResourceAbstractBase.java b/repository/src/main/java/org/alfresco/repo/action/CommonResourceAbstractBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/CommonResourceAbstractBase.java
rename to repository/src/main/java/org/alfresco/repo/action/CommonResourceAbstractBase.java
diff --git a/src/main/java/org/alfresco/repo/action/CompositeActionConditionImpl.java b/repository/src/main/java/org/alfresco/repo/action/CompositeActionConditionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/CompositeActionConditionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/CompositeActionConditionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/CompositeActionImpl.java b/repository/src/main/java/org/alfresco/repo/action/CompositeActionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/CompositeActionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/CompositeActionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/CreateThumbnailActionFilter.java b/repository/src/main/java/org/alfresco/repo/action/CreateThumbnailActionFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/CreateThumbnailActionFilter.java
rename to repository/src/main/java/org/alfresco/repo/action/CreateThumbnailActionFilter.java
diff --git a/src/main/java/org/alfresco/repo/action/OngoingAsyncAction.java b/repository/src/main/java/org/alfresco/repo/action/OngoingAsyncAction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/OngoingAsyncAction.java
rename to repository/src/main/java/org/alfresco/repo/action/OngoingAsyncAction.java
diff --git a/src/main/java/org/alfresco/repo/action/ParameterDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/action/ParameterDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ParameterDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ParameterDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java b/repository/src/main/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java
rename to repository/src/main/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java
diff --git a/src/main/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ParameterizedItemDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/ParameterizedItemImpl.java b/repository/src/main/java/org/alfresco/repo/action/ParameterizedItemImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/ParameterizedItemImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/ParameterizedItemImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/RunningAction.java b/repository/src/main/java/org/alfresco/repo/action/RunningAction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/RunningAction.java
rename to repository/src/main/java/org/alfresco/repo/action/RunningAction.java
diff --git a/src/main/java/org/alfresco/repo/action/RuntimeActionService.java b/repository/src/main/java/org/alfresco/repo/action/RuntimeActionService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/RuntimeActionService.java
rename to repository/src/main/java/org/alfresco/repo/action/RuntimeActionService.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/AspectParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/AspectParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/AspectParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/AspectParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/BaseParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/BaseParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/BaseParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/BaseParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/EnumParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/EnumParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/EnumParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/EnumParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/FolderContentsParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/FolderContentsParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/FolderContentsParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/FolderContentsParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/MimetypeParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/MimetypeParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/MimetypeParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/MimetypeParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/PropertyParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/PropertyParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/PropertyParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/PropertyParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/constraint/TypeParameterConstraint.java b/repository/src/main/java/org/alfresco/repo/action/constraint/TypeParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/constraint/TypeParameterConstraint.java
rename to repository/src/main/java/org/alfresco/repo/action/constraint/TypeParameterConstraint.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluatorAbstractBase.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluatorAbstractBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluatorAbstractBase.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/ActionConditionEvaluatorAbstractBase.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/CompositeConditionEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/CompositeConditionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/CompositeConditionEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/CompositeConditionEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/HasAspectEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/HasAspectEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/HasAspectEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/HasAspectEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/HasChildEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/HasChildEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/HasChildEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/HasChildEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/HasTagEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/HasTagEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/HasTagEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/HasTagEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/HasVersionHistoryEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/HasVersionHistoryEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/HasVersionHistoryEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/HasVersionHistoryEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/InCategoryEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/NoConditionEvaluator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/NoConditionEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/NoConditionEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/NoConditionEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/compare/ComparePropertyValueOperation.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/compare/ComparePropertyValueOperation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/compare/ComparePropertyValueOperation.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/compare/ComparePropertyValueOperation.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/compare/ContentPropertyName.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/compare/ContentPropertyName.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/compare/ContentPropertyName.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/compare/ContentPropertyName.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/compare/NumericPropertyValueComparator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/compare/NumericPropertyValueComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/compare/NumericPropertyValueComparator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/compare/NumericPropertyValueComparator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/compare/PropertyValueComparator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/compare/PropertyValueComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/compare/PropertyValueComparator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/compare/PropertyValueComparator.java
diff --git a/src/main/java/org/alfresco/repo/action/evaluator/compare/TextPropertyValueComparator.java b/repository/src/main/java/org/alfresco/repo/action/evaluator/compare/TextPropertyValueComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/evaluator/compare/TextPropertyValueComparator.java
rename to repository/src/main/java/org/alfresco/repo/action/evaluator/compare/TextPropertyValueComparator.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java b/repository/src/main/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CheckInActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CheckInActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CheckInActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CheckInActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CheckOutActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CheckOutActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CheckOutActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CheckOutActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CompositeActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CompositeActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CompositeActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CompositeActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ContentMetadataEmbedder.java b/repository/src/main/java/org/alfresco/repo/action/executer/ContentMetadataEmbedder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ContentMetadataEmbedder.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ContentMetadataEmbedder.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CopyActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CopyActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CopyActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CopyActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CountChildrenActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CountChildrenActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CountChildrenActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CountChildrenActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CounterIncrementActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CounterIncrementActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CounterIncrementActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CounterIncrementActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/CreateVersionActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/CreateVersionActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/CreateVersionActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/CreateVersionActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ExporterActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ImageTransformActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ImageTransformActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ImageTransformActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ImageTransformActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/LoggingAwareExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/LoggingAwareExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/LoggingAwareExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/LoggingAwareExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java b/repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/MailActionExecuterMonitor.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/MoveActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/MoveActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/MoveActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/MoveActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/RepositoryExporterActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/RepositoryExporterActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/RepositoryExporterActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/RepositoryExporterActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/SimpleWorkflowActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/TestModeable.java b/repository/src/main/java/org/alfresco/repo/action/executer/TestModeable.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/TestModeable.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/TestModeable.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/TransformActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/TransformActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/TransformActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/TransformActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/AbstractScheduledAction.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/AbstractScheduledAction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/AbstractScheduledAction.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/AbstractScheduledAction.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/AbstractTemplateActionDefinition.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/AbstractTemplateActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/AbstractTemplateActionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/AbstractTemplateActionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/CompensatingActionException.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/CompensatingActionException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/CompensatingActionException.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/CompensatingActionException.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/CompositeTemplateActionDefinition.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/CompositeTemplateActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/CompositeTemplateActionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/CompositeTemplateActionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinition.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/InvalidCronExpression.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/InvalidCronExpression.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/InvalidCronExpression.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/InvalidCronExpression.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionDefinition.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionException.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionException.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledActionException.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionImpl.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/SimpleTemplateActionDefinition.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/SimpleTemplateActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/SimpleTemplateActionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/SimpleTemplateActionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/TemplateActionDefinition.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/TemplateActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/TemplateActionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/TemplateActionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/action/scheduled/TemplateActionModelFactory.java b/repository/src/main/java/org/alfresco/repo/action/scheduled/TemplateActionModelFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/scheduled/TemplateActionModelFactory.java
rename to repository/src/main/java/org/alfresco/repo/action/scheduled/TemplateActionModelFactory.java
diff --git a/src/main/java/org/alfresco/repo/action/script/ScriptActionTrackingService.java b/repository/src/main/java/org/alfresco/repo/action/script/ScriptActionTrackingService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/script/ScriptActionTrackingService.java
rename to repository/src/main/java/org/alfresco/repo/action/script/ScriptActionTrackingService.java
diff --git a/src/main/java/org/alfresco/repo/action/script/ScriptExecutionDetails.java b/repository/src/main/java/org/alfresco/repo/action/script/ScriptExecutionDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/action/script/ScriptExecutionDetails.java
rename to repository/src/main/java/org/alfresco/repo/action/script/ScriptExecutionDetails.java
diff --git a/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java b/repository/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/repository/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/activities/ActivityServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/activities/ActivityType.java b/repository/src/main/java/org/alfresco/repo/activities/ActivityType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/ActivityType.java
rename to repository/src/main/java/org/alfresco/repo/activities/ActivityType.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java b/repository/src/main/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/AbstractUserNotifier.java b/repository/src/main/java/org/alfresco/repo/activities/feed/AbstractUserNotifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/AbstractUserNotifier.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/AbstractUserNotifier.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/ActivitiesFeedModelBuilder.java b/repository/src/main/java/org/alfresco/repo/activities/feed/ActivitiesFeedModelBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/ActivitiesFeedModelBuilder.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/ActivitiesFeedModelBuilder.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/DefaultActivitiesFeedModelBuilder.java b/repository/src/main/java/org/alfresco/repo/activities/feed/DefaultActivitiesFeedModelBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/DefaultActivitiesFeedModelBuilder.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/DefaultActivitiesFeedModelBuilder.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/EmailUserNotifier.java b/repository/src/main/java/org/alfresco/repo/activities/feed/EmailUserNotifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/EmailUserNotifier.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/EmailUserNotifier.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/ErrorProneActionExecutor.java b/repository/src/main/java/org/alfresco/repo/activities/feed/ErrorProneActionExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/ErrorProneActionExecutor.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/ErrorProneActionExecutor.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/ErrorProneUserNotifier.java b/repository/src/main/java/org/alfresco/repo/activities/feed/ErrorProneUserNotifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/ErrorProneUserNotifier.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/ErrorProneUserNotifier.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedGenerator.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedGenerator.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedGenerator.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedGeneratorJob.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedGeneratorJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedGeneratorJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedGeneratorJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedGridJob.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedGridJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedGridJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedGridJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedNotifier.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedNotifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedNotifier.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedNotifier.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedNotifierImpl.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedNotifierImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedNotifierImpl.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedNotifierImpl.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedNotifierJob.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedNotifierJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedNotifierJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedNotifierJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/FeedTaskSplit.java b/repository/src/main/java/org/alfresco/repo/activities/feed/FeedTaskSplit.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/FeedTaskSplit.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/FeedTaskSplit.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/JobSettings.java b/repository/src/main/java/org/alfresco/repo/activities/feed/JobSettings.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/JobSettings.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/JobSettings.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/MockUserNotifier.java b/repository/src/main/java/org/alfresco/repo/activities/feed/MockUserNotifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/MockUserNotifier.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/MockUserNotifier.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/RepoCtx.java b/repository/src/main/java/org/alfresco/repo/activities/feed/RepoCtx.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/RepoCtx.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/RepoCtx.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/UserNotifier.java b/repository/src/main/java/org/alfresco/repo/activities/feed/UserNotifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/UserNotifier.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/UserNotifier.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java b/repository/src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleaner.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanupJob.java b/repository/src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGenerator.java b/repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGenerator.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGenerator.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGridJob.java b/repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGridJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGridJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedGridJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java b/repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskProcessor.java
diff --git a/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskSplitter.java b/repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskSplitter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskSplitter.java
rename to repository/src/main/java/org/alfresco/repo/activities/feed/local/LocalFeedTaskSplitter.java
diff --git a/src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java b/repository/src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java
rename to repository/src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleaner.java
diff --git a/src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleanupJob.java b/repository/src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/post/cleanup/PostCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/post/lookup/PostLookup.java b/repository/src/main/java/org/alfresco/repo/activities/post/lookup/PostLookup.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/post/lookup/PostLookup.java
rename to repository/src/main/java/org/alfresco/repo/activities/post/lookup/PostLookup.java
diff --git a/src/main/java/org/alfresco/repo/activities/post/lookup/PostLookupJob.java b/repository/src/main/java/org/alfresco/repo/activities/post/lookup/PostLookupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/post/lookup/PostLookupJob.java
rename to repository/src/main/java/org/alfresco/repo/activities/post/lookup/PostLookupJob.java
diff --git a/src/main/java/org/alfresco/repo/activities/script/Activity.java b/repository/src/main/java/org/alfresco/repo/activities/script/Activity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/activities/script/Activity.java
rename to repository/src/main/java/org/alfresco/repo/activities/script/Activity.java
diff --git a/src/main/java/org/alfresco/repo/admin/BaseInterpreter.java b/repository/src/main/java/org/alfresco/repo/admin/BaseInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/BaseInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/admin/BaseInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/admin/ConfigurationChecker.java b/repository/src/main/java/org/alfresco/repo/admin/ConfigurationChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/ConfigurationChecker.java
rename to repository/src/main/java/org/alfresco/repo/admin/ConfigurationChecker.java
diff --git a/src/main/java/org/alfresco/repo/admin/Log4JHierarchyInit.java b/repository/src/main/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
rename to repository/src/main/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepoAdminInterpreter.java b/repository/src/main/java/org/alfresco/repo/admin/RepoAdminInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepoAdminInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepoAdminInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java b/repository/src/main/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepoAdminServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepoModelDefinition.java b/repository/src/main/java/org/alfresco/repo/admin/RepoModelDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepoModelDefinition.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepoModelDefinition.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepoServerMgmt.java b/repository/src/main/java/org/alfresco/repo/admin/RepoServerMgmt.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepoServerMgmt.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepoServerMgmt.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepoServerMgmtMBean.java b/repository/src/main/java/org/alfresco/repo/admin/RepoServerMgmtMBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepoServerMgmtMBean.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepoServerMgmtMBean.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepositoryEndBootstrapBean.java b/repository/src/main/java/org/alfresco/repo/admin/RepositoryEndBootstrapBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepositoryEndBootstrapBean.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepositoryEndBootstrapBean.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepositoryStartBootstrapBean.java b/repository/src/main/java/org/alfresco/repo/admin/RepositoryStartBootstrapBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepositoryStartBootstrapBean.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepositoryStartBootstrapBean.java
diff --git a/src/main/java/org/alfresco/repo/admin/RepositoryState.java b/repository/src/main/java/org/alfresco/repo/admin/RepositoryState.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/RepositoryState.java
rename to repository/src/main/java/org/alfresco/repo/admin/RepositoryState.java
diff --git a/src/main/java/org/alfresco/repo/admin/SysAdminParams.java b/repository/src/main/java/org/alfresco/repo/admin/SysAdminParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/SysAdminParams.java
rename to repository/src/main/java/org/alfresco/repo/admin/SysAdminParams.java
diff --git a/src/main/java/org/alfresco/repo/admin/SysAdminParamsImpl.java b/repository/src/main/java/org/alfresco/repo/admin/SysAdminParamsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/SysAdminParamsImpl.java
rename to repository/src/main/java/org/alfresco/repo/admin/SysAdminParamsImpl.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/AbstractPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/AbstractPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/AbstractPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/AbstractPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/AppliedPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/AppliedPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/AppliedPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/AppliedPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/AsynchronousPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/AsynchronousPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/AsynchronousPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/AsynchronousPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java b/repository/src/main/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/Patch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/Patch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/Patch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/Patch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/PatchExecuter.java b/repository/src/main/java/org/alfresco/repo/admin/patch/PatchExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/PatchExecuter.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/PatchExecuter.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/PatchService.java b/repository/src/main/java/org/alfresco/repo/admin/patch/PatchService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/PatchService.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/PatchService.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java b/repository/src/main/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/SamplePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/SamplePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/SamplePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/SamplePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/SimplePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/SimplePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/SimplePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/SimplePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AbstractPermissionChangePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AbstractPermissionChangePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AbstractPermissionChangePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AbstractPermissionChangePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AddGroupAuthorityPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddGroupAuthorityPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AddGroupAuthorityPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddGroupAuthorityPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AddSurfConfigFoldersPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddSurfConfigFoldersPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AddSurfConfigFoldersPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddSurfConfigFoldersPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AddUnmovableAspectToSitesPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/AliasableAspectPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/FixBpmPackagesPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/FixBpmPackagesPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/FixBpmPackagesPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/FixBpmPackagesPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/FixPersonSizeCurrentTypePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/FixPersonSizeCurrentTypePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/FixPersonSizeCurrentTypePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/FixPersonSizeCurrentTypePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/FixTemplatePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/FixTemplatePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/FixTemplatePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/FixTemplatePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericBootstrapPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/GenericDeleteAspectForTypePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericDeleteAspectForTypePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/GenericDeleteAspectForTypePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericDeleteAspectForTypePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/ImapFoldersPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/ImapUnsubscribedAspectPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/ImapUnsubscribedAspectPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/ImapUnsubscribedAspectPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/ImapUnsubscribedAspectPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/MigrateTenantsFromAttrsToTablePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/NoLongerSupportedPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/NoLongerSupportedPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/NoLongerSupportedPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/NoLongerSupportedPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/NoOpPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/QNamePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/QNamePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/QNamePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/QNamePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/RenameSiteAuthorityDisplayName.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/RenameSiteAuthorityDisplayName.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/RenameSiteAuthorityDisplayName.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/RenameSiteAuthorityDisplayName.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/SWSDPPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/SWSDPPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/SWSDPPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/SWSDPPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/SchemaUpgradeScriptPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/SchemaUpgradeScriptPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/SchemaUpgradeScriptPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/SchemaUpgradeScriptPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/SharedFolderPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/SharedFolderPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/SharedFolderPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/SharedFolderPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/SurfConfigFolderPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/SurfConfigFolderPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/SurfConfigFolderPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/SurfConfigFolderPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateAuditTemplatePatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateAuditTemplatePatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/UpdateAuditTemplatePatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateAuditTemplatePatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java b/repository/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java
diff --git a/src/main/java/org/alfresco/repo/admin/patch/util/ImportFileUpdater.java b/repository/src/main/java/org/alfresco/repo/admin/patch/util/ImportFileUpdater.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/patch/util/ImportFileUpdater.java
rename to repository/src/main/java/org/alfresco/repo/admin/patch/util/ImportFileUpdater.java
diff --git a/src/main/java/org/alfresco/repo/admin/registry/RegistryKey.java b/repository/src/main/java/org/alfresco/repo/admin/registry/RegistryKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/registry/RegistryKey.java
rename to repository/src/main/java/org/alfresco/repo/admin/registry/RegistryKey.java
diff --git a/src/main/java/org/alfresco/repo/admin/registry/RegistryService.java b/repository/src/main/java/org/alfresco/repo/admin/registry/RegistryService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/registry/RegistryService.java
rename to repository/src/main/java/org/alfresco/repo/admin/registry/RegistryService.java
diff --git a/src/main/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java b/repository/src/main/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/admin/registry/RegistryServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/attributes/AttributeServiceImpl.java b/repository/src/main/java/org/alfresco/repo/attributes/AttributeServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/attributes/AttributeServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/attributes/AttributeServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/attributes/PropTablesCleaner.java b/repository/src/main/java/org/alfresco/repo/attributes/PropTablesCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/attributes/PropTablesCleaner.java
rename to repository/src/main/java/org/alfresco/repo/attributes/PropTablesCleaner.java
diff --git a/src/main/java/org/alfresco/repo/attributes/PropTablesCleanupJob.java b/repository/src/main/java/org/alfresco/repo/attributes/PropTablesCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/attributes/PropTablesCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/attributes/PropTablesCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/audit/AuditComponent.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/AuditComponent.java
rename to repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java
diff --git a/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/audit/AuditException.java b/repository/src/main/java/org/alfresco/repo/audit/AuditException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/AuditException.java
rename to repository/src/main/java/org/alfresco/repo/audit/AuditException.java
diff --git a/src/main/java/org/alfresco/repo/audit/AuditFilter.java b/repository/src/main/java/org/alfresco/repo/audit/AuditFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/AuditFilter.java
rename to repository/src/main/java/org/alfresco/repo/audit/AuditFilter.java
diff --git a/src/main/java/org/alfresco/repo/audit/AuditMethodInterceptor.java b/repository/src/main/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/audit/AuditMethodInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/audit/BeanIdentifier.java b/repository/src/main/java/org/alfresco/repo/audit/BeanIdentifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/BeanIdentifier.java
rename to repository/src/main/java/org/alfresco/repo/audit/BeanIdentifier.java
diff --git a/src/main/java/org/alfresco/repo/audit/BeanIdentifierImpl.java b/repository/src/main/java/org/alfresco/repo/audit/BeanIdentifierImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/BeanIdentifierImpl.java
rename to repository/src/main/java/org/alfresco/repo/audit/BeanIdentifierImpl.java
diff --git a/src/main/java/org/alfresco/repo/audit/DisableAuditableBehaviourInterceptor.java b/repository/src/main/java/org/alfresco/repo/audit/DisableAuditableBehaviourInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/DisableAuditableBehaviourInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/audit/DisableAuditableBehaviourInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/audit/PropertyAuditFilter.java b/repository/src/main/java/org/alfresco/repo/audit/PropertyAuditFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/PropertyAuditFilter.java
rename to repository/src/main/java/org/alfresco/repo/audit/PropertyAuditFilter.java
diff --git a/src/main/java/org/alfresco/repo/audit/UserAuditFilter.java b/repository/src/main/java/org/alfresco/repo/audit/UserAuditFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/UserAuditFilter.java
rename to repository/src/main/java/org/alfresco/repo/audit/UserAuditFilter.java
diff --git a/src/main/java/org/alfresco/repo/audit/access/AccessAuditor.java b/repository/src/main/java/org/alfresco/repo/audit/access/AccessAuditor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/access/AccessAuditor.java
rename to repository/src/main/java/org/alfresco/repo/audit/access/AccessAuditor.java
diff --git a/src/main/java/org/alfresco/repo/audit/access/NodeChange.java b/repository/src/main/java/org/alfresco/repo/audit/access/NodeChange.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/access/NodeChange.java
rename to repository/src/main/java/org/alfresco/repo/audit/access/NodeChange.java
diff --git a/src/main/java/org/alfresco/repo/audit/access/NodeInfo.java b/repository/src/main/java/org/alfresco/repo/audit/access/NodeInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/access/NodeInfo.java
rename to repository/src/main/java/org/alfresco/repo/audit/access/NodeInfo.java
diff --git a/src/main/java/org/alfresco/repo/audit/access/NodeInfoFactory.java b/repository/src/main/java/org/alfresco/repo/audit/access/NodeInfoFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/access/NodeInfoFactory.java
rename to repository/src/main/java/org/alfresco/repo/audit/access/NodeInfoFactory.java
diff --git a/src/main/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/extractor/DataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/extractor/DataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/extractor/DataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/extractor/DataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/extractor/NodeNameDataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/extractor/NodeTypeDataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/extractor/NullValueDataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/extractor/NullValueDataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/extractor/NullValueDataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/extractor/NullValueDataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/extractor/SimpleValueDataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/extractor/SimpleValueDataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/extractor/SimpleValueDataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/extractor/SimpleValueDataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/generator/AuthenticatedPersonDataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/generator/AuthenticatedUserDataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/generator/AuthenticatedUserDataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/generator/AuthenticatedUserDataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/generator/AuthenticatedUserDataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/generator/DataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/generator/DataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/generator/DataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/generator/DataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/generator/SystemTimeDataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/generator/SystemTimeDataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/generator/SystemTimeDataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/generator/SystemTimeDataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/generator/TransactionIdDataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/generator/TransactionIdDataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/generator/TransactionIdDataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/generator/TransactionIdDataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/AuditApplication.java b/repository/src/main/java/org/alfresco/repo/audit/model/AuditApplication.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/AuditApplication.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/AuditApplication.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/AuditModelException.java b/repository/src/main/java/org/alfresco/repo/audit/model/AuditModelException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/AuditModelException.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/AuditModelException.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistry.java b/repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/AuditModelRegistry.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistry.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java b/repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/AuditModelRegistryImpl.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/Application.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/Application.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/Application.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/Application.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/Audit.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/Audit.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/Audit.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/Audit.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/AuditPath.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractor.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/DataExtractors.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerator.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/DataGenerators.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/GenerateValue.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/KeyedAuditDefinition.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/ObjectFactory.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMap.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/PathMappings.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/RecordValue.java
diff --git a/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java b/repository/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/audit/model/_3/package-info.java
rename to repository/src/main/java/org/alfresco/repo/audit/model/_3/package-info.java
diff --git a/src/main/java/org/alfresco/repo/batch/BatchMonitor.java b/repository/src/main/java/org/alfresco/repo/batch/BatchMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/batch/BatchMonitor.java
rename to repository/src/main/java/org/alfresco/repo/batch/BatchMonitor.java
diff --git a/src/main/java/org/alfresco/repo/batch/BatchMonitorEvent.java b/repository/src/main/java/org/alfresco/repo/batch/BatchMonitorEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/batch/BatchMonitorEvent.java
rename to repository/src/main/java/org/alfresco/repo/batch/BatchMonitorEvent.java
diff --git a/src/main/java/org/alfresco/repo/batch/BatchProcessWorkProvider.java b/repository/src/main/java/org/alfresco/repo/batch/BatchProcessWorkProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/batch/BatchProcessWorkProvider.java
rename to repository/src/main/java/org/alfresco/repo/batch/BatchProcessWorkProvider.java
diff --git a/src/main/java/org/alfresco/repo/batch/BatchProcessor.java b/repository/src/main/java/org/alfresco/repo/batch/BatchProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/batch/BatchProcessor.java
rename to repository/src/main/java/org/alfresco/repo/batch/BatchProcessor.java
diff --git a/src/main/java/org/alfresco/repo/blog/BlogDetails.java b/repository/src/main/java/org/alfresco/repo/blog/BlogDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/BlogDetails.java
rename to repository/src/main/java/org/alfresco/repo/blog/BlogDetails.java
diff --git a/src/main/java/org/alfresco/repo/blog/BlogIntegrationRuntimeException.java b/repository/src/main/java/org/alfresco/repo/blog/BlogIntegrationRuntimeException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/BlogIntegrationRuntimeException.java
rename to repository/src/main/java/org/alfresco/repo/blog/BlogIntegrationRuntimeException.java
diff --git a/src/main/java/org/alfresco/repo/blog/BlogPostInfoImpl.java b/repository/src/main/java/org/alfresco/repo/blog/BlogPostInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/BlogPostInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/blog/BlogPostInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/blog/BlogServiceImpl.java b/repository/src/main/java/org/alfresco/repo/blog/BlogServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/BlogServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/blog/BlogServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/AbstractBlogPostsCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/AbstractBlogPostsCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/AbstractBlogPostsCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/AbstractBlogPostsCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/BlogEntity.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/BlogEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/BlogEntity.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/BlogEntity.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQuery.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java b/repository/src/main/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/AnalysedDirectory.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/BulkFSImportEvent.java b/repository/src/main/java/org/alfresco/repo/bulkimport/BulkFSImportEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/BulkFSImportEvent.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/BulkFSImportEvent.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/BulkFilesystemImporter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/BulkFilesystemImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/BulkFilesystemImporter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/BulkFilesystemImporter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/BulkImportParameters.java b/repository/src/main/java/org/alfresco/repo/bulkimport/BulkImportParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/BulkImportParameters.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/BulkImportParameters.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/BulkImportStatus.java b/repository/src/main/java/org/alfresco/repo/bulkimport/BulkImportStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/BulkImportStatus.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/BulkImportStatus.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/ContentDataFactory.java b/repository/src/main/java/org/alfresco/repo/bulkimport/ContentDataFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/ContentDataFactory.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/ContentDataFactory.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/ContentStoreMapProvider.java b/repository/src/main/java/org/alfresco/repo/bulkimport/ContentStoreMapProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/ContentStoreMapProvider.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/ContentStoreMapProvider.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/DirectoryAnalyser.java b/repository/src/main/java/org/alfresco/repo/bulkimport/DirectoryAnalyser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/DirectoryAnalyser.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/DirectoryAnalyser.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/FilesystemTracker.java b/repository/src/main/java/org/alfresco/repo/bulkimport/FilesystemTracker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/FilesystemTracker.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/FilesystemTracker.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/ImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/ImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/ImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/ImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/ImportableItem.java b/repository/src/main/java/org/alfresco/repo/bulkimport/ImportableItem.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/ImportableItem.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/ImportableItem.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/MetadataLoader.java b/repository/src/main/java/org/alfresco/repo/bulkimport/MetadataLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/MetadataLoader.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/MetadataLoader.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/NodeImporter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/NodeImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/NodeImporter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/NodeImporter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractBulkFilesystemImporter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractBulkFilesystemImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/AbstractBulkFilesystemImporter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractBulkFilesystemImporter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractFilesystemTracker.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractFilesystemTracker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/AbstractFilesystemTracker.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractFilesystemTracker.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporterFactory.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporterFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporterFactory.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporterFactory.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/BulkImportStatusImpl.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/BulkImportStatusImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/BulkImportStatusImpl.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/BulkImportStatusImpl.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/FileUtils.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/FileUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/FileUtils.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/FileUtils.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/FilesystemContentDataFactory.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/FilesystemContentDataFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/FilesystemContentDataFactory.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/FilesystemContentDataFactory.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/MultiThreadedBulkFilesystemImporter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/MultiThreadedBulkFilesystemImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/MultiThreadedBulkFilesystemImporter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/MultiThreadedBulkFilesystemImporter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/StreamingNodeImporterFactory.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/StreamingNodeImporterFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/StreamingNodeImporterFactory.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/StreamingNodeImporterFactory.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/StripingBulkFilesystemImporter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/StripingBulkFilesystemImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/StripingBulkFilesystemImporter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/StripingBulkFilesystemImporter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTracker.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTracker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTracker.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTracker.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/stores/AbstractContentStoreMapProvider.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/stores/AbstractContentStoreMapProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/stores/AbstractContentStoreMapProvider.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/stores/AbstractContentStoreMapProvider.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/impl/stores/DefaultContentStoreMapProvider.java b/repository/src/main/java/org/alfresco/repo/bulkimport/impl/stores/DefaultContentStoreMapProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/impl/stores/DefaultContentStoreMapProvider.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/impl/stores/DefaultContentStoreMapProvider.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/AndImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/AndImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/AndImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/AndImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/DirectoryImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/DirectoryImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/DirectoryImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/DirectoryImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/FileImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/FileImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/FileImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/FileImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/FileNameRegexImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/FileNameRegexImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/FileNameRegexImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/FileNameRegexImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/HiddenFileFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/HiddenFileFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/HiddenFileFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/HiddenFileFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/NonExistentContentFileImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/NonExistentContentFileImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/NonExistentContentFileImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/NonExistentContentFileImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/importfilters/NotImportFilter.java b/repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/NotImportFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/importfilters/NotImportFilter.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/importfilters/NotImportFilter.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/AbstractMapBasedMetadataLoader.java b/repository/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/AbstractMapBasedMetadataLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/metadataloaders/AbstractMapBasedMetadataLoader.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/AbstractMapBasedMetadataLoader.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/PropertiesFileMetadataLoader.java b/repository/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/PropertiesFileMetadataLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/metadataloaders/PropertiesFileMetadataLoader.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/PropertiesFileMetadataLoader.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/XmlPropertiesFileMetadataLoader.java b/repository/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/XmlPropertiesFileMetadataLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/metadataloaders/XmlPropertiesFileMetadataLoader.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/metadataloaders/XmlPropertiesFileMetadataLoader.java
diff --git a/src/main/java/org/alfresco/repo/bulkimport/script/BulkImport.java b/repository/src/main/java/org/alfresco/repo/bulkimport/script/BulkImport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/bulkimport/script/BulkImport.java
rename to repository/src/main/java/org/alfresco/repo/bulkimport/script/BulkImport.java
diff --git a/src/main/java/org/alfresco/repo/cache/AbstractCacheFactory.java b/repository/src/main/java/org/alfresco/repo/cache/AbstractCacheFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/AbstractCacheFactory.java
rename to repository/src/main/java/org/alfresco/repo/cache/AbstractCacheFactory.java
diff --git a/src/main/java/org/alfresco/repo/cache/AbstractMTAsynchronouslyRefreshedCache.java b/repository/src/main/java/org/alfresco/repo/cache/AbstractMTAsynchronouslyRefreshedCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/AbstractMTAsynchronouslyRefreshedCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/AbstractMTAsynchronouslyRefreshedCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/AbstractRefreshableCacheEvent.java b/repository/src/main/java/org/alfresco/repo/cache/AbstractRefreshableCacheEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/AbstractRefreshableCacheEvent.java
rename to repository/src/main/java/org/alfresco/repo/cache/AbstractRefreshableCacheEvent.java
diff --git a/src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCache.java b/repository/src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCacheRegistry.java b/repository/src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCacheRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCacheRegistry.java
rename to repository/src/main/java/org/alfresco/repo/cache/AsynchronouslyRefreshedCacheRegistry.java
diff --git a/src/main/java/org/alfresco/repo/cache/CacheFactory.java b/repository/src/main/java/org/alfresco/repo/cache/CacheFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/CacheFactory.java
rename to repository/src/main/java/org/alfresco/repo/cache/CacheFactory.java
diff --git a/src/main/java/org/alfresco/repo/cache/CacheStatistics.java b/repository/src/main/java/org/alfresco/repo/cache/CacheStatistics.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/CacheStatistics.java
rename to repository/src/main/java/org/alfresco/repo/cache/CacheStatistics.java
diff --git a/src/main/java/org/alfresco/repo/cache/CacheStatisticsCreated.java b/repository/src/main/java/org/alfresco/repo/cache/CacheStatisticsCreated.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/CacheStatisticsCreated.java
rename to repository/src/main/java/org/alfresco/repo/cache/CacheStatisticsCreated.java
diff --git a/src/main/java/org/alfresco/repo/cache/DefaultCacheFactory.java b/repository/src/main/java/org/alfresco/repo/cache/DefaultCacheFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/DefaultCacheFactory.java
rename to repository/src/main/java/org/alfresco/repo/cache/DefaultCacheFactory.java
diff --git a/src/main/java/org/alfresco/repo/cache/DefaultSimpleCache.java b/repository/src/main/java/org/alfresco/repo/cache/DefaultSimpleCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/DefaultSimpleCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/DefaultSimpleCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/InMemoryCacheStatistics.java b/repository/src/main/java/org/alfresco/repo/cache/InMemoryCacheStatistics.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/InMemoryCacheStatistics.java
rename to repository/src/main/java/org/alfresco/repo/cache/InMemoryCacheStatistics.java
diff --git a/src/main/java/org/alfresco/repo/cache/NoStatsForCache.java b/repository/src/main/java/org/alfresco/repo/cache/NoStatsForCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/NoStatsForCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/NoStatsForCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/NullCache.java b/repository/src/main/java/org/alfresco/repo/cache/NullCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/NullCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/NullCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/OperationStats.java b/repository/src/main/java/org/alfresco/repo/cache/OperationStats.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/OperationStats.java
rename to repository/src/main/java/org/alfresco/repo/cache/OperationStats.java
diff --git a/src/main/java/org/alfresco/repo/cache/RefreshableCache.java b/repository/src/main/java/org/alfresco/repo/cache/RefreshableCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/RefreshableCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/RefreshableCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/RefreshableCacheEvent.java b/repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/RefreshableCacheEvent.java
rename to repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheEvent.java
diff --git a/src/main/java/org/alfresco/repo/cache/RefreshableCacheListener.java b/repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/RefreshableCacheListener.java
rename to repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheListener.java
diff --git a/src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshEvent.java b/repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshEvent.java
rename to repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshEvent.java
diff --git a/src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshedEvent.java b/repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshedEvent.java
rename to repository/src/main/java/org/alfresco/repo/cache/RefreshableCacheRefreshedEvent.java
diff --git a/src/main/java/org/alfresco/repo/cache/TransactionStats.java b/repository/src/main/java/org/alfresco/repo/cache/TransactionStats.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/TransactionStats.java
rename to repository/src/main/java/org/alfresco/repo/cache/TransactionStats.java
diff --git a/src/main/java/org/alfresco/repo/cache/TransactionalCache.java b/repository/src/main/java/org/alfresco/repo/cache/TransactionalCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/TransactionalCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/TransactionalCache.java
diff --git a/src/main/java/org/alfresco/repo/cache/lookup/CacheRegionKey.java b/repository/src/main/java/org/alfresco/repo/cache/lookup/CacheRegionKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/lookup/CacheRegionKey.java
rename to repository/src/main/java/org/alfresco/repo/cache/lookup/CacheRegionKey.java
diff --git a/src/main/java/org/alfresco/repo/cache/lookup/CacheRegionValueKey.java b/repository/src/main/java/org/alfresco/repo/cache/lookup/CacheRegionValueKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/lookup/CacheRegionValueKey.java
rename to repository/src/main/java/org/alfresco/repo/cache/lookup/CacheRegionValueKey.java
diff --git a/src/main/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java b/repository/src/main/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java
rename to repository/src/main/java/org/alfresco/repo/cache/lookup/EntityLookupCache.java
diff --git a/src/main/java/org/alfresco/repo/calendar/CalendarEntryImpl.java b/repository/src/main/java/org/alfresco/repo/calendar/CalendarEntryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/CalendarEntryImpl.java
rename to repository/src/main/java/org/alfresco/repo/calendar/CalendarEntryImpl.java
diff --git a/src/main/java/org/alfresco/repo/calendar/CalendarModel.java b/repository/src/main/java/org/alfresco/repo/calendar/CalendarModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/CalendarModel.java
rename to repository/src/main/java/org/alfresco/repo/calendar/CalendarModel.java
diff --git a/src/main/java/org/alfresco/repo/calendar/CalendarServiceImpl.java b/repository/src/main/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/calendar/CalendarServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/calendar/cannedqueries/CalendarEntity.java b/repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/CalendarEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/cannedqueries/CalendarEntity.java
rename to repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/CalendarEntity.java
diff --git a/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java b/repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryTestHook.java b/repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryTestHook.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryTestHook.java
rename to repository/src/main/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQueryTestHook.java
diff --git a/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java b/repository/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java
rename to repository/src/main/java/org/alfresco/repo/client/config/ClientAppConfig.java
diff --git a/src/main/java/org/alfresco/repo/client/config/ClientAppNotFoundException.java b/repository/src/main/java/org/alfresco/repo/client/config/ClientAppNotFoundException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/client/config/ClientAppNotFoundException.java
rename to repository/src/main/java/org/alfresco/repo/client/config/ClientAppNotFoundException.java
diff --git a/src/main/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java b/repository/src/main/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/coci/CheckOutCheckInServicePolicies.java b/repository/src/main/java/org/alfresco/repo/coci/CheckOutCheckInServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/coci/CheckOutCheckInServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/coci/CheckOutCheckInServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/coci/CheckedOutAspect.java b/repository/src/main/java/org/alfresco/repo/coci/CheckedOutAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/coci/CheckedOutAspect.java
rename to repository/src/main/java/org/alfresco/repo/coci/CheckedOutAspect.java
diff --git a/src/main/java/org/alfresco/repo/coci/WorkingCopyAspect.java b/repository/src/main/java/org/alfresco/repo/coci/WorkingCopyAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/coci/WorkingCopyAspect.java
rename to repository/src/main/java/org/alfresco/repo/coci/WorkingCopyAspect.java
diff --git a/src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceExtension.java b/repository/src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceTrait.java b/repository/src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/coci/traitextender/CheckOutCheckInServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/config/ConfigDataCache.java b/repository/src/main/java/org/alfresco/repo/config/ConfigDataCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/config/ConfigDataCache.java
rename to repository/src/main/java/org/alfresco/repo/config/ConfigDataCache.java
diff --git a/src/main/java/org/alfresco/repo/config/ImmutableConfig.java b/repository/src/main/java/org/alfresco/repo/config/ImmutableConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/config/ImmutableConfig.java
rename to repository/src/main/java/org/alfresco/repo/config/ImmutableConfig.java
diff --git a/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java b/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java
rename to repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java
diff --git a/src/main/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java b/repository/src/main/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java
rename to repository/src/main/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java
diff --git a/src/main/java/org/alfresco/repo/configuration/ConfigurableService.java b/repository/src/main/java/org/alfresco/repo/configuration/ConfigurableService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/configuration/ConfigurableService.java
rename to repository/src/main/java/org/alfresco/repo/configuration/ConfigurableService.java
diff --git a/src/main/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java b/repository/src/main/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/configuration/ConfigurableServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractContentAccessor.java b/repository/src/main/java/org/alfresco/repo/content/AbstractContentAccessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractContentAccessor.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractContentAccessor.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractContentReader.java b/repository/src/main/java/org/alfresco/repo/content/AbstractContentReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractContentReader.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractContentReader.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractContentStore.java b/repository/src/main/java/org/alfresco/repo/content/AbstractContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractContentStore.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractContentStore.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractContentStreamListener.java b/repository/src/main/java/org/alfresco/repo/content/AbstractContentStreamListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractContentStreamListener.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractContentStreamListener.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractContentWriter.java b/repository/src/main/java/org/alfresco/repo/content/AbstractContentWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractContentWriter.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractContentWriter.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java b/repository/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
diff --git a/src/main/java/org/alfresco/repo/content/AbstractStreamAwareProxy.java b/repository/src/main/java/org/alfresco/repo/content/AbstractStreamAwareProxy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/AbstractStreamAwareProxy.java
rename to repository/src/main/java/org/alfresco/repo/content/AbstractStreamAwareProxy.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentExistsException.java b/repository/src/main/java/org/alfresco/repo/content/ContentExistsException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentExistsException.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentExistsException.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentLimitProvider.java b/repository/src/main/java/org/alfresco/repo/content/ContentLimitProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentLimitProvider.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentLimitProvider.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentLimitViolationException.java b/repository/src/main/java/org/alfresco/repo/content/ContentLimitViolationException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentLimitViolationException.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentLimitViolationException.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java b/repository/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentServicePolicies.java b/repository/src/main/java/org/alfresco/repo/content/ContentServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentStoreCreatedEvent.java b/repository/src/main/java/org/alfresco/repo/content/ContentStoreCreatedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentStoreCreatedEvent.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentStoreCreatedEvent.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentTransformServiceAdaptor.java b/repository/src/main/java/org/alfresco/repo/content/ContentTransformServiceAdaptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentTransformServiceAdaptor.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentTransformServiceAdaptor.java
diff --git a/src/main/java/org/alfresco/repo/content/ContentWorker.java b/repository/src/main/java/org/alfresco/repo/content/ContentWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/ContentWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/ContentWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/EmptyContentReader.java b/repository/src/main/java/org/alfresco/repo/content/EmptyContentReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/EmptyContentReader.java
rename to repository/src/main/java/org/alfresco/repo/content/EmptyContentReader.java
diff --git a/src/main/java/org/alfresco/repo/content/JodConverter.java b/repository/src/main/java/org/alfresco/repo/content/JodConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/JodConverter.java
rename to repository/src/main/java/org/alfresco/repo/content/JodConverter.java
diff --git a/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java b/repository/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java
rename to repository/src/main/java/org/alfresco/repo/content/JodConverterSharedInstance.java
diff --git a/src/main/java/org/alfresco/repo/content/LimitedStreamCopier.java b/repository/src/main/java/org/alfresco/repo/content/LimitedStreamCopier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/LimitedStreamCopier.java
rename to repository/src/main/java/org/alfresco/repo/content/LimitedStreamCopier.java
diff --git a/src/main/java/org/alfresco/repo/content/NodeContentContext.java b/repository/src/main/java/org/alfresco/repo/content/NodeContentContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/NodeContentContext.java
rename to repository/src/main/java/org/alfresco/repo/content/NodeContentContext.java
diff --git a/src/main/java/org/alfresco/repo/content/RoutingContentService.java b/repository/src/main/java/org/alfresco/repo/content/RoutingContentService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/RoutingContentService.java
rename to repository/src/main/java/org/alfresco/repo/content/RoutingContentService.java
diff --git a/src/main/java/org/alfresco/repo/content/StreamAwareContentReaderProxy.java b/repository/src/main/java/org/alfresco/repo/content/StreamAwareContentReaderProxy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/StreamAwareContentReaderProxy.java
rename to repository/src/main/java/org/alfresco/repo/content/StreamAwareContentReaderProxy.java
diff --git a/src/main/java/org/alfresco/repo/content/StreamAwareContentWriterProxy.java b/repository/src/main/java/org/alfresco/repo/content/StreamAwareContentWriterProxy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/StreamAwareContentWriterProxy.java
rename to repository/src/main/java/org/alfresco/repo/content/StreamAwareContentWriterProxy.java
diff --git a/src/main/java/org/alfresco/repo/content/TikaOfficeDetectParser.java b/repository/src/main/java/org/alfresco/repo/content/TikaOfficeDetectParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/TikaOfficeDetectParser.java
rename to repository/src/main/java/org/alfresco/repo/content/TikaOfficeDetectParser.java
diff --git a/src/main/java/org/alfresco/repo/content/UnsupportedContentUrlException.java b/repository/src/main/java/org/alfresco/repo/content/UnsupportedContentUrlException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/UnsupportedContentUrlException.java
rename to repository/src/main/java/org/alfresco/repo/content/UnsupportedContentUrlException.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/BackingStoreAwareCacheWriter.java b/repository/src/main/java/org/alfresco/repo/content/caching/BackingStoreAwareCacheWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/BackingStoreAwareCacheWriter.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/BackingStoreAwareCacheWriter.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/CacheFileProps.java b/repository/src/main/java/org/alfresco/repo/content/caching/CacheFileProps.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/CacheFileProps.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/CacheFileProps.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/CacheMissException.java b/repository/src/main/java/org/alfresco/repo/content/caching/CacheMissException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/CacheMissException.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/CacheMissException.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java b/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/CachingContentStoreCreatedEvent.java b/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStoreCreatedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/CachingContentStoreCreatedEvent.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStoreCreatedEvent.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/CachingContentStoreEvent.java b/repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStoreEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/CachingContentStoreEvent.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStoreEvent.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/ContentCache.java b/repository/src/main/java/org/alfresco/repo/content/caching/ContentCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/ContentCache.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/ContentCache.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/ContentCacheImpl.java b/repository/src/main/java/org/alfresco/repo/content/caching/ContentCacheImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/ContentCacheImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/ContentCacheImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/FileHandler.java b/repository/src/main/java/org/alfresco/repo/content/caching/FileHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/FileHandler.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/FileHandler.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/Key.java b/repository/src/main/java/org/alfresco/repo/content/caching/Key.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/Key.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/Key.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java b/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleaner.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanerCreatedEvent.java b/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanerCreatedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanerCreatedEvent.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanerCreatedEvent.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJob.java b/repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/quota/QuotaManagerStrategy.java b/repository/src/main/java/org/alfresco/repo/content/caching/quota/QuotaManagerStrategy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/quota/QuotaManagerStrategy.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/quota/QuotaManagerStrategy.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java b/repository/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategy.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategy.java b/repository/src/main/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategy.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategy.java
diff --git a/src/main/java/org/alfresco/repo/content/caching/quota/UsageTracker.java b/repository/src/main/java/org/alfresco/repo/content/caching/quota/UsageTracker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/caching/quota/UsageTracker.java
rename to repository/src/main/java/org/alfresco/repo/content/caching/quota/UsageTracker.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerListener.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerListener.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerListener.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerScalabilityRunner.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerScalabilityRunner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerScalabilityRunner.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerScalabilityRunner.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanupJob.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/ContentStoreCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/DeletedContentBackupCleanerListener.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/DeletedContentBackupCleanerListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/DeletedContentBackupCleanerListener.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/DeletedContentBackupCleanerListener.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
diff --git a/src/main/java/org/alfresco/repo/content/cleanup/FileWipingContentCleanerListener.java b/repository/src/main/java/org/alfresco/repo/content/cleanup/FileWipingContentCleanerListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/cleanup/FileWipingContentCleanerListener.java
rename to repository/src/main/java/org/alfresco/repo/content/cleanup/FileWipingContentCleanerListener.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/DeletionMetricsRunner.java b/repository/src/main/java/org/alfresco/repo/content/filestore/DeletionMetricsRunner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/DeletionMetricsRunner.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/DeletionMetricsRunner.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/FileContentReader.java b/repository/src/main/java/org/alfresco/repo/content/filestore/FileContentReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/FileContentReader.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/FileContentReader.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/FileContentStore.java b/repository/src/main/java/org/alfresco/repo/content/filestore/FileContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/FileContentStore.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/FileContentStore.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/FileContentUrlProvider.java b/repository/src/main/java/org/alfresco/repo/content/filestore/FileContentUrlProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/FileContentUrlProvider.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/FileContentUrlProvider.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/FileContentWriter.java b/repository/src/main/java/org/alfresco/repo/content/filestore/FileContentWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/FileContentWriter.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/FileContentWriter.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/SpoofedTextContentReader.java b/repository/src/main/java/org/alfresco/repo/content/filestore/SpoofedTextContentReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/SpoofedTextContentReader.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/SpoofedTextContentReader.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/TimeBasedFileContentUrlProvider.java b/repository/src/main/java/org/alfresco/repo/content/filestore/TimeBasedFileContentUrlProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/TimeBasedFileContentUrlProvider.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/TimeBasedFileContentUrlProvider.java
diff --git a/src/main/java/org/alfresco/repo/content/filestore/VolumeAwareContentUrlProvider.java b/repository/src/main/java/org/alfresco/repo/content/filestore/VolumeAwareContentUrlProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/filestore/VolumeAwareContentUrlProvider.java
rename to repository/src/main/java/org/alfresco/repo/content/filestore/VolumeAwareContentUrlProvider.java
diff --git a/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java b/repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java
rename to repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoContentReader.java
diff --git a/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoStore.java b/repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/http/HttpAlfrescoStore.java
rename to repository/src/main/java/org/alfresco/repo/content/http/HttpAlfrescoStore.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracterWorker.java b/repository/src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracterWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracterWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/JodConverterMetadataExtracterWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MediaTypeDisablingDocumentSelector.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MediaTypeDisablingDocumentSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MediaTypeDisablingDocumentSelector.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MediaTypeDisablingDocumentSelector.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MetadataEmbedder.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MetadataEmbedder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MetadataEmbedder.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MetadataEmbedder.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterLimits.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterLimits.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterLimits.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterLimits.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java b/repository/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataWorker.java b/repository/src/main/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/PoiMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/PoiMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/PoiMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/PoiMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/TikaPoweredMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/TikaPoweredMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/TikaPoweredMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/TikaPoweredMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/TikaSpringConfiguredMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/TikaSpringConfiguredMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/TikaSpringConfiguredMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/TikaSpringConfiguredMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java b/repository/src/main/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java
rename to repository/src/main/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracter.java
diff --git a/src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java b/repository/src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java
rename to repository/src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java
diff --git a/src/main/java/org/alfresco/repo/content/selector/ContentWorkerSelector.java b/repository/src/main/java/org/alfresco/repo/content/selector/ContentWorkerSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/selector/ContentWorkerSelector.java
rename to repository/src/main/java/org/alfresco/repo/content/selector/ContentWorkerSelector.java
diff --git a/src/main/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java b/repository/src/main/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java
rename to repository/src/main/java/org/alfresco/repo/content/selector/RootElementNameContentWorkerSelector.java
diff --git a/src/main/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java b/repository/src/main/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java
rename to repository/src/main/java/org/alfresco/repo/content/selector/XPathContentWorkerSelector.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java b/repository/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java b/repository/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java b/repository/src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AbstractRemoteContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/AbstractRemoteContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AbstractRemoteContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AbstractRemoteContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AdminUiTransformerDebug.java b/repository/src/main/java/org/alfresco/repo/content/transform/AdminUiTransformerDebug.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AdminUiTransformerDebug.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AdminUiTransformerDebug.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ComplexContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/ComplexContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ComplexContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ComplexContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ContentTransformerHelper.java b/repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformerHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ContentTransformerHelper.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformerHelper.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ContentTransformerRegistry.java b/repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformerRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ContentTransformerRegistry.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformerRegistry.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ContentTransformerWorker.java b/repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformerWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ContentTransformerWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ContentTransformerWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/DoubleMap.java b/repository/src/main/java/org/alfresco/repo/content/transform/DoubleMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/DoubleMap.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/DoubleMap.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java b/repository/src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/EMLTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/EMLTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/EMLTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/EMLTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/EncodingAwareStringBean.java b/repository/src/main/java/org/alfresco/repo/content/transform/EncodingAwareStringBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/EncodingAwareStringBean.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/EncodingAwareStringBean.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ExplictTransformationDetails.java b/repository/src/main/java/org/alfresco/repo/content/transform/ExplictTransformationDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ExplictTransformationDetails.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ExplictTransformationDetails.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/FailoverContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/FailoverContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/FailoverContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/FailoverContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/HtmlParserContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/HtmlParserContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/HtmlParserContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/HtmlParserContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LegacyTransformerDebug.java b/repository/src/main/java/org/alfresco/repo/content/transform/LegacyTransformerDebug.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LegacyTransformerDebug.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LegacyTransformerDebug.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LocalFailoverTransform.java b/repository/src/main/java/org/alfresco/repo/content/transform/LocalFailoverTransform.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LocalFailoverTransform.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LocalFailoverTransform.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LocalPassThroughTransform.java b/repository/src/main/java/org/alfresco/repo/content/transform/LocalPassThroughTransform.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LocalPassThroughTransform.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LocalPassThroughTransform.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LocalPipelineTransform.java b/repository/src/main/java/org/alfresco/repo/content/transform/LocalPipelineTransform.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LocalPipelineTransform.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LocalPipelineTransform.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LocalTransform.java b/repository/src/main/java/org/alfresco/repo/content/transform/LocalTransform.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LocalTransform.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LocalTransform.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LocalTransformImpl.java b/repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LocalTransformImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java b/repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/LogEntries.java b/repository/src/main/java/org/alfresco/repo/content/transform/LogEntries.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/LogEntries.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/LogEntries.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/MailContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/MailContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/MailContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/MailContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/MediaWikiContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/MediaWikiContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/MediaWikiContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/MediaWikiContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java b/repository/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/PdfBoxContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/PdfBoxContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/PdfBoxContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/PdfBoxContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/PoiContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/PoiContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/PoiContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/PoiContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/PoiHssfContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/RemoteTransformerClient.java b/repository/src/main/java/org/alfresco/repo/content/transform/RemoteTransformerClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/RemoteTransformerClient.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/RemoteTransformerClient.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerOptions.java b/repository/src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerOptions.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerOptions.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java b/repository/src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/StringExtractingContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/StringExtractingContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/StringExtractingContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/StringExtractingContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/SupportedTransformation.java b/repository/src/main/java/org/alfresco/repo/content/transform/SupportedTransformation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/SupportedTransformation.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/SupportedTransformation.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TextToPdfContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/TextToPdfContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TextToPdfContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TextToPdfContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java b/repository/src/main/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java b/repository/src/main/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfig.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfig.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfig.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformers.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformers.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformers.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformers.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigImpl.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigLimits.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigLimits.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigLimits.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigLimits.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBean.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBean.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBean.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImpl.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigProperty.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigProperty.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigProperty.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigStatistics.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigStatistics.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigStatistics.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigStatistics.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerConfigSupported.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigSupported.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerConfigSupported.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerConfigSupported.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerDebug.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerDebug.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerDebug.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerDebug.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerDebugLog.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerDebugLog.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerDebugLog.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerDebugLog.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerInfoException.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerInfoException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerInfoException.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerInfoException.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerLog.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerLog.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerLog.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerLog.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerLogger.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerLogger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerLogger.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerLogger.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerPropertyGetter.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerPropertyGetter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerPropertyGetter.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerPropertyGetter.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractor.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractor.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractor.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerPropertySetter.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerPropertySetter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerPropertySetter.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerPropertySetter.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerSelector.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerSelector.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerSelector.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImpl.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImplOriginal.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImplOriginal.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImplOriginal.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerSelectorImplOriginal.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerStatistics.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerStatistics.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerStatistics.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerStatistics.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerStatisticsImpl.java b/repository/src/main/java/org/alfresco/repo/content/transform/TransformerStatisticsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/TransformerStatisticsImpl.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/TransformerStatisticsImpl.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/UnimportantTransformException.java b/repository/src/main/java/org/alfresco/repo/content/transform/UnimportantTransformException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/UnimportantTransformException.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/UnimportantTransformException.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/UnsupportedTransformationException.java b/repository/src/main/java/org/alfresco/repo/content/transform/UnsupportedTransformationException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/UnsupportedTransformationException.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/UnsupportedTransformationException.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java b/repository/src/main/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/magick/ImageCropOptions.java b/repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageCropOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/magick/ImageCropOptions.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageCropOptions.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java b/repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/magick/ImageResizeOptions.java b/repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageResizeOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/magick/ImageResizeOptions.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageResizeOptions.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java b/repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java b/repository/src/main/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/pdfrenderer/AlfrescoPdfRendererContentTransformerWorker.java
diff --git a/src/main/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java b/repository/src/main/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java
rename to repository/src/main/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java
diff --git a/src/main/java/org/alfresco/repo/copy/AbstractBaseCopyService.java b/repository/src/main/java/org/alfresco/repo/copy/AbstractBaseCopyService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/AbstractBaseCopyService.java
rename to repository/src/main/java/org/alfresco/repo/copy/AbstractBaseCopyService.java
diff --git a/src/main/java/org/alfresco/repo/copy/AbstractCopyBehaviourCallback.java b/repository/src/main/java/org/alfresco/repo/copy/AbstractCopyBehaviourCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/AbstractCopyBehaviourCallback.java
rename to repository/src/main/java/org/alfresco/repo/copy/AbstractCopyBehaviourCallback.java
diff --git a/src/main/java/org/alfresco/repo/copy/CompoundCopyBehaviourCallback.java b/repository/src/main/java/org/alfresco/repo/copy/CompoundCopyBehaviourCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/CompoundCopyBehaviourCallback.java
rename to repository/src/main/java/org/alfresco/repo/copy/CompoundCopyBehaviourCallback.java
diff --git a/src/main/java/org/alfresco/repo/copy/CopyBehaviourCallback.java b/repository/src/main/java/org/alfresco/repo/copy/CopyBehaviourCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/CopyBehaviourCallback.java
rename to repository/src/main/java/org/alfresco/repo/copy/CopyBehaviourCallback.java
diff --git a/src/main/java/org/alfresco/repo/copy/CopyDetails.java b/repository/src/main/java/org/alfresco/repo/copy/CopyDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/CopyDetails.java
rename to repository/src/main/java/org/alfresco/repo/copy/CopyDetails.java
diff --git a/src/main/java/org/alfresco/repo/copy/CopyServiceImpl.java b/repository/src/main/java/org/alfresco/repo/copy/CopyServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/CopyServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/copy/CopyServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/copy/CopyServicePolicies.java b/repository/src/main/java/org/alfresco/repo/copy/CopyServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/CopyServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/copy/CopyServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/copy/DefaultCopyBehaviourCallback.java b/repository/src/main/java/org/alfresco/repo/copy/DefaultCopyBehaviourCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/DefaultCopyBehaviourCallback.java
rename to repository/src/main/java/org/alfresco/repo/copy/DefaultCopyBehaviourCallback.java
diff --git a/src/main/java/org/alfresco/repo/copy/DoNothingCopyBehaviourCallback.java b/repository/src/main/java/org/alfresco/repo/copy/DoNothingCopyBehaviourCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/DoNothingCopyBehaviourCallback.java
rename to repository/src/main/java/org/alfresco/repo/copy/DoNothingCopyBehaviourCallback.java
diff --git a/src/main/java/org/alfresco/repo/copy/query/AbstractCopyCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/copy/query/AbstractCopyCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/query/AbstractCopyCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/copy/query/AbstractCopyCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/copy/query/CopyEntity.java b/repository/src/main/java/org/alfresco/repo/copy/query/CopyEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/query/CopyEntity.java
rename to repository/src/main/java/org/alfresco/repo/copy/query/CopyEntity.java
diff --git a/src/main/java/org/alfresco/repo/copy/query/CopyParametersEntity.java b/repository/src/main/java/org/alfresco/repo/copy/query/CopyParametersEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/query/CopyParametersEntity.java
rename to repository/src/main/java/org/alfresco/repo/copy/query/CopyParametersEntity.java
diff --git a/src/main/java/org/alfresco/repo/copy/query/GetCopiedCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/copy/query/GetCopiedCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/query/GetCopiedCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/copy/query/GetCopiedCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/copy/query/GetCopiesCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/copy/query/GetCopiesCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/query/GetCopiesCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/copy/query/GetCopiesCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackExtension.java b/repository/src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackExtension.java
rename to repository/src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackExtension.java
diff --git a/src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackTrait.java b/repository/src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackTrait.java
rename to repository/src/main/java/org/alfresco/repo/copy/traitextender/DefaultCopyBehaviourCallbackTrait.java
diff --git a/src/main/java/org/alfresco/repo/deployment/DeploymentMethod.java b/repository/src/main/java/org/alfresco/repo/deployment/DeploymentMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/deployment/DeploymentMethod.java
rename to repository/src/main/java/org/alfresco/repo/deployment/DeploymentMethod.java
diff --git a/src/main/java/org/alfresco/repo/deployment/DeploymentMethodProvider.java b/repository/src/main/java/org/alfresco/repo/deployment/DeploymentMethodProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/deployment/DeploymentMethodProvider.java
rename to repository/src/main/java/org/alfresco/repo/deployment/DeploymentMethodProvider.java
diff --git a/src/main/java/org/alfresco/repo/deployment/DeploymentMethodProviderImpl.java b/repository/src/main/java/org/alfresco/repo/deployment/DeploymentMethodProviderImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/deployment/DeploymentMethodProviderImpl.java
rename to repository/src/main/java/org/alfresco/repo/deployment/DeploymentMethodProviderImpl.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/DescriptorDAO.java b/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/DescriptorDAO.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/DescriptorDAO.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/DescriptorServiceAvailableEvent.java b/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorServiceAvailableEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/DescriptorServiceAvailableEvent.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/DescriptorServiceAvailableEvent.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java b/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java b/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/LicenseResourceComponent.java b/repository/src/main/java/org/alfresco/repo/descriptor/LicenseResourceComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/LicenseResourceComponent.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/LicenseResourceComponent.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java b/repository/src/main/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/RepositoryDescriptorDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java b/repository/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java b/repository/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryModelType.java b/repository/src/main/java/org/alfresco/repo/dictionary/DictionaryModelType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/DictionaryModelType.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/DictionaryModelType.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java b/repository/src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrappedEvent.java b/repository/src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrappedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrappedEvent.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrappedEvent.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/DynamicCreateRepositoryLocation.java b/repository/src/main/java/org/alfresco/repo/dictionary/DynamicCreateRepositoryLocation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/DynamicCreateRepositoryLocation.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/DynamicCreateRepositoryLocation.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/DynamicModelPolicies.java b/repository/src/main/java/org/alfresco/repo/dictionary/DynamicModelPolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/DynamicModelPolicies.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/DynamicModelPolicies.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/ModelInUseException.java b/repository/src/main/java/org/alfresco/repo/dictionary/ModelInUseException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/ModelInUseException.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/ModelInUseException.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/ModelNotInUseException.java b/repository/src/main/java/org/alfresco/repo/dictionary/ModelNotInUseException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/ModelNotInUseException.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/ModelNotInUseException.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/ModelValidator.java b/repository/src/main/java/org/alfresco/repo/dictionary/ModelValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/ModelValidator.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/ModelValidator.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/ModelValidatorImpl.java b/repository/src/main/java/org/alfresco/repo/dictionary/ModelValidatorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/ModelValidatorImpl.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/ModelValidatorImpl.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/RepositoryLocation.java b/repository/src/main/java/org/alfresco/repo/dictionary/RepositoryLocation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/RepositoryLocation.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/RepositoryLocation.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/TestModel.java b/repository/src/main/java/org/alfresco/repo/dictionary/TestModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/TestModel.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/TestModel.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidator.java b/repository/src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidator.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidator.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImpl.java b/repository/src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImpl.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImpl.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/AuthorityNameConstraint.java b/repository/src/main/java/org/alfresco/repo/dictionary/constraint/AuthorityNameConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/constraint/AuthorityNameConstraint.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/constraint/AuthorityNameConstraint.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/UserNameConstraint.java b/repository/src/main/java/org/alfresco/repo/dictionary/constraint/UserNameConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/constraint/UserNameConstraint.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/constraint/UserNameConstraint.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractCalendarPeriodProvider.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractCalendarPeriodProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/AbstractCalendarPeriodProvider.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractCalendarPeriodProvider.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractEndOfCalendarPeriodProvider.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractEndOfCalendarPeriodProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/AbstractEndOfCalendarPeriodProvider.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractEndOfCalendarPeriodProvider.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/AbstractPeriodProvider.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Cron.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Cron.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Cron.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Cron.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Days.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Days.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Days.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Days.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialMonth.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialMonth.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialMonth.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialMonth.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialQuarter.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialQuarter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialQuarter.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialQuarter.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialYear.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialYear.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialYear.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfFinancialYear.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfMonth.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfMonth.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/EndOfMonth.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfMonth.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfQuarter.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfQuarter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/EndOfQuarter.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfQuarter.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfYear.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfYear.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/EndOfYear.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/EndOfYear.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Immediately.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Immediately.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Immediately.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Immediately.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Months.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Months.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Months.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Months.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/NoPeriod.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/NoPeriod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/NoPeriod.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/NoPeriod.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Quarters.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Quarters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Quarters.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Quarters.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Weeks.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Weeks.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Weeks.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Weeks.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/XMLDuration.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/XMLDuration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/XMLDuration.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/XMLDuration.java
diff --git a/src/main/java/org/alfresco/repo/dictionary/types/period/Years.java b/repository/src/main/java/org/alfresco/repo/dictionary/types/period/Years.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/dictionary/types/period/Years.java
rename to repository/src/main/java/org/alfresco/repo/dictionary/types/period/Years.java
diff --git a/src/main/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/discussion/PostInfoImpl.java b/repository/src/main/java/org/alfresco/repo/discussion/PostInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/PostInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/discussion/PostInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/discussion/TopicInfoImpl.java b/repository/src/main/java/org/alfresco/repo/discussion/TopicInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/TopicInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/discussion/TopicInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQuery.java b/repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/GetDiscussionTopcisWithPostsCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/discussion/cannedqueries/NodeWithChildrenEntity.java b/repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/NodeWithChildrenEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/discussion/cannedqueries/NodeWithChildrenEntity.java
rename to repository/src/main/java/org/alfresco/repo/discussion/cannedqueries/NodeWithChildrenEntity.java
diff --git a/src/main/java/org/alfresco/repo/doclink/DocumentLinkServiceImpl.java b/repository/src/main/java/org/alfresco/repo/doclink/DocumentLinkServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/doclink/DocumentLinkServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/doclink/DocumentLinkServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQuery.java b/repository/src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/doclink/GetDoclinkNodesCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/domain/CrcHelper.java b/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/CrcHelper.java
rename to repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ActivitiesDAO.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ActivitiesDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ActivitiesDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ActivitiesDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedDAO.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ActivityFeedDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedQueryEntity.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedQueryEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ActivityFeedQueryEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ActivityFeedQueryEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ActivityPostDAO.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ActivityPostDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ActivityPostDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ActivityPostDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/FeedControlDAO.java b/repository/src/main/java/org/alfresco/repo/domain/activities/FeedControlDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/FeedControlDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/FeedControlDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/FeedControlEntity.java b/repository/src/main/java/org/alfresco/repo/domain/activities/FeedControlEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/FeedControlEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/FeedControlEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivitiesDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivitiesDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivitiesDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivitiesDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditApplicationEntity.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditApplicationEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditApplicationEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditApplicationEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditDeleteParameters.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDeleteParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditDeleteParameters.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditDeleteParameters.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditEntryEntity.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditEntryEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditEntryEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditEntryEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditModelEntity.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditModelEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditModelEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditModelEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditQueryParameters.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditQueryParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditQueryParameters.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditQueryParameters.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/AuditQueryResult.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditQueryResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/AuditQueryResult.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/AuditQueryResult.java
diff --git a/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ContentDataEntity.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentDataEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ContentDataEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentDataEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlKeyEntity.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlKeyEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlKeyEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlKeyEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlOrphanQuery.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlOrphanQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlOrphanQuery.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlOrphanQuery.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/EncryptedKey.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/EncryptedKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/EncryptedKey.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/EncryptedKey.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/SymmetricKeyCount.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/SymmetricKeyCount.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/SymmetricKeyCount.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/SymmetricKeyCount.java
diff --git a/src/main/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/control/AbstractControlDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/control/AbstractControlDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/control/AbstractControlDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/control/AbstractControlDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/control/ControlDAO.java b/repository/src/main/java/org/alfresco/repo/domain/control/ControlDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/control/ControlDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/control/ControlDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/control/ibatis/ControlDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/control/ibatis/ControlDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/control/ibatis/ControlDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/control/ibatis/ControlDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/Dialect.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/Dialect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/Dialect.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/Dialect.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java b/repository/src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java
rename to repository/src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java
diff --git a/src/main/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/encoding/AbstractEncodingDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/encoding/EncodingDAO.java b/repository/src/main/java/org/alfresco/repo/domain/encoding/EncodingDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/encoding/EncodingDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/encoding/EncodingDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/encoding/EncodingEntity.java b/repository/src/main/java/org/alfresco/repo/domain/encoding/EncodingEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/encoding/EncodingEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/encoding/EncodingEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/locale/AbstractLocaleDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/locale/AbstractLocaleDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locale/AbstractLocaleDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/locale/AbstractLocaleDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/locale/LocaleDAO.java b/repository/src/main/java/org/alfresco/repo/domain/locale/LocaleDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locale/LocaleDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/locale/LocaleDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/locale/LocaleEntity.java b/repository/src/main/java/org/alfresco/repo/domain/locale/LocaleEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locale/LocaleEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/locale/LocaleEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/locale/ibatis/LocaleDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/locale/ibatis/LocaleDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locale/ibatis/LocaleDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/locale/ibatis/LocaleDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/locks/AbstractLockDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/locks/AbstractLockDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locks/AbstractLockDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/locks/AbstractLockDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/locks/LockDAO.java b/repository/src/main/java/org/alfresco/repo/domain/locks/LockDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locks/LockDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/locks/LockDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/locks/LockDetails.java b/repository/src/main/java/org/alfresco/repo/domain/locks/LockDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locks/LockDetails.java
rename to repository/src/main/java/org/alfresco/repo/domain/locks/LockDetails.java
diff --git a/src/main/java/org/alfresco/repo/domain/locks/LockEntity.java b/repository/src/main/java/org/alfresco/repo/domain/locks/LockEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locks/LockEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/locks/LockEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/locks/LockResourceEntity.java b/repository/src/main/java/org/alfresco/repo/domain/locks/LockResourceEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locks/LockResourceEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/locks/LockResourceEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java b/repository/src/main/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java b/repository/src/main/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/AuditablePropertiesEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/AuditablePropertiesEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/AuditablePropertiesEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/AuditablePropertiesEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ChildAssocEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/ChildAssocEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ChildAssocEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ChildAssocEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ChildByNameKey.java b/repository/src/main/java/org/alfresco/repo/domain/node/ChildByNameKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ChildByNameKey.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ChildByNameKey.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ChildPropertyEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/ChildPropertyEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ChildPropertyEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ChildPropertyEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ContentDataId.java b/repository/src/main/java/org/alfresco/repo/domain/node/ContentDataId.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ContentDataId.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ContentDataId.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ContentDataWithId.java b/repository/src/main/java/org/alfresco/repo/domain/node/ContentDataWithId.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ContentDataWithId.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ContentDataWithId.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/LocalizedPropertiesEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/LocalizedPropertiesEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/LocalizedPropertiesEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/LocalizedPropertiesEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/Node.java b/repository/src/main/java/org/alfresco/repo/domain/node/Node.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/Node.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/Node.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeAssocEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeAssocEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeAssocEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeAssocEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeExistsException.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeExistsException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeExistsException.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeExistsException.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeIdAndAclId.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeIdAndAclId.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeIdAndAclId.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeIdAndAclId.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodePropertyEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodePropertyEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodePropertyHelper.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodePropertyHelper.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyHelper.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodePropertyKey.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodePropertyKey.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyKey.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodePropertyValue.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyValue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodePropertyValue.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodePropertyValue.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeRangeEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeRangeEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeRangeEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeRangeEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeUpdateEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeUpdateEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeUpdateEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeUpdateEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NodeVersionKey.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeVersionKey.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NodeVersionKey.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NodeVersionKey.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/NonRootNodeWithoutParentsException.java b/repository/src/main/java/org/alfresco/repo/domain/node/NonRootNodeWithoutParentsException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/NonRootNodeWithoutParentsException.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/NonRootNodeWithoutParentsException.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ParentAssocsInfo.java b/repository/src/main/java/org/alfresco/repo/domain/node/ParentAssocsInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ParentAssocsInfo.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ParentAssocsInfo.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/PrimaryChildrenAclUpdateEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/PrimaryChildrenAclUpdateEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/PrimaryChildrenAclUpdateEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/PrimaryChildrenAclUpdateEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ReferenceablePropertiesEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/ReferenceablePropertiesEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ReferenceablePropertiesEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ReferenceablePropertiesEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/StoreEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/StoreEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/StoreEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/StoreEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/Transaction.java b/repository/src/main/java/org/alfresco/repo/domain/node/Transaction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/Transaction.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/Transaction.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/TransactionEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/TransactionEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/TransactionEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/TransactionEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/TransactionQueryEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/TransactionQueryEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/TransactionQueryEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/TransactionQueryEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeBatchLoadEntity.java b/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeBatchLoadEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ibatis/NodeBatchLoadEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeBatchLoadEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/AbstractAppliedPatchDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/patch/AbstractAppliedPatchDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/AbstractAppliedPatchDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/AbstractAppliedPatchDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/AppliedPatchDAO.java b/repository/src/main/java/org/alfresco/repo/domain/patch/AppliedPatchDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/AppliedPatchDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/AppliedPatchDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/AppliedPatchEntity.java b/repository/src/main/java/org/alfresco/repo/domain/patch/AppliedPatchEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/AppliedPatchEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/AppliedPatchEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/PatchDAO.java b/repository/src/main/java/org/alfresco/repo/domain/patch/PatchDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/PatchDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/PatchDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/ibatis/IdListOfIdsParam.java b/repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/IdListOfIdsParam.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/ibatis/IdListOfIdsParam.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/IdListOfIdsParam.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/patch/ibatis/SizeCurrentParams.java b/repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/SizeCurrentParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/patch/ibatis/SizeCurrentParams.java
rename to repository/src/main/java/org/alfresco/repo/domain/patch/ibatis/SizeCurrentParams.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/ADMAccessControlListDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/ADMPermissionsDaoComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AccessControlListDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/Ace.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/Ace.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/Ace.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/Ace.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AceContext.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AceContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AceContext.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AceContext.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AceContextEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AceContextEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AceContextEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AceContextEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AceEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AceEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AceEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AceEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/Acl.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/Acl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/Acl.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/Acl.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclChangeSet.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclChangeSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclChangeSet.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclChangeSet.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclChangeSetEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclChangeSetEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclChangeSetEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclChangeSetEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclDAO.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclMember.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclMember.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclMember.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclMember.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclMemberEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclMemberEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclMemberEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclMemberEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/Authority.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/Authority.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/Authority.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/Authority.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AuthorityAlias.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AuthorityAlias.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AuthorityAlias.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AuthorityAlias.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AuthorityAliasEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AuthorityAliasEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AuthorityAliasEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AuthorityAliasEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/AuthorityEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/AuthorityEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/AuthorityEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/AuthorityEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterJob.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/Permission.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/Permission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/Permission.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/Permission.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/PermissionEntity.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/PermissionEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/PermissionEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/PermissionEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java b/repository/src/main/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/DefaultPropertyTypeConverter.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyClassEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyDateValueEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyDoubleValueEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryParameter.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryParameter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryParameter.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryParameter.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryResult.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryResult.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyIdQueryResult.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyIdSearchRow.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyIdSearchRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyIdSearchRow.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyIdSearchRow.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyLinkEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyLinkEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyLinkEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyLinkEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyRootEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyRootEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyRootEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyRootEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertySerializableValueEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringQueryEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyTypeConverter.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyTypeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyTypeConverter.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyTypeConverter.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueConstraintViolation.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueConstraintViolation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueConstraintViolation.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueConstraintViolation.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueContextEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueContextEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueContextEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyUniqueContextEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/PropertyValueEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/qname/AbstractQNameDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/qname/AbstractQNameDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/qname/AbstractQNameDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/qname/AbstractQNameDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/qname/NamespaceEntity.java b/repository/src/main/java/org/alfresco/repo/domain/qname/NamespaceEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/qname/NamespaceEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/qname/NamespaceEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/qname/QNameDAO.java b/repository/src/main/java/org/alfresco/repo/domain/qname/QNameDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/qname/QNameDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/qname/QNameDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/qname/QNameEntity.java b/repository/src/main/java/org/alfresco/repo/domain/qname/QNameEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/qname/QNameEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/qname/QNameEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/qname/ibatis/QNameDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/qname/ibatis/QNameDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/qname/ibatis/QNameDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/qname/ibatis/QNameDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/query/AbstractCannedQueryDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/query/AbstractCannedQueryDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/query/AbstractCannedQueryDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/query/AbstractCannedQueryDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/query/CannedQueryDAO.java b/repository/src/main/java/org/alfresco/repo/domain/query/CannedQueryDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/query/CannedQueryDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/query/CannedQueryDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/query/QueryException.java b/repository/src/main/java/org/alfresco/repo/domain/query/QueryException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/query/QueryException.java
rename to repository/src/main/java/org/alfresco/repo/domain/query/QueryException.java
diff --git a/src/main/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java b/repository/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/SchemaAvailableEvent.java b/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaAvailableEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/SchemaAvailableEvent.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/SchemaAvailableEvent.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrapRegistration.java b/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrapRegistration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrapRegistration.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrapRegistration.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutor.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutor.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutor.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImpl.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutor.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutor.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutor.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/StatementExecutor.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/StatementExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/schema/script/StatementExecutor.java
rename to repository/src/main/java/org/alfresco/repo/domain/schema/script/StatementExecutor.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java b/repository/src/main/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/AclEntity.java b/repository/src/main/java/org/alfresco/repo/domain/solr/AclEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/AclEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/AclEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/NodeParametersEntity.java b/repository/src/main/java/org/alfresco/repo/domain/solr/NodeParametersEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/NodeParametersEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/NodeParametersEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/SOLRDAO.java b/repository/src/main/java/org/alfresco/repo/domain/solr/SOLRDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/SOLRDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/SOLRDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java b/repository/src/main/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/SOLRTransaction.java b/repository/src/main/java/org/alfresco/repo/domain/solr/SOLRTransaction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/SOLRTransaction.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/SOLRTransaction.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/TransactionEntity.java b/repository/src/main/java/org/alfresco/repo/domain/solr/TransactionEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/TransactionEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/TransactionEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/subscriptions/AbstractSubscriptionsDAO.java b/repository/src/main/java/org/alfresco/repo/domain/subscriptions/AbstractSubscriptionsDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/subscriptions/AbstractSubscriptionsDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/subscriptions/AbstractSubscriptionsDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionEntity.java b/repository/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionNodeEntity.java b/repository/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionNodeEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionNodeEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionNodeEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionsDAO.java b/repository/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionsDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionsDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/subscriptions/SubscriptionsDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/subscriptions/ibatis/SubscriptionsDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/tenant/AbstractTenantAdminDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/tenant/TenantAdminDAO.java b/repository/src/main/java/org/alfresco/repo/domain/tenant/TenantAdminDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/tenant/TenantAdminDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/tenant/TenantAdminDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/tenant/TenantEntity.java b/repository/src/main/java/org/alfresco/repo/domain/tenant/TenantEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/tenant/TenantEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/tenant/TenantEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/tenant/TenantQueryEntity.java b/repository/src/main/java/org/alfresco/repo/domain/tenant/TenantQueryEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/tenant/TenantQueryEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/tenant/TenantQueryEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/tenant/TenantUpdateEntity.java b/repository/src/main/java/org/alfresco/repo/domain/tenant/TenantUpdateEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/tenant/TenantUpdateEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/tenant/TenantUpdateEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/tenant/ibatis/TenantAdminDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/tenant/ibatis/TenantAdminDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/tenant/ibatis/TenantAdminDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/tenant/ibatis/TenantAdminDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/usage/AbstractUsageDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/usage/AbstractUsageDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/usage/AbstractUsageDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/usage/AbstractUsageDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/domain/usage/UsageDAO.java b/repository/src/main/java/org/alfresco/repo/domain/usage/UsageDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/usage/UsageDAO.java
rename to repository/src/main/java/org/alfresco/repo/domain/usage/UsageDAO.java
diff --git a/src/main/java/org/alfresco/repo/domain/usage/UsageDelta.java b/repository/src/main/java/org/alfresco/repo/domain/usage/UsageDelta.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/usage/UsageDelta.java
rename to repository/src/main/java/org/alfresco/repo/domain/usage/UsageDelta.java
diff --git a/src/main/java/org/alfresco/repo/domain/usage/UsageDeltaEntity.java b/repository/src/main/java/org/alfresco/repo/domain/usage/UsageDeltaEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/usage/UsageDeltaEntity.java
rename to repository/src/main/java/org/alfresco/repo/domain/usage/UsageDeltaEntity.java
diff --git a/src/main/java/org/alfresco/repo/domain/usage/ibatis/UsageDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/usage/ibatis/UsageDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/domain/usage/ibatis/UsageDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/domain/usage/ibatis/UsageDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/download/AbstractExporter.java b/repository/src/main/java/org/alfresco/repo/download/AbstractExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/AbstractExporter.java
rename to repository/src/main/java/org/alfresco/repo/download/AbstractExporter.java
diff --git a/src/main/java/org/alfresco/repo/download/ActionServiceHelper.java b/repository/src/main/java/org/alfresco/repo/download/ActionServiceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/ActionServiceHelper.java
rename to repository/src/main/java/org/alfresco/repo/download/ActionServiceHelper.java
diff --git a/src/main/java/org/alfresco/repo/download/BaseExporter.java b/repository/src/main/java/org/alfresco/repo/download/BaseExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/BaseExporter.java
rename to repository/src/main/java/org/alfresco/repo/download/BaseExporter.java
diff --git a/src/main/java/org/alfresco/repo/download/ContentServiceHelper.java b/repository/src/main/java/org/alfresco/repo/download/ContentServiceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/ContentServiceHelper.java
rename to repository/src/main/java/org/alfresco/repo/download/ContentServiceHelper.java
diff --git a/src/main/java/org/alfresco/repo/download/CreateDownloadArchiveAction.java b/repository/src/main/java/org/alfresco/repo/download/CreateDownloadArchiveAction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/CreateDownloadArchiveAction.java
rename to repository/src/main/java/org/alfresco/repo/download/CreateDownloadArchiveAction.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadCancelledException.java b/repository/src/main/java/org/alfresco/repo/download/DownloadCancelledException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadCancelledException.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadCancelledException.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadModel.java b/repository/src/main/java/org/alfresco/repo/download/DownloadModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadModel.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadModel.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadServiceException.java b/repository/src/main/java/org/alfresco/repo/download/DownloadServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadServiceException.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadServiceException.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java b/repository/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadStatusUpdateService.java b/repository/src/main/java/org/alfresco/repo/download/DownloadStatusUpdateService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadStatusUpdateService.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadStatusUpdateService.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadStatusUpdateServiceImpl.java b/repository/src/main/java/org/alfresco/repo/download/DownloadStatusUpdateServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadStatusUpdateServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadStatusUpdateServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadStorage.java b/repository/src/main/java/org/alfresco/repo/download/DownloadStorage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadStorage.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadStorage.java
diff --git a/src/main/java/org/alfresco/repo/download/DownloadsCleanupJob.java b/repository/src/main/java/org/alfresco/repo/download/DownloadsCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/DownloadsCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/download/DownloadsCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/download/LocalActionServiceHelper.java b/repository/src/main/java/org/alfresco/repo/download/LocalActionServiceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/LocalActionServiceHelper.java
rename to repository/src/main/java/org/alfresco/repo/download/LocalActionServiceHelper.java
diff --git a/src/main/java/org/alfresco/repo/download/LocalContentServiceHelper.java b/repository/src/main/java/org/alfresco/repo/download/LocalContentServiceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/LocalContentServiceHelper.java
rename to repository/src/main/java/org/alfresco/repo/download/LocalContentServiceHelper.java
diff --git a/src/main/java/org/alfresco/repo/download/ZipDownloadExporter.java b/repository/src/main/java/org/alfresco/repo/download/ZipDownloadExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/ZipDownloadExporter.java
rename to repository/src/main/java/org/alfresco/repo/download/ZipDownloadExporter.java
diff --git a/src/main/java/org/alfresco/repo/download/cannedquery/DownloadEntity.java b/repository/src/main/java/org/alfresco/repo/download/cannedquery/DownloadEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/cannedquery/DownloadEntity.java
rename to repository/src/main/java/org/alfresco/repo/download/cannedquery/DownloadEntity.java
diff --git a/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQuery.java b/repository/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/download/cannedquery/GetDownloadsCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java b/repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java
rename to repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java
diff --git a/src/main/java/org/alfresco/repo/event2/ChildAssociationEventSupportedPolicies.java b/repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventSupportedPolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/ChildAssociationEventSupportedPolicies.java
rename to repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventSupportedPolicies.java
diff --git a/src/main/java/org/alfresco/repo/event2/Event2MessageProducer.java b/repository/src/main/java/org/alfresco/repo/event2/Event2MessageProducer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/Event2MessageProducer.java
rename to repository/src/main/java/org/alfresco/repo/event2/Event2MessageProducer.java
diff --git a/src/main/java/org/alfresco/repo/event2/EventConsolidator.java b/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/EventConsolidator.java
rename to repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
diff --git a/src/main/java/org/alfresco/repo/event2/EventGenerator.java b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/EventGenerator.java
rename to repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
diff --git a/src/main/java/org/alfresco/repo/event2/EventInfo.java b/repository/src/main/java/org/alfresco/repo/event2/EventInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/EventInfo.java
rename to repository/src/main/java/org/alfresco/repo/event2/EventInfo.java
diff --git a/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java b/repository/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/EventJSONSchema.java
rename to repository/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java
diff --git a/src/main/java/org/alfresco/repo/event2/EventSupportedPolicies.java b/repository/src/main/java/org/alfresco/repo/event2/EventSupportedPolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/EventSupportedPolicies.java
rename to repository/src/main/java/org/alfresco/repo/event2/EventSupportedPolicies.java
diff --git a/src/main/java/org/alfresco/repo/event2/EventType.java b/repository/src/main/java/org/alfresco/repo/event2/EventType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/EventType.java
rename to repository/src/main/java/org/alfresco/repo/event2/EventType.java
diff --git a/src/main/java/org/alfresco/repo/event2/NodeResourceHelper.java b/repository/src/main/java/org/alfresco/repo/event2/NodeResourceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/NodeResourceHelper.java
rename to repository/src/main/java/org/alfresco/repo/event2/NodeResourceHelper.java
diff --git a/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java b/repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java
rename to repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java
diff --git a/src/main/java/org/alfresco/repo/event2/PeerAssociationEventSupportedPolicies.java b/repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventSupportedPolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/PeerAssociationEventSupportedPolicies.java
rename to repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventSupportedPolicies.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/AbstractNodeEventFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/AbstractNodeEventFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/AbstractNodeEventFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/AbstractNodeEventFilter.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/ChildAssociationTypeFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/ChildAssociationTypeFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/ChildAssociationTypeFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/ChildAssociationTypeFilter.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/EventFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/EventFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/EventFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/EventFilter.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/EventFilterRegistry.java b/repository/src/main/java/org/alfresco/repo/event2/filter/EventFilterRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/EventFilterRegistry.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/EventFilterRegistry.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/EventUserFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/EventUserFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/EventUserFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/EventUserFilter.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/NodeAspectFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/NodeAspectFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/NodeAspectFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/NodeAspectFilter.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/NodePropertyFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/NodePropertyFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/NodePropertyFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/NodePropertyFilter.java
diff --git a/src/main/java/org/alfresco/repo/event2/filter/NodeTypeFilter.java b/repository/src/main/java/org/alfresco/repo/event2/filter/NodeTypeFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/event2/filter/NodeTypeFilter.java
rename to repository/src/main/java/org/alfresco/repo/event2/filter/NodeTypeFilter.java
diff --git a/src/main/java/org/alfresco/repo/events/AbstractEventGenerationBehaviours.java b/repository/src/main/java/org/alfresco/repo/events/AbstractEventGenerationBehaviours.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/AbstractEventGenerationBehaviours.java
rename to repository/src/main/java/org/alfresco/repo/events/AbstractEventGenerationBehaviours.java
diff --git a/src/main/java/org/alfresco/repo/events/AbstractEventsService.java b/repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/AbstractEventsService.java
rename to repository/src/main/java/org/alfresco/repo/events/AbstractEventsService.java
diff --git a/src/main/java/org/alfresco/repo/events/ClientUtil.java b/repository/src/main/java/org/alfresco/repo/events/ClientUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/ClientUtil.java
rename to repository/src/main/java/org/alfresco/repo/events/ClientUtil.java
diff --git a/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java b/repository/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java
rename to repository/src/main/java/org/alfresco/repo/events/EventGenerationBehaviours.java
diff --git a/src/main/java/org/alfresco/repo/events/EventsService.java b/repository/src/main/java/org/alfresco/repo/events/EventsService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/EventsService.java
rename to repository/src/main/java/org/alfresco/repo/events/EventsService.java
diff --git a/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java b/repository/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/EventsServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/events/EventsServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/events/ExceptionEventsService.java b/repository/src/main/java/org/alfresco/repo/events/ExceptionEventsService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/ExceptionEventsService.java
rename to repository/src/main/java/org/alfresco/repo/events/ExceptionEventsService.java
diff --git a/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java b/repository/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/events/ExceptionEventsServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/events/jmx/EventsManager.java b/repository/src/main/java/org/alfresco/repo/events/jmx/EventsManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/events/jmx/EventsManager.java
rename to repository/src/main/java/org/alfresco/repo/events/jmx/EventsManager.java
diff --git a/src/main/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java b/repository/src/main/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java
rename to repository/src/main/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java
diff --git a/src/main/java/org/alfresco/repo/exporter/ChainedExporter.java b/repository/src/main/java/org/alfresco/repo/exporter/ChainedExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/ChainedExporter.java
rename to repository/src/main/java/org/alfresco/repo/exporter/ChainedExporter.java
diff --git a/src/main/java/org/alfresco/repo/exporter/ExporterComponent.java b/repository/src/main/java/org/alfresco/repo/exporter/ExporterComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/ExporterComponent.java
rename to repository/src/main/java/org/alfresco/repo/exporter/ExporterComponent.java
diff --git a/src/main/java/org/alfresco/repo/exporter/ExporterCrawler.java b/repository/src/main/java/org/alfresco/repo/exporter/ExporterCrawler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/ExporterCrawler.java
rename to repository/src/main/java/org/alfresco/repo/exporter/ExporterCrawler.java
diff --git a/src/main/java/org/alfresco/repo/exporter/FileExportPackageHandler.java b/repository/src/main/java/org/alfresco/repo/exporter/FileExportPackageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/FileExportPackageHandler.java
rename to repository/src/main/java/org/alfresco/repo/exporter/FileExportPackageHandler.java
diff --git a/src/main/java/org/alfresco/repo/exporter/NodeContentData.java b/repository/src/main/java/org/alfresco/repo/exporter/NodeContentData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/NodeContentData.java
rename to repository/src/main/java/org/alfresco/repo/exporter/NodeContentData.java
diff --git a/src/main/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java b/repository/src/main/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java
rename to repository/src/main/java/org/alfresco/repo/exporter/RepositoryExporterComponent.java
diff --git a/src/main/java/org/alfresco/repo/exporter/URLExporter.java b/repository/src/main/java/org/alfresco/repo/exporter/URLExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/URLExporter.java
rename to repository/src/main/java/org/alfresco/repo/exporter/URLExporter.java
diff --git a/src/main/java/org/alfresco/repo/exporter/ViewXMLExporter.java b/repository/src/main/java/org/alfresco/repo/exporter/ViewXMLExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/exporter/ViewXMLExporter.java
rename to repository/src/main/java/org/alfresco/repo/exporter/ViewXMLExporter.java
diff --git a/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java b/repository/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/favourites/FavouritesServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/favourites/PersonFavourite.java b/repository/src/main/java/org/alfresco/repo/favourites/PersonFavourite.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/favourites/PersonFavourite.java
rename to repository/src/main/java/org/alfresco/repo/favourites/PersonFavourite.java
diff --git a/src/main/java/org/alfresco/repo/forms/AssociationFieldDefinition.java b/repository/src/main/java/org/alfresco/repo/forms/AssociationFieldDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/AssociationFieldDefinition.java
rename to repository/src/main/java/org/alfresco/repo/forms/AssociationFieldDefinition.java
diff --git a/src/main/java/org/alfresco/repo/forms/DataTypeParameters.java b/repository/src/main/java/org/alfresco/repo/forms/DataTypeParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/DataTypeParameters.java
rename to repository/src/main/java/org/alfresco/repo/forms/DataTypeParameters.java
diff --git a/src/main/java/org/alfresco/repo/forms/Field.java b/repository/src/main/java/org/alfresco/repo/forms/Field.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/Field.java
rename to repository/src/main/java/org/alfresco/repo/forms/Field.java
diff --git a/src/main/java/org/alfresco/repo/forms/FieldDefinition.java b/repository/src/main/java/org/alfresco/repo/forms/FieldDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FieldDefinition.java
rename to repository/src/main/java/org/alfresco/repo/forms/FieldDefinition.java
diff --git a/src/main/java/org/alfresco/repo/forms/FieldGroup.java b/repository/src/main/java/org/alfresco/repo/forms/FieldGroup.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FieldGroup.java
rename to repository/src/main/java/org/alfresco/repo/forms/FieldGroup.java
diff --git a/src/main/java/org/alfresco/repo/forms/Form.java b/repository/src/main/java/org/alfresco/repo/forms/Form.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/Form.java
rename to repository/src/main/java/org/alfresco/repo/forms/Form.java
diff --git a/src/main/java/org/alfresco/repo/forms/FormData.java b/repository/src/main/java/org/alfresco/repo/forms/FormData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FormData.java
rename to repository/src/main/java/org/alfresco/repo/forms/FormData.java
diff --git a/src/main/java/org/alfresco/repo/forms/FormException.java b/repository/src/main/java/org/alfresco/repo/forms/FormException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FormException.java
rename to repository/src/main/java/org/alfresco/repo/forms/FormException.java
diff --git a/src/main/java/org/alfresco/repo/forms/FormNotFoundException.java b/repository/src/main/java/org/alfresco/repo/forms/FormNotFoundException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FormNotFoundException.java
rename to repository/src/main/java/org/alfresco/repo/forms/FormNotFoundException.java
diff --git a/src/main/java/org/alfresco/repo/forms/FormService.java b/repository/src/main/java/org/alfresco/repo/forms/FormService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FormService.java
rename to repository/src/main/java/org/alfresco/repo/forms/FormService.java
diff --git a/src/main/java/org/alfresco/repo/forms/FormServiceImpl.java b/repository/src/main/java/org/alfresco/repo/forms/FormServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/FormServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/forms/FormServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/forms/Item.java b/repository/src/main/java/org/alfresco/repo/forms/Item.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/Item.java
rename to repository/src/main/java/org/alfresco/repo/forms/Item.java
diff --git a/src/main/java/org/alfresco/repo/forms/PropertyFieldDefinition.java b/repository/src/main/java/org/alfresco/repo/forms/PropertyFieldDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/PropertyFieldDefinition.java
rename to repository/src/main/java/org/alfresco/repo/forms/PropertyFieldDefinition.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/AbstractFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/AbstractFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/AbstractFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/AbstractFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/AbstractFilter.java b/repository/src/main/java/org/alfresco/repo/forms/processor/AbstractFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/AbstractFilter.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/AbstractFilter.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FieldProcessorRegistry.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FieldProcessorRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FieldProcessorRegistry.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FieldProcessorRegistry.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/Filter.java b/repository/src/main/java/org/alfresco/repo/forms/processor/Filter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/Filter.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/Filter.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FilterRegistry.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FilterRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FilterRegistry.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FilterRegistry.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FilteredFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FilteredFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FilteredFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FilteredFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FormCreationData.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FormCreationData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FormCreationData.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FormCreationData.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FormCreationDataImpl.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FormCreationDataImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FormCreationDataImpl.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FormCreationDataImpl.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FormPersister.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FormPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FormPersister.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FormPersister.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/FormProcessorRegistry.java b/repository/src/main/java/org/alfresco/repo/forms/processor/FormProcessorRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/FormProcessorRegistry.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/FormProcessorRegistry.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/action/ActionFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/action/ActionFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/action/ActionFormResult.java b/repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionFormResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/action/ActionFormResult.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionFormResult.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/action/ActionNonParameterField.java b/repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionNonParameterField.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/action/ActionNonParameterField.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionNonParameterField.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/action/ActionParameterField.java b/repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionParameterField.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/action/ActionParameterField.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/action/ActionParameterField.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/AssociationFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelField.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelField.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/ContentModelField.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelField.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFieldProcessorRegistry.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFieldProcessorRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFieldProcessorRegistry.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFieldProcessorRegistry.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelItemData.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelItemData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/ContentModelItemData.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelItemData.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldBuilder.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldBuilder.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldBuilder.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/DefaultFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/EncodingFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/EncodingFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/EncodingFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/EncodingFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/FieldUtils.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/FieldUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/FieldUtils.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/FieldUtils.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/FormFieldConstants.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/FormFieldConstants.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/FormFieldConstants.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/FormFieldConstants.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/MimetypeFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/MimetypeFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/MimetypeFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/MimetypeFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/MockFieldProcessorRegistry.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/MockFieldProcessorRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/MockFieldProcessorRegistry.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/MockFieldProcessorRegistry.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/NodeFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/NodeFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/NodeFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/NodeFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/PeriodDataTypeParameters.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/PeriodDataTypeParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/PeriodDataTypeParameters.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/PeriodDataTypeParameters.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/PropertyFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/QNameFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/QNameFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/QNameFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/QNameFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/SizeFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/SizeFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/SizeFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/SizeFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/TransientFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/TransientFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/TransientFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/TransientFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/TransientValueGetter.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/TransientValueGetter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/TransientValueGetter.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/TransientValueGetter.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/AbstractWorkflowFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/AbstractWorkflowFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/AbstractWorkflowFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/AbstractWorkflowFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/ContentModelFormPersister.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/ContentModelFormPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/ContentModelFormPersister.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/ContentModelFormPersister.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyInfo.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyInfo.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyInfo.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/DataKeyMatcher.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedFieldBuilder.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedFieldBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedFieldBuilder.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedFieldBuilder.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedPropertyFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedPropertyFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedPropertyFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/ExtendedPropertyFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/FieldType.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/FieldType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/FieldType.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/FieldType.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/FormPersister.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/FormPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/FormPersister.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/FormPersister.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/MessageFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/MessageFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/MessageFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/MessageFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/PackageItemsFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/PackageItemsFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/PackageItemsFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/PackageItemsFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormPersister.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormPersister.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormPersister.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskOwnerFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskOwnerFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/TaskOwnerFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TaskOwnerFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/TransitionFieldProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TransitionFieldProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/TransitionFieldProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TransitionFieldProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/TypedPropertyValueGetter.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TypedPropertyValueGetter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/TypedPropertyValueGetter.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/TypedPropertyValueGetter.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormFilter.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormFilter.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormFilter.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormPersister.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormPersister.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormPersister.java
diff --git a/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java
rename to repository/src/main/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java
diff --git a/src/main/java/org/alfresco/repo/forms/script/JSPropertyExtractor.java b/repository/src/main/java/org/alfresco/repo/forms/script/JSPropertyExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/script/JSPropertyExtractor.java
rename to repository/src/main/java/org/alfresco/repo/forms/script/JSPropertyExtractor.java
diff --git a/src/main/java/org/alfresco/repo/forms/script/ScriptFieldDefinition.java b/repository/src/main/java/org/alfresco/repo/forms/script/ScriptFieldDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/script/ScriptFieldDefinition.java
rename to repository/src/main/java/org/alfresco/repo/forms/script/ScriptFieldDefinition.java
diff --git a/src/main/java/org/alfresco/repo/forms/script/ScriptForm.java b/repository/src/main/java/org/alfresco/repo/forms/script/ScriptForm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/script/ScriptForm.java
rename to repository/src/main/java/org/alfresco/repo/forms/script/ScriptForm.java
diff --git a/src/main/java/org/alfresco/repo/forms/script/ScriptFormData.java b/repository/src/main/java/org/alfresco/repo/forms/script/ScriptFormData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/script/ScriptFormData.java
rename to repository/src/main/java/org/alfresco/repo/forms/script/ScriptFormData.java
diff --git a/src/main/java/org/alfresco/repo/forms/script/ScriptFormService.java b/repository/src/main/java/org/alfresco/repo/forms/script/ScriptFormService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forms/script/ScriptFormService.java
rename to repository/src/main/java/org/alfresco/repo/forms/script/ScriptFormService.java
diff --git a/src/main/java/org/alfresco/repo/forum/CommentService.java b/repository/src/main/java/org/alfresco/repo/forum/CommentService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forum/CommentService.java
rename to repository/src/main/java/org/alfresco/repo/forum/CommentService.java
diff --git a/src/main/java/org/alfresco/repo/forum/CommentServiceImpl.java b/repository/src/main/java/org/alfresco/repo/forum/CommentServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forum/CommentServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/forum/CommentServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/forum/CommentsRollupAspect.java b/repository/src/main/java/org/alfresco/repo/forum/CommentsRollupAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forum/CommentsRollupAspect.java
rename to repository/src/main/java/org/alfresco/repo/forum/CommentsRollupAspect.java
diff --git a/src/main/java/org/alfresco/repo/forum/DiscussableAspect.java b/repository/src/main/java/org/alfresco/repo/forum/DiscussableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forum/DiscussableAspect.java
rename to repository/src/main/java/org/alfresco/repo/forum/DiscussableAspect.java
diff --git a/src/main/java/org/alfresco/repo/forum/ForumPostBehaviours.java b/repository/src/main/java/org/alfresco/repo/forum/ForumPostBehaviours.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/forum/ForumPostBehaviours.java
rename to repository/src/main/java/org/alfresco/repo/forum/ForumPostBehaviours.java
diff --git a/src/main/java/org/alfresco/repo/i18n/MessageDeployer.java b/repository/src/main/java/org/alfresco/repo/i18n/MessageDeployer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/i18n/MessageDeployer.java
rename to repository/src/main/java/org/alfresco/repo/i18n/MessageDeployer.java
diff --git a/src/main/java/org/alfresco/repo/i18n/MessageService.java b/repository/src/main/java/org/alfresco/repo/i18n/MessageService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/i18n/MessageService.java
rename to repository/src/main/java/org/alfresco/repo/i18n/MessageService.java
diff --git a/src/main/java/org/alfresco/repo/i18n/MessageServiceImpl.java b/repository/src/main/java/org/alfresco/repo/i18n/MessageServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/i18n/MessageServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/i18n/MessageServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java b/repository/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java
rename to repository/src/main/java/org/alfresco/repo/imap/AbstractImapFolder.java
diff --git a/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java b/repository/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java
rename to repository/src/main/java/org/alfresco/repo/imap/AbstractMimeMessage.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapConst.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapConst.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapConst.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapConst.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolderAccessInterceptor.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolderAccessInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapFolderAccessInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapFolderAccessInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapHostManager.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapServer.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapServer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapServer.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapServer.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUser.java
diff --git a/src/main/java/org/alfresco/repo/imap/AlfrescoImapUserManager.java b/repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUserManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AlfrescoImapUserManager.java
rename to repository/src/main/java/org/alfresco/repo/imap/AlfrescoImapUserManager.java
diff --git a/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java b/repository/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java
rename to repository/src/main/java/org/alfresco/repo/imap/AttachmentsExtractor.java
diff --git a/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java b/repository/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/ContentModelMessage.java
rename to repository/src/main/java/org/alfresco/repo/imap/ContentModelMessage.java
diff --git a/src/main/java/org/alfresco/repo/imap/ImapContentPolicy.java b/repository/src/main/java/org/alfresco/repo/imap/ImapContentPolicy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/ImapContentPolicy.java
rename to repository/src/main/java/org/alfresco/repo/imap/ImapContentPolicy.java
diff --git a/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java b/repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/ImapModelMessage.java
rename to repository/src/main/java/org/alfresco/repo/imap/ImapModelMessage.java
diff --git a/src/main/java/org/alfresco/repo/imap/ImapService.java b/repository/src/main/java/org/alfresco/repo/imap/ImapService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/ImapService.java
rename to repository/src/main/java/org/alfresco/repo/imap/ImapService.java
diff --git a/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java b/repository/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/imap/ImapServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java b/repository/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java
rename to repository/src/main/java/org/alfresco/repo/imap/IncomingImapMessage.java
diff --git a/src/main/java/org/alfresco/repo/imap/config/ImapConfigMountPointsBean.java b/repository/src/main/java/org/alfresco/repo/imap/config/ImapConfigMountPointsBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/config/ImapConfigMountPointsBean.java
rename to repository/src/main/java/org/alfresco/repo/imap/config/ImapConfigMountPointsBean.java
diff --git a/src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapFolderException.java b/repository/src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapFolderException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapFolderException.java
rename to repository/src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapFolderException.java
diff --git a/src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapRuntimeException.java b/repository/src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapRuntimeException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapRuntimeException.java
rename to repository/src/main/java/org/alfresco/repo/imap/exception/AlfrescoImapRuntimeException.java
diff --git a/src/main/java/org/alfresco/repo/imap/package-info.java b/repository/src/main/java/org/alfresco/repo/imap/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/imap/package-info.java
rename to repository/src/main/java/org/alfresco/repo/imap/package-info.java
diff --git a/src/main/java/org/alfresco/repo/importer/ACPImportPackageHandler.java b/repository/src/main/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
rename to repository/src/main/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
diff --git a/src/main/java/org/alfresco/repo/importer/DefaultContentHandler.java b/repository/src/main/java/org/alfresco/repo/importer/DefaultContentHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/DefaultContentHandler.java
rename to repository/src/main/java/org/alfresco/repo/importer/DefaultContentHandler.java
diff --git a/src/main/java/org/alfresco/repo/importer/DefaultImporterContentCache.java b/repository/src/main/java/org/alfresco/repo/importer/DefaultImporterContentCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/DefaultImporterContentCache.java
rename to repository/src/main/java/org/alfresco/repo/importer/DefaultImporterContentCache.java
diff --git a/src/main/java/org/alfresco/repo/importer/ExportSource.java b/repository/src/main/java/org/alfresco/repo/importer/ExportSource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ExportSource.java
rename to repository/src/main/java/org/alfresco/repo/importer/ExportSource.java
diff --git a/src/main/java/org/alfresco/repo/importer/ExportSourceImporter.java b/repository/src/main/java/org/alfresco/repo/importer/ExportSourceImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ExportSourceImporter.java
rename to repository/src/main/java/org/alfresco/repo/importer/ExportSourceImporter.java
diff --git a/src/main/java/org/alfresco/repo/importer/ExportSourceImporterException.java b/repository/src/main/java/org/alfresco/repo/importer/ExportSourceImporterException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ExportSourceImporterException.java
rename to repository/src/main/java/org/alfresco/repo/importer/ExportSourceImporterException.java
diff --git a/src/main/java/org/alfresco/repo/importer/FileImportPackageHandler.java b/repository/src/main/java/org/alfresco/repo/importer/FileImportPackageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/FileImportPackageHandler.java
rename to repository/src/main/java/org/alfresco/repo/importer/FileImportPackageHandler.java
diff --git a/src/main/java/org/alfresco/repo/importer/FileImporter.java b/repository/src/main/java/org/alfresco/repo/importer/FileImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/FileImporter.java
rename to repository/src/main/java/org/alfresco/repo/importer/FileImporter.java
diff --git a/src/main/java/org/alfresco/repo/importer/FileImporterException.java b/repository/src/main/java/org/alfresco/repo/importer/FileImporterException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/FileImporterException.java
rename to repository/src/main/java/org/alfresco/repo/importer/FileImporterException.java
diff --git a/src/main/java/org/alfresco/repo/importer/FileImporterImpl.java b/repository/src/main/java/org/alfresco/repo/importer/FileImporterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/FileImporterImpl.java
rename to repository/src/main/java/org/alfresco/repo/importer/FileImporterImpl.java
diff --git a/src/main/java/org/alfresco/repo/importer/FileSourceImporter.java b/repository/src/main/java/org/alfresco/repo/importer/FileSourceImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/FileSourceImporter.java
rename to repository/src/main/java/org/alfresco/repo/importer/FileSourceImporter.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImportContentHandler.java b/repository/src/main/java/org/alfresco/repo/importer/ImportContentHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImportContentHandler.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImportContentHandler.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImportNode.java b/repository/src/main/java/org/alfresco/repo/importer/ImportNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImportNode.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImportNode.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImportParent.java b/repository/src/main/java/org/alfresco/repo/importer/ImportParent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImportParent.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImportParent.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImportTimerProgress.java b/repository/src/main/java/org/alfresco/repo/importer/ImportTimerProgress.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImportTimerProgress.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImportTimerProgress.java
diff --git a/src/main/java/org/alfresco/repo/importer/Importer.java b/repository/src/main/java/org/alfresco/repo/importer/Importer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/Importer.java
rename to repository/src/main/java/org/alfresco/repo/importer/Importer.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImporterBootstrap.java b/repository/src/main/java/org/alfresco/repo/importer/ImporterBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImporterBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImporterBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImporterBootstrapViews.java b/repository/src/main/java/org/alfresco/repo/importer/ImporterBootstrapViews.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImporterBootstrapViews.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImporterBootstrapViews.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImporterComponent.java b/repository/src/main/java/org/alfresco/repo/importer/ImporterComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImporterComponent.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImporterComponent.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImporterJob.java b/repository/src/main/java/org/alfresco/repo/importer/ImporterJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImporterJob.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImporterJob.java
diff --git a/src/main/java/org/alfresco/repo/importer/ImporterJobSPI.java b/repository/src/main/java/org/alfresco/repo/importer/ImporterJobSPI.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/ImporterJobSPI.java
rename to repository/src/main/java/org/alfresco/repo/importer/ImporterJobSPI.java
diff --git a/src/main/java/org/alfresco/repo/importer/Parser.java b/repository/src/main/java/org/alfresco/repo/importer/Parser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/Parser.java
rename to repository/src/main/java/org/alfresco/repo/importer/Parser.java
diff --git a/src/main/java/org/alfresco/repo/importer/system/PatchInfo.java b/repository/src/main/java/org/alfresco/repo/importer/system/PatchInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/system/PatchInfo.java
rename to repository/src/main/java/org/alfresco/repo/importer/system/PatchInfo.java
diff --git a/src/main/java/org/alfresco/repo/importer/system/SystemExporterImporter.java b/repository/src/main/java/org/alfresco/repo/importer/system/SystemExporterImporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/system/SystemExporterImporter.java
rename to repository/src/main/java/org/alfresco/repo/importer/system/SystemExporterImporter.java
diff --git a/src/main/java/org/alfresco/repo/importer/system/SystemInfo.java b/repository/src/main/java/org/alfresco/repo/importer/system/SystemInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/system/SystemInfo.java
rename to repository/src/main/java/org/alfresco/repo/importer/system/SystemInfo.java
diff --git a/src/main/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java b/repository/src/main/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/importer/system/SystemInfoBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/importer/view/ElementContext.java b/repository/src/main/java/org/alfresco/repo/importer/view/ElementContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/view/ElementContext.java
rename to repository/src/main/java/org/alfresco/repo/importer/view/ElementContext.java
diff --git a/src/main/java/org/alfresco/repo/importer/view/MetaDataContext.java b/repository/src/main/java/org/alfresco/repo/importer/view/MetaDataContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/view/MetaDataContext.java
rename to repository/src/main/java/org/alfresco/repo/importer/view/MetaDataContext.java
diff --git a/src/main/java/org/alfresco/repo/importer/view/NodeContext.java b/repository/src/main/java/org/alfresco/repo/importer/view/NodeContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/view/NodeContext.java
rename to repository/src/main/java/org/alfresco/repo/importer/view/NodeContext.java
diff --git a/src/main/java/org/alfresco/repo/importer/view/NodeItemContext.java b/repository/src/main/java/org/alfresco/repo/importer/view/NodeItemContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/view/NodeItemContext.java
rename to repository/src/main/java/org/alfresco/repo/importer/view/NodeItemContext.java
diff --git a/src/main/java/org/alfresco/repo/importer/view/ParentContext.java b/repository/src/main/java/org/alfresco/repo/importer/view/ParentContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/view/ParentContext.java
rename to repository/src/main/java/org/alfresco/repo/importer/view/ParentContext.java
diff --git a/src/main/java/org/alfresco/repo/importer/view/ViewParser.java b/repository/src/main/java/org/alfresco/repo/importer/view/ViewParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/importer/view/ViewParser.java
rename to repository/src/main/java/org/alfresco/repo/importer/view/ViewParser.java
diff --git a/src/main/java/org/alfresco/repo/index/shard/ShardRegistry.java b/repository/src/main/java/org/alfresco/repo/index/shard/ShardRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/index/shard/ShardRegistry.java
rename to repository/src/main/java/org/alfresco/repo/index/shard/ShardRegistry.java
diff --git a/src/main/java/org/alfresco/repo/invitation/InvitationImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/InvitationImpl.java
rename to repository/src/main/java/org/alfresco/repo/invitation/InvitationImpl.java
diff --git a/src/main/java/org/alfresco/repo/invitation/InvitationProcess.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationProcess.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/InvitationProcess.java
rename to repository/src/main/java/org/alfresco/repo/invitation/InvitationProcess.java
diff --git a/src/main/java/org/alfresco/repo/invitation/InvitationProcessDescription.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationProcessDescription.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/InvitationProcessDescription.java
rename to repository/src/main/java/org/alfresco/repo/invitation/InvitationProcessDescription.java
diff --git a/src/main/java/org/alfresco/repo/invitation/InvitationProcessDescriptionImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationProcessDescriptionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/InvitationProcessDescriptionImpl.java
rename to repository/src/main/java/org/alfresco/repo/invitation/InvitationProcessDescriptionImpl.java
diff --git a/src/main/java/org/alfresco/repo/invitation/InvitationSearchCriteriaImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationSearchCriteriaImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/InvitationSearchCriteriaImpl.java
rename to repository/src/main/java/org/alfresco/repo/invitation/InvitationSearchCriteriaImpl.java
diff --git a/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/invitation/ModeratedInvitationImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/ModeratedInvitationImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/ModeratedInvitationImpl.java
rename to repository/src/main/java/org/alfresco/repo/invitation/ModeratedInvitationImpl.java
diff --git a/src/main/java/org/alfresco/repo/invitation/ModeratedInvitationProcess.java b/repository/src/main/java/org/alfresco/repo/invitation/ModeratedInvitationProcess.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/ModeratedInvitationProcess.java
rename to repository/src/main/java/org/alfresco/repo/invitation/ModeratedInvitationProcess.java
diff --git a/src/main/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java
rename to repository/src/main/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java
diff --git a/src/main/java/org/alfresco/repo/invitation/NominatedInvitationProcess.java b/repository/src/main/java/org/alfresco/repo/invitation/NominatedInvitationProcess.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/NominatedInvitationProcess.java
rename to repository/src/main/java/org/alfresco/repo/invitation/NominatedInvitationProcess.java
diff --git a/src/main/java/org/alfresco/repo/invitation/WorkflowModelModeratedInvitation.java b/repository/src/main/java/org/alfresco/repo/invitation/WorkflowModelModeratedInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/WorkflowModelModeratedInvitation.java
rename to repository/src/main/java/org/alfresco/repo/invitation/WorkflowModelModeratedInvitation.java
diff --git a/src/main/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java b/repository/src/main/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java
rename to repository/src/main/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/AbstractInvitationDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/AbstractInvitationDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/AbstractInvitationDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/AbstractInvitationDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/AcceptNominatedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/AcceptNominatedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/AcceptNominatedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/AcceptNominatedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/ApproveModeratedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/ApproveModeratedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/ApproveModeratedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/ApproveModeratedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/CancelNominatedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/CancelNominatedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/CancelNominatedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/CancelNominatedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/RejectModeratedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/RejectModeratedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/RejectModeratedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/RejectModeratedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/RejectNominatedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/RejectNominatedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/RejectNominatedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/RejectNominatedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteAddDirectDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteAddDirectDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteAddDirectDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteAddDirectDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteDelegate.java
rename to repository/src/main/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteDelegate.java
diff --git a/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitation.java b/repository/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/script/ScriptInvitation.java
rename to repository/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitation.java
diff --git a/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationFactory.java b/repository/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationFactory.java
rename to repository/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationFactory.java
diff --git a/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationService.java b/repository/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationService.java
rename to repository/src/main/java/org/alfresco/repo/invitation/script/ScriptInvitationService.java
diff --git a/src/main/java/org/alfresco/repo/invitation/script/ScriptModeratedInvitation.java b/repository/src/main/java/org/alfresco/repo/invitation/script/ScriptModeratedInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/script/ScriptModeratedInvitation.java
rename to repository/src/main/java/org/alfresco/repo/invitation/script/ScriptModeratedInvitation.java
diff --git a/src/main/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java b/repository/src/main/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java
rename to repository/src/main/java/org/alfresco/repo/invitation/script/ScriptNominatedInvitation.java
diff --git a/src/main/java/org/alfresco/repo/invitation/site/InviteInfo.java b/repository/src/main/java/org/alfresco/repo/invitation/site/InviteInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/site/InviteInfo.java
rename to repository/src/main/java/org/alfresco/repo/invitation/site/InviteInfo.java
diff --git a/src/main/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java b/repository/src/main/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
rename to repository/src/main/java/org/alfresco/repo/invitation/site/InviteModeratedSender.java
diff --git a/src/main/java/org/alfresco/repo/invitation/site/InviteNominatedSender.java b/repository/src/main/java/org/alfresco/repo/invitation/site/InviteNominatedSender.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/site/InviteNominatedSender.java
rename to repository/src/main/java/org/alfresco/repo/invitation/site/InviteNominatedSender.java
diff --git a/src/main/java/org/alfresco/repo/invitation/site/InviteSender.java b/repository/src/main/java/org/alfresco/repo/invitation/site/InviteSender.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/site/InviteSender.java
rename to repository/src/main/java/org/alfresco/repo/invitation/site/InviteSender.java
diff --git a/src/main/java/org/alfresco/repo/invitation/site/SiteModeratedInvitationProcess.java b/repository/src/main/java/org/alfresco/repo/invitation/site/SiteModeratedInvitationProcess.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/site/SiteModeratedInvitationProcess.java
rename to repository/src/main/java/org/alfresco/repo/invitation/site/SiteModeratedInvitationProcess.java
diff --git a/src/main/java/org/alfresco/repo/invitation/site/SiteNominatedInvitationProcess.java b/repository/src/main/java/org/alfresco/repo/invitation/site/SiteNominatedInvitationProcess.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/invitation/site/SiteNominatedInvitationProcess.java
rename to repository/src/main/java/org/alfresco/repo/invitation/site/SiteNominatedInvitationProcess.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Actions.java b/repository/src/main/java/org/alfresco/repo/jscript/Actions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Actions.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Actions.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ApplicationScriptUtils.java b/repository/src/main/java/org/alfresco/repo/jscript/ApplicationScriptUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ApplicationScriptUtils.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ApplicationScriptUtils.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Association.java b/repository/src/main/java/org/alfresco/repo/jscript/Association.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Association.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Association.java
diff --git a/src/main/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java b/repository/src/main/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java
rename to repository/src/main/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Behaviour.java b/repository/src/main/java/org/alfresco/repo/jscript/Behaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Behaviour.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Behaviour.java
diff --git a/src/main/java/org/alfresco/repo/jscript/CategoryNode.java b/repository/src/main/java/org/alfresco/repo/jscript/CategoryNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/CategoryNode.java
rename to repository/src/main/java/org/alfresco/repo/jscript/CategoryNode.java
diff --git a/src/main/java/org/alfresco/repo/jscript/CategoryTemplateNode.java b/repository/src/main/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
rename to repository/src/main/java/org/alfresco/repo/jscript/CategoryTemplateNode.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ChildAssociation.java b/repository/src/main/java/org/alfresco/repo/jscript/ChildAssociation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ChildAssociation.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ChildAssociation.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Classification.java b/repository/src/main/java/org/alfresco/repo/jscript/Classification.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Classification.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Classification.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java b/repository/src/main/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ClasspathScriptLocation.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java b/repository/src/main/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ExecuteScriptJob.java b/repository/src/main/java/org/alfresco/repo/jscript/ExecuteScriptJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ExecuteScriptJob.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ExecuteScriptJob.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Imap.java b/repository/src/main/java/org/alfresco/repo/jscript/Imap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Imap.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Imap.java
diff --git a/src/main/java/org/alfresco/repo/jscript/NativeMap.java b/repository/src/main/java/org/alfresco/repo/jscript/NativeMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/NativeMap.java
rename to repository/src/main/java/org/alfresco/repo/jscript/NativeMap.java
diff --git a/src/main/java/org/alfresco/repo/jscript/People.java b/repository/src/main/java/org/alfresco/repo/jscript/People.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/People.java
rename to repository/src/main/java/org/alfresco/repo/jscript/People.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Presence.java b/repository/src/main/java/org/alfresco/repo/jscript/Presence.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Presence.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Presence.java
diff --git a/src/main/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/repository/src/main/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
rename to repository/src/main/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
diff --git a/src/main/java/org/alfresco/repo/jscript/SandboxNativeJavaObject.java b/repository/src/main/java/org/alfresco/repo/jscript/SandboxNativeJavaObject.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/SandboxNativeJavaObject.java
rename to repository/src/main/java/org/alfresco/repo/jscript/SandboxNativeJavaObject.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Scopeable.java b/repository/src/main/java/org/alfresco/repo/jscript/Scopeable.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Scopeable.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Scopeable.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptAction.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptAction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptAction.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptAction.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptBehaviour.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptBehaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptBehaviour.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptBehaviour.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptFacetResult.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptFacetResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptFacetResult.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptFacetResult.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptLogger.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptLogger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptLogger.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptLogger.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptNode.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptNode.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptNode.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptPagingNodes.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptPagingNodes.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptPagingNodes.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptPagingNodes.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptSpellCheckResult.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptSpellCheckResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptSpellCheckResult.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptSpellCheckResult.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptTestUtils.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptTestUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptTestUtils.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptTestUtils.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptUrls.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptUrls.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptUrls.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptUrls.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptUtils.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptUtils.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptUtils.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptVersion.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptVersion.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptVersion.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptVersion.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptableHashMap.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptableHashMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptableHashMap.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptableHashMap.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ScriptableQNameMap.java b/repository/src/main/java/org/alfresco/repo/jscript/ScriptableQNameMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ScriptableQNameMap.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ScriptableQNameMap.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Search.java b/repository/src/main/java/org/alfresco/repo/jscript/Search.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Search.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Search.java
diff --git a/src/main/java/org/alfresco/repo/jscript/Session.java b/repository/src/main/java/org/alfresco/repo/jscript/Session.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/Session.java
rename to repository/src/main/java/org/alfresco/repo/jscript/Session.java
diff --git a/src/main/java/org/alfresco/repo/jscript/ValueConverter.java b/repository/src/main/java/org/alfresco/repo/jscript/ValueConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/ValueConverter.java
rename to repository/src/main/java/org/alfresco/repo/jscript/ValueConverter.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/BasePropertyDecorator.java b/repository/src/main/java/org/alfresco/repo/jscript/app/BasePropertyDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/BasePropertyDecorator.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/BasePropertyDecorator.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/CategoryPropertyDecorator.java b/repository/src/main/java/org/alfresco/repo/jscript/app/CategoryPropertyDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/CategoryPropertyDecorator.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/CategoryPropertyDecorator.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/CustomResponse.java b/repository/src/main/java/org/alfresco/repo/jscript/app/CustomResponse.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/CustomResponse.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/CustomResponse.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/IgnorePropertyDecorator.java b/repository/src/main/java/org/alfresco/repo/jscript/app/IgnorePropertyDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/IgnorePropertyDecorator.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/IgnorePropertyDecorator.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java b/repository/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/PropertyDecorator.java b/repository/src/main/java/org/alfresco/repo/jscript/app/PropertyDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/PropertyDecorator.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/PropertyDecorator.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/TagPropertyDecorator.java b/repository/src/main/java/org/alfresco/repo/jscript/app/TagPropertyDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/TagPropertyDecorator.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/TagPropertyDecorator.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java b/repository/src/main/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/UsernamePropertyDecorator.java
diff --git a/src/main/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java b/repository/src/main/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java
rename to repository/src/main/java/org/alfresco/repo/jscript/app/VtiServerCustomResponse.java
diff --git a/src/main/java/org/alfresco/repo/links/LinkInfoImpl.java b/repository/src/main/java/org/alfresco/repo/links/LinkInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/links/LinkInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/links/LinkInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/links/LinksModel.java b/repository/src/main/java/org/alfresco/repo/links/LinksModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/links/LinksModel.java
rename to repository/src/main/java/org/alfresco/repo/links/LinksModel.java
diff --git a/src/main/java/org/alfresco/repo/links/LinksServiceImpl.java b/repository/src/main/java/org/alfresco/repo/links/LinksServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/links/LinksServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/links/LinksServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/lock/JobLockService.java b/repository/src/main/java/org/alfresco/repo/lock/JobLockService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/JobLockService.java
rename to repository/src/main/java/org/alfresco/repo/lock/JobLockService.java
diff --git a/src/main/java/org/alfresco/repo/lock/JobLockServiceImpl.java b/repository/src/main/java/org/alfresco/repo/lock/JobLockServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/JobLockServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/lock/JobLockServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/lock/LockAcquisitionException.java b/repository/src/main/java/org/alfresco/repo/lock/LockAcquisitionException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/LockAcquisitionException.java
rename to repository/src/main/java/org/alfresco/repo/lock/LockAcquisitionException.java
diff --git a/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/lock/LockServicePolicies.java b/repository/src/main/java/org/alfresco/repo/lock/LockServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/LockServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/lock/LockServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/lock/LockUtils.java b/repository/src/main/java/org/alfresco/repo/lock/LockUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/LockUtils.java
rename to repository/src/main/java/org/alfresco/repo/lock/LockUtils.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/AbstractLockStore.java b/repository/src/main/java/org/alfresco/repo/lock/mem/AbstractLockStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/AbstractLockStore.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/AbstractLockStore.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/DefaultLockStoreFactory.java b/repository/src/main/java/org/alfresco/repo/lock/mem/DefaultLockStoreFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/DefaultLockStoreFactory.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/DefaultLockStoreFactory.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/Lifetime.java b/repository/src/main/java/org/alfresco/repo/lock/mem/Lifetime.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/Lifetime.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/Lifetime.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/LockState.java b/repository/src/main/java/org/alfresco/repo/lock/mem/LockState.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/LockState.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/LockState.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/LockStore.java b/repository/src/main/java/org/alfresco/repo/lock/mem/LockStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/LockStore.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/LockStore.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/LockStoreFactory.java b/repository/src/main/java/org/alfresco/repo/lock/mem/LockStoreFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/LockStoreFactory.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/LockStoreFactory.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/LockStoreImpl.java b/repository/src/main/java/org/alfresco/repo/lock/mem/LockStoreImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/LockStoreImpl.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/LockStoreImpl.java
diff --git a/src/main/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java b/repository/src/main/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/lock/traitextender/LockServiceExtension.java b/repository/src/main/java/org/alfresco/repo/lock/traitextender/LockServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/traitextender/LockServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/lock/traitextender/LockServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/lock/traitextender/LockServiceTrait.java b/repository/src/main/java/org/alfresco/repo/lock/traitextender/LockServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/traitextender/LockServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/lock/traitextender/LockServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorExtension.java b/repository/src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorExtension.java
rename to repository/src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorExtension.java
diff --git a/src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorTrait.java b/repository/src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorTrait.java
rename to repository/src/main/java/org/alfresco/repo/lock/traitextender/LockableAspectInterceptorTrait.java
diff --git a/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java b/repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java
rename to repository/src/main/java/org/alfresco/repo/mail/AlfrescoJavaMailSender.java
diff --git a/src/main/java/org/alfresco/repo/mail/package-info.java b/repository/src/main/java/org/alfresco/repo/mail/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/mail/package-info.java
rename to repository/src/main/java/org/alfresco/repo/mail/package-info.java
diff --git a/src/main/java/org/alfresco/repo/management/DummyManagedResource.java b/repository/src/main/java/org/alfresco/repo/management/DummyManagedResource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/DummyManagedResource.java
rename to repository/src/main/java/org/alfresco/repo/management/DummyManagedResource.java
diff --git a/src/main/java/org/alfresco/repo/management/DynamicMBeanExportOperations.java b/repository/src/main/java/org/alfresco/repo/management/DynamicMBeanExportOperations.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/DynamicMBeanExportOperations.java
rename to repository/src/main/java/org/alfresco/repo/management/DynamicMBeanExportOperations.java
diff --git a/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java b/repository/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java
rename to repository/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java
diff --git a/src/main/java/org/alfresco/repo/management/JmxDumpUtil.java b/repository/src/main/java/org/alfresco/repo/management/JmxDumpUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/JmxDumpUtil.java
rename to repository/src/main/java/org/alfresco/repo/management/JmxDumpUtil.java
diff --git a/src/main/java/org/alfresco/repo/management/ManagedBean.java b/repository/src/main/java/org/alfresco/repo/management/ManagedBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/ManagedBean.java
rename to repository/src/main/java/org/alfresco/repo/management/ManagedBean.java
diff --git a/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java b/repository/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
rename to repository/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/ActivateableBean.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/ActivateableBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/ActivateableBean.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/ActivateableBean.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/ApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/ApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/ApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/ApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextManager.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextManager.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/ChildApplicationContextManager.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/CompositeDataBean.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/CompositeDataBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/CompositeDataBean.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/CompositeDataBean.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/CryptodocSubsystemProxyFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/CryptodocSubsystemProxyFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/CryptodocSubsystemProxyFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/CryptodocSubsystemProxyFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/DefaultChildApplicationContextManager.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/DefaultChildApplicationContextManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/DefaultChildApplicationContextManager.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/DefaultChildApplicationContextManager.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/DefaultPropertyBackedBeanRegistry.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/DefaultPropertyBackedBeanRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/DefaultPropertyBackedBeanRegistry.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/DefaultPropertyBackedBeanRegistry.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/EncryptedContentStoreChildApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/EncryptedContentStoreChildApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/EncryptedContentStoreChildApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/EncryptedContentStoreChildApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/InvalidPropertyValueException.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/InvalidPropertyValueException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/InvalidPropertyValueException.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/InvalidPropertyValueException.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/LuceneChildApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/NoIndexChildApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PortEarlyPropertyChecker.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PortEarlyPropertyChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PortEarlyPropertyChecker.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PortEarlyPropertyChecker.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBean.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBean.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBean.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegisteredEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegisteredEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegisteredEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegisteredEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegistry.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegistry.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRegistry.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRemovePropertiesEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRemovePropertiesEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRemovePropertiesEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanRemovePropertiesEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertiesEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertiesEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertiesEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertiesEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertyEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertyEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertyEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanSetPropertyEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStartedEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStartedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStartedEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStartedEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanState.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanState.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanState.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanState.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStoppedEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStoppedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStoppedEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanStoppedEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanUnregisteredEvent.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanUnregisteredEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanUnregisteredEvent.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanUnregisteredEvent.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanWithMonitor.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanWithMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanWithMonitor.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/PropertyBackedBeanWithMonitor.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/SubsystemEarlyPropertyChecker.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemEarlyPropertyChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/SubsystemEarlyPropertyChecker.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemEarlyPropertyChecker.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
diff --git a/src/main/java/org/alfresco/repo/management/subsystems/SwitchableApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/SwitchableApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/management/subsystems/SwitchableApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/management/subsystems/SwitchableApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/mode/ServerMode.java b/repository/src/main/java/org/alfresco/repo/mode/ServerMode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/mode/ServerMode.java
rename to repository/src/main/java/org/alfresco/repo/mode/ServerMode.java
diff --git a/src/main/java/org/alfresco/repo/mode/ServerModeImpl.java b/repository/src/main/java/org/alfresco/repo/mode/ServerModeImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/mode/ServerModeImpl.java
rename to repository/src/main/java/org/alfresco/repo/mode/ServerModeImpl.java
diff --git a/src/main/java/org/alfresco/repo/mode/ServerModeProvider.java b/repository/src/main/java/org/alfresco/repo/mode/ServerModeProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/mode/ServerModeProvider.java
rename to repository/src/main/java/org/alfresco/repo/mode/ServerModeProvider.java
diff --git a/src/main/java/org/alfresco/repo/model/Repository.java b/repository/src/main/java/org/alfresco/repo/model/Repository.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/Repository.java
rename to repository/src/main/java/org/alfresco/repo/model/Repository.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/ConfigurableHiddenFileInfo.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/ConfigurableHiddenFileInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/ConfigurableHiddenFileInfo.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/ConfigurableHiddenFileInfo.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/FileFolderLoader.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/FileFolderLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/FileFolderLoader.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/FileFolderLoader.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/FileInfoImpl.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/FileInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/FileInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/FileInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/GetChildrenCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/HiddenAspect.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/HiddenAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/HiddenAspect.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/HiddenAspect.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/HiddenFileFilter.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/HiddenFileFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/HiddenFileFilter.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/HiddenFileFilter.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/HiddenFileInfo.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/HiddenFileInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/HiddenFileInfo.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/HiddenFileInfo.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/MLTranslationInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceExtension.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceTrait.java b/repository/src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/model/filefolder/traitextender/FileFolderServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java b/repository/src/main/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/ContentFilterLanguagesMap.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/EditionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/model/ml/EditionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/EditionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/EditionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/EmptyTranslationAspect.java b/repository/src/main/java/org/alfresco/repo/model/ml/EmptyTranslationAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/EmptyTranslationAspect.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/EmptyTranslationAspect.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/MLContainerType.java b/repository/src/main/java/org/alfresco/repo/model/ml/MLContainerType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/MLContainerType.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/MLContainerType.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/MLContentInterceptor.java b/repository/src/main/java/org/alfresco/repo/model/ml/MLContentInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/MLContentInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/MLContentInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java b/repository/src/main/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java b/repository/src/main/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java
rename to repository/src/main/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java
diff --git a/src/main/java/org/alfresco/repo/module/AbstractModuleComponent.java b/repository/src/main/java/org/alfresco/repo/module/AbstractModuleComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/AbstractModuleComponent.java
rename to repository/src/main/java/org/alfresco/repo/module/AbstractModuleComponent.java
diff --git a/src/main/java/org/alfresco/repo/module/ImporterModuleComponent.java b/repository/src/main/java/org/alfresco/repo/module/ImporterModuleComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ImporterModuleComponent.java
rename to repository/src/main/java/org/alfresco/repo/module/ImporterModuleComponent.java
diff --git a/src/main/java/org/alfresco/repo/module/LoggerModuleComponent.java b/repository/src/main/java/org/alfresco/repo/module/LoggerModuleComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/LoggerModuleComponent.java
rename to repository/src/main/java/org/alfresco/repo/module/LoggerModuleComponent.java
diff --git a/src/main/java/org/alfresco/repo/module/ModuleComponent.java b/repository/src/main/java/org/alfresco/repo/module/ModuleComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ModuleComponent.java
rename to repository/src/main/java/org/alfresco/repo/module/ModuleComponent.java
diff --git a/src/main/java/org/alfresco/repo/module/ModuleComponentHelper.java b/repository/src/main/java/org/alfresco/repo/module/ModuleComponentHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ModuleComponentHelper.java
rename to repository/src/main/java/org/alfresco/repo/module/ModuleComponentHelper.java
diff --git a/src/main/java/org/alfresco/repo/module/ModuleDetailsImpl.java b/repository/src/main/java/org/alfresco/repo/module/ModuleDetailsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ModuleDetailsImpl.java
rename to repository/src/main/java/org/alfresco/repo/module/ModuleDetailsImpl.java
diff --git a/src/main/java/org/alfresco/repo/module/ModuleServiceImpl.java b/repository/src/main/java/org/alfresco/repo/module/ModuleServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ModuleServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/module/ModuleServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/module/ModuleStarter.java b/repository/src/main/java/org/alfresco/repo/module/ModuleStarter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ModuleStarter.java
rename to repository/src/main/java/org/alfresco/repo/module/ModuleStarter.java
diff --git a/src/main/java/org/alfresco/repo/module/ModuleVersionNumber.java b/repository/src/main/java/org/alfresco/repo/module/ModuleVersionNumber.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/ModuleVersionNumber.java
rename to repository/src/main/java/org/alfresco/repo/module/ModuleVersionNumber.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/InstalledFiles.java b/repository/src/main/java/org/alfresco/repo/module/tool/InstalledFiles.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/InstalledFiles.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/InstalledFiles.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/LogOutput.java b/repository/src/main/java/org/alfresco/repo/module/tool/LogOutput.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/LogOutput.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/LogOutput.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java b/repository/src/main/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java b/repository/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/ModuleManagementToolException.java b/repository/src/main/java/org/alfresco/repo/module/tool/ModuleManagementToolException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/ModuleManagementToolException.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/ModuleManagementToolException.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/WarHelper.java b/repository/src/main/java/org/alfresco/repo/module/tool/WarHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/WarHelper.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/WarHelper.java
diff --git a/src/main/java/org/alfresco/repo/module/tool/WarHelperImpl.java b/repository/src/main/java/org/alfresco/repo/module/tool/WarHelperImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/module/tool/WarHelperImpl.java
rename to repository/src/main/java/org/alfresco/repo/module/tool/WarHelperImpl.java
diff --git a/src/main/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java b/repository/src/main/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/node/CascadeUpdateAspect.java b/repository/src/main/java/org/alfresco/repo/node/CascadeUpdateAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/CascadeUpdateAspect.java
rename to repository/src/main/java/org/alfresco/repo/node/CascadeUpdateAspect.java
diff --git a/src/main/java/org/alfresco/repo/node/ContentPropertyRestrictionInterceptor.java b/repository/src/main/java/org/alfresco/repo/node/ContentPropertyRestrictionInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/ContentPropertyRestrictionInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/node/ContentPropertyRestrictionInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/node/FFCLoadsOfFiles.java b/repository/src/main/java/org/alfresco/repo/node/FFCLoadsOfFiles.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/FFCLoadsOfFiles.java
rename to repository/src/main/java/org/alfresco/repo/node/FFCLoadsOfFiles.java
diff --git a/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQuery.java b/repository/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/node/GetNodesWithAspectCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/node/MLPropertyInterceptor.java b/repository/src/main/java/org/alfresco/repo/node/MLPropertyInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/MLPropertyInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/node/MLPropertyInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/node/NodeArchiveServicePolicies.java b/repository/src/main/java/org/alfresco/repo/node/NodeArchiveServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/NodeArchiveServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/node/NodeArchiveServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/node/NodeAuditor.java b/repository/src/main/java/org/alfresco/repo/node/NodeAuditor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/NodeAuditor.java
rename to repository/src/main/java/org/alfresco/repo/node/NodeAuditor.java
diff --git a/src/main/java/org/alfresco/repo/node/NodeBulkLoader.java b/repository/src/main/java/org/alfresco/repo/node/NodeBulkLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/NodeBulkLoader.java
rename to repository/src/main/java/org/alfresco/repo/node/NodeBulkLoader.java
diff --git a/src/main/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java b/repository/src/main/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/node/NodeServicePolicies.java b/repository/src/main/java/org/alfresco/repo/node/NodeServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/NodeServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/node/NodeServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/node/NodeUtils.java b/repository/src/main/java/org/alfresco/repo/node/NodeUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/NodeUtils.java
rename to repository/src/main/java/org/alfresco/repo/node/NodeUtils.java
diff --git a/src/main/java/org/alfresco/repo/node/PendingDeleteAspect.java b/repository/src/main/java/org/alfresco/repo/node/PendingDeleteAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/PendingDeleteAspect.java
rename to repository/src/main/java/org/alfresco/repo/node/PendingDeleteAspect.java
diff --git a/src/main/java/org/alfresco/repo/node/ReferenceableAspect.java b/repository/src/main/java/org/alfresco/repo/node/ReferenceableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/ReferenceableAspect.java
rename to repository/src/main/java/org/alfresco/repo/node/ReferenceableAspect.java
diff --git a/src/main/java/org/alfresco/repo/node/StoreArchiveMap.java b/repository/src/main/java/org/alfresco/repo/node/StoreArchiveMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/StoreArchiveMap.java
rename to repository/src/main/java/org/alfresco/repo/node/StoreArchiveMap.java
diff --git a/src/main/java/org/alfresco/repo/node/SystemNodeUtils.java b/repository/src/main/java/org/alfresco/repo/node/SystemNodeUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/SystemNodeUtils.java
rename to repository/src/main/java/org/alfresco/repo/node/SystemNodeUtils.java
diff --git a/src/main/java/org/alfresco/repo/node/TemporaryAspect.java b/repository/src/main/java/org/alfresco/repo/node/TemporaryAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/TemporaryAspect.java
rename to repository/src/main/java/org/alfresco/repo/node/TemporaryAspect.java
diff --git a/src/main/java/org/alfresco/repo/node/UndeletableAspect.java b/repository/src/main/java/org/alfresco/repo/node/UndeletableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/UndeletableAspect.java
rename to repository/src/main/java/org/alfresco/repo/node/UndeletableAspect.java
diff --git a/src/main/java/org/alfresco/repo/node/UnmovableAspect.java b/repository/src/main/java/org/alfresco/repo/node/UnmovableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/UnmovableAspect.java
rename to repository/src/main/java/org/alfresco/repo/node/UnmovableAspect.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/ArchivedNodeEntity.java b/repository/src/main/java/org/alfresco/repo/node/archive/ArchivedNodeEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/ArchivedNodeEntity.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/ArchivedNodeEntity.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java b/repository/src/main/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/ArchivedNodesCannedQueryBuilder.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQuery.java b/repository/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/GetArchivedNodesCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/NodeArchiveService.java b/repository/src/main/java/org/alfresco/repo/node/archive/NodeArchiveService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/NodeArchiveService.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/NodeArchiveService.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java b/repository/src/main/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/node/archive/RestoreNodeReport.java b/repository/src/main/java/org/alfresco/repo/node/archive/RestoreNodeReport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/archive/RestoreNodeReport.java
rename to repository/src/main/java/org/alfresco/repo/node/archive/RestoreNodeReport.java
diff --git a/src/main/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java b/repository/src/main/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java
rename to repository/src/main/java/org/alfresco/repo/node/cleanup/AbstractNodeCleanupWorker.java
diff --git a/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupJob.java b/repository/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupRegistry.java b/repository/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupRegistry.java
rename to repository/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupRegistry.java
diff --git a/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupWorker.java b/repository/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupWorker.java
rename to repository/src/main/java/org/alfresco/repo/node/cleanup/NodeCleanupWorker.java
diff --git a/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java b/repository/src/main/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
rename to repository/src/main/java/org/alfresco/repo/node/db/DeletedNodeCleanupWorker.java
diff --git a/src/main/java/org/alfresco/repo/node/db/NodeHierarchyWalker.java b/repository/src/main/java/org/alfresco/repo/node/db/NodeHierarchyWalker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/db/NodeHierarchyWalker.java
rename to repository/src/main/java/org/alfresco/repo/node/db/NodeHierarchyWalker.java
diff --git a/src/main/java/org/alfresco/repo/node/db/NodeStringLengthWorker.java b/repository/src/main/java/org/alfresco/repo/node/db/NodeStringLengthWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/db/NodeStringLengthWorker.java
rename to repository/src/main/java/org/alfresco/repo/node/db/NodeStringLengthWorker.java
diff --git a/src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceExtension.java b/repository/src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceTrait.java b/repository/src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/node/db/traitextender/NodeServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/node/encryption/MetadataEncryptor.java b/repository/src/main/java/org/alfresco/repo/node/encryption/MetadataEncryptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/encryption/MetadataEncryptor.java
rename to repository/src/main/java/org/alfresco/repo/node/encryption/MetadataEncryptor.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/FilterProp.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/FilterProp.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/FilterProp.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/FilterProp.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/FilterPropBoolean.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/FilterPropBoolean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/FilterPropBoolean.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/FilterPropBoolean.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/FilterPropString.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/FilterPropString.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/FilterPropString.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/FilterPropString.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/FilterSortNodeEntity.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/FilterSortNodeEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/FilterSortNodeEntity.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/FilterSortNodeEntity.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/FilterType.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/FilterType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/FilterType.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/FilterType.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQuery.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenAuditableCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQuery.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/node/getchildren/GetChildrenWithTargetAssocsAuditableCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AbstractIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AbstractIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AbstractIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AbstractIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AspectsIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AspectsIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AspectsIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AspectsIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AssocSourceMultiplicityIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AssocSourceMultiplicityIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AssocSourceMultiplicityIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AssocSourceMultiplicityIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AssocSourceTypeIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AssocSourceTypeIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AssocSourceTypeIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AssocSourceTypeIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AssocTargetMultiplicityIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AssocTargetMultiplicityIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AssocTargetMultiplicityIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AssocTargetMultiplicityIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AssocTargetRoleIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AssocTargetRoleIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AssocTargetRoleIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AssocTargetRoleIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/AssocTargetTypeIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/AssocTargetTypeIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/AssocTargetTypeIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/AssocTargetTypeIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java b/repository/src/main/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/IncompleteNodeTagger.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/IntegrityChecker.java b/repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/IntegrityChecker.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityChecker.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/IntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/IntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/IntegrityException.java b/repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/IntegrityException.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityException.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/IntegrityRecord.java b/repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityRecord.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/IntegrityRecord.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/IntegrityRecord.java
diff --git a/src/main/java/org/alfresco/repo/node/integrity/PropertiesIntegrityEvent.java b/repository/src/main/java/org/alfresco/repo/node/integrity/PropertiesIntegrityEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/node/integrity/PropertiesIntegrityEvent.java
rename to repository/src/main/java/org/alfresco/repo/node/integrity/PropertiesIntegrityEvent.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/NodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/NodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/NodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/NodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/NodeLocatorService.java b/repository/src/main/java/org/alfresco/repo/nodelocator/NodeLocatorService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/NodeLocatorService.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/NodeLocatorService.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java b/repository/src/main/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/SharedHomeNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/SharedHomeNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/SharedHomeNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/SharedHomeNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java b/repository/src/main/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/notification/EMailNotificationProvider.java b/repository/src/main/java/org/alfresco/repo/notification/EMailNotificationProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/notification/EMailNotificationProvider.java
rename to repository/src/main/java/org/alfresco/repo/notification/EMailNotificationProvider.java
diff --git a/src/main/java/org/alfresco/repo/notification/NotificationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/notification/NotificationServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/notification/NotificationServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/notification/NotificationServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceImpl.java b/repository/src/main/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceImpl.java b/repository/src/main/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java b/repository/src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceNOOPImpl.java b/repository/src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceNOOPImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceNOOPImpl.java
rename to repository/src/main/java/org/alfresco/repo/ownable/impl/OwnableServiceNOOPImpl.java
diff --git a/src/main/java/org/alfresco/repo/policy/AssociationPolicy.java b/repository/src/main/java/org/alfresco/repo/policy/AssociationPolicy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/AssociationPolicy.java
rename to repository/src/main/java/org/alfresco/repo/policy/AssociationPolicy.java
diff --git a/src/main/java/org/alfresco/repo/policy/AssociationPolicyDelegate.java b/repository/src/main/java/org/alfresco/repo/policy/AssociationPolicyDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/AssociationPolicyDelegate.java
rename to repository/src/main/java/org/alfresco/repo/policy/AssociationPolicyDelegate.java
diff --git a/src/main/java/org/alfresco/repo/policy/BaseBehaviour.java b/repository/src/main/java/org/alfresco/repo/policy/BaseBehaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BaseBehaviour.java
rename to repository/src/main/java/org/alfresco/repo/policy/BaseBehaviour.java
diff --git a/src/main/java/org/alfresco/repo/policy/Behaviour.java b/repository/src/main/java/org/alfresco/repo/policy/Behaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/Behaviour.java
rename to repository/src/main/java/org/alfresco/repo/policy/Behaviour.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourBinding.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourBinding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourBinding.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourBinding.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourChangeObserver.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourChangeObserver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourChangeObserver.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourChangeObserver.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourDefinition.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourDefinition.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourDefinition.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourFilter.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourFilter.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourFilter.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourFilterImpl.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourFilterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourFilterImpl.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourFilterImpl.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourIndex.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourIndex.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourIndex.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourIndex.java
diff --git a/src/main/java/org/alfresco/repo/policy/BehaviourMap.java b/repository/src/main/java/org/alfresco/repo/policy/BehaviourMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/BehaviourMap.java
rename to repository/src/main/java/org/alfresco/repo/policy/BehaviourMap.java
diff --git a/src/main/java/org/alfresco/repo/policy/CachedPolicyFactory.java b/repository/src/main/java/org/alfresco/repo/policy/CachedPolicyFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/CachedPolicyFactory.java
rename to repository/src/main/java/org/alfresco/repo/policy/CachedPolicyFactory.java
diff --git a/src/main/java/org/alfresco/repo/policy/ClassBehaviourBinding.java b/repository/src/main/java/org/alfresco/repo/policy/ClassBehaviourBinding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ClassBehaviourBinding.java
rename to repository/src/main/java/org/alfresco/repo/policy/ClassBehaviourBinding.java
diff --git a/src/main/java/org/alfresco/repo/policy/ClassBehaviourIndex.java b/repository/src/main/java/org/alfresco/repo/policy/ClassBehaviourIndex.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ClassBehaviourIndex.java
rename to repository/src/main/java/org/alfresco/repo/policy/ClassBehaviourIndex.java
diff --git a/src/main/java/org/alfresco/repo/policy/ClassFeatureBehaviourBinding.java b/repository/src/main/java/org/alfresco/repo/policy/ClassFeatureBehaviourBinding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ClassFeatureBehaviourBinding.java
rename to repository/src/main/java/org/alfresco/repo/policy/ClassFeatureBehaviourBinding.java
diff --git a/src/main/java/org/alfresco/repo/policy/ClassFilter.java b/repository/src/main/java/org/alfresco/repo/policy/ClassFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ClassFilter.java
rename to repository/src/main/java/org/alfresco/repo/policy/ClassFilter.java
diff --git a/src/main/java/org/alfresco/repo/policy/ClassPolicy.java b/repository/src/main/java/org/alfresco/repo/policy/ClassPolicy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ClassPolicy.java
rename to repository/src/main/java/org/alfresco/repo/policy/ClassPolicy.java
diff --git a/src/main/java/org/alfresco/repo/policy/ClassPolicyDelegate.java b/repository/src/main/java/org/alfresco/repo/policy/ClassPolicyDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ClassPolicyDelegate.java
rename to repository/src/main/java/org/alfresco/repo/policy/ClassPolicyDelegate.java
diff --git a/src/main/java/org/alfresco/repo/policy/EventBehaviour.java b/repository/src/main/java/org/alfresco/repo/policy/EventBehaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/EventBehaviour.java
rename to repository/src/main/java/org/alfresco/repo/policy/EventBehaviour.java
diff --git a/src/main/java/org/alfresco/repo/policy/JavaBehaviour.java b/repository/src/main/java/org/alfresco/repo/policy/JavaBehaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/JavaBehaviour.java
rename to repository/src/main/java/org/alfresco/repo/policy/JavaBehaviour.java
diff --git a/src/main/java/org/alfresco/repo/policy/Policy.java b/repository/src/main/java/org/alfresco/repo/policy/Policy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/Policy.java
rename to repository/src/main/java/org/alfresco/repo/policy/Policy.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyComponent.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyComponent.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyComponent.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyComponentImpl.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyDefinition.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyDefinition.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyDefinition.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyException.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyException.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyException.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyFactory.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyFactory.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyFactory.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyList.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyList.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyList.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyList.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyScope.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyScope.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyScope.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyScope.java
diff --git a/src/main/java/org/alfresco/repo/policy/PolicyType.java b/repository/src/main/java/org/alfresco/repo/policy/PolicyType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PolicyType.java
rename to repository/src/main/java/org/alfresco/repo/policy/PolicyType.java
diff --git a/src/main/java/org/alfresco/repo/policy/PropertyPolicy.java b/repository/src/main/java/org/alfresco/repo/policy/PropertyPolicy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PropertyPolicy.java
rename to repository/src/main/java/org/alfresco/repo/policy/PropertyPolicy.java
diff --git a/src/main/java/org/alfresco/repo/policy/PropertyPolicyDelegate.java b/repository/src/main/java/org/alfresco/repo/policy/PropertyPolicyDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/PropertyPolicyDelegate.java
rename to repository/src/main/java/org/alfresco/repo/policy/PropertyPolicyDelegate.java
diff --git a/src/main/java/org/alfresco/repo/policy/ServiceBehaviourBinding.java b/repository/src/main/java/org/alfresco/repo/policy/ServiceBehaviourBinding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/ServiceBehaviourBinding.java
rename to repository/src/main/java/org/alfresco/repo/policy/ServiceBehaviourBinding.java
diff --git a/src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java b/repository/src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java
rename to repository/src/main/java/org/alfresco/repo/policy/TransactionBehaviourQueue.java
diff --git a/src/main/java/org/alfresco/repo/policy/TransactionInvocationHandlerFactory.java b/repository/src/main/java/org/alfresco/repo/policy/TransactionInvocationHandlerFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/TransactionInvocationHandlerFactory.java
rename to repository/src/main/java/org/alfresco/repo/policy/TransactionInvocationHandlerFactory.java
diff --git a/src/main/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java b/repository/src/main/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java
rename to repository/src/main/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java
diff --git a/src/main/java/org/alfresco/repo/policy/annotation/Behaviour.java b/repository/src/main/java/org/alfresco/repo/policy/annotation/Behaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/annotation/Behaviour.java
rename to repository/src/main/java/org/alfresco/repo/policy/annotation/Behaviour.java
diff --git a/src/main/java/org/alfresco/repo/policy/annotation/BehaviourBean.java b/repository/src/main/java/org/alfresco/repo/policy/annotation/BehaviourBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/annotation/BehaviourBean.java
rename to repository/src/main/java/org/alfresco/repo/policy/annotation/BehaviourBean.java
diff --git a/src/main/java/org/alfresco/repo/policy/annotation/BehaviourKind.java b/repository/src/main/java/org/alfresco/repo/policy/annotation/BehaviourKind.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/annotation/BehaviourKind.java
rename to repository/src/main/java/org/alfresco/repo/policy/annotation/BehaviourKind.java
diff --git a/src/main/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java b/repository/src/main/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
rename to repository/src/main/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
diff --git a/src/main/java/org/alfresco/repo/policy/package-info.java b/repository/src/main/java/org/alfresco/repo/policy/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/package-info.java
rename to repository/src/main/java/org/alfresco/repo/policy/package-info.java
diff --git a/src/main/java/org/alfresco/repo/policy/registration/AssociationPolicyRegistration.java b/repository/src/main/java/org/alfresco/repo/policy/registration/AssociationPolicyRegistration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/registration/AssociationPolicyRegistration.java
rename to repository/src/main/java/org/alfresco/repo/policy/registration/AssociationPolicyRegistration.java
diff --git a/src/main/java/org/alfresco/repo/policy/registration/ClassPolicyRegistration.java b/repository/src/main/java/org/alfresco/repo/policy/registration/ClassPolicyRegistration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/registration/ClassPolicyRegistration.java
rename to repository/src/main/java/org/alfresco/repo/policy/registration/ClassPolicyRegistration.java
diff --git a/src/main/java/org/alfresco/repo/policy/registration/PolicyRegistration.java b/repository/src/main/java/org/alfresco/repo/policy/registration/PolicyRegistration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/registration/PolicyRegistration.java
rename to repository/src/main/java/org/alfresco/repo/policy/registration/PolicyRegistration.java
diff --git a/src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterExtension.java b/repository/src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterExtension.java
rename to repository/src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterExtension.java
diff --git a/src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterTrait.java b/repository/src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterTrait.java
rename to repository/src/main/java/org/alfresco/repo/policy/traitextender/BehaviourFilterTrait.java
diff --git a/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java b/repository/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/preference/script/ScriptPreferenceService.java b/repository/src/main/java/org/alfresco/repo/preference/script/ScriptPreferenceService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/preference/script/ScriptPreferenceService.java
rename to repository/src/main/java/org/alfresco/repo/preference/script/ScriptPreferenceService.java
diff --git a/src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceExtension.java b/repository/src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceTrait.java b/repository/src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/preference/traitextender/PreferenceServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/processor/BaseProcessor.java b/repository/src/main/java/org/alfresco/repo/processor/BaseProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/processor/BaseProcessor.java
rename to repository/src/main/java/org/alfresco/repo/processor/BaseProcessor.java
diff --git a/src/main/java/org/alfresco/repo/processor/BaseProcessorExtension.java b/repository/src/main/java/org/alfresco/repo/processor/BaseProcessorExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/processor/BaseProcessorExtension.java
rename to repository/src/main/java/org/alfresco/repo/processor/BaseProcessorExtension.java
diff --git a/src/main/java/org/alfresco/repo/processor/ScriptServiceImpl.java b/repository/src/main/java/org/alfresco/repo/processor/ScriptServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/processor/ScriptServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/processor/ScriptServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/processor/TemplateServiceImpl.java b/repository/src/main/java/org/alfresco/repo/processor/TemplateServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/processor/TemplateServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/processor/TemplateServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/query/NodeBackedEntity.java b/repository/src/main/java/org/alfresco/repo/query/NodeBackedEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/query/NodeBackedEntity.java
rename to repository/src/main/java/org/alfresco/repo/query/NodeBackedEntity.java
diff --git a/src/main/java/org/alfresco/repo/query/NodeWithTargetsEntity.java b/repository/src/main/java/org/alfresco/repo/query/NodeWithTargetsEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/query/NodeWithTargetsEntity.java
rename to repository/src/main/java/org/alfresco/repo/query/NodeWithTargetsEntity.java
diff --git a/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionException.java b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionException.java
rename to repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionException.java
diff --git a/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionExecutor.java b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionExecutor.java
rename to repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionExecutor.java
diff --git a/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionImpl.java b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionImpl.java
rename to repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionImpl.java
diff --git a/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionPersisterImpl.java b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionPersisterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionPersisterImpl.java
rename to repository/src/main/java/org/alfresco/repo/quickshare/QuickShareLinkExpiryActionPersisterImpl.java
diff --git a/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java b/repository/src/main/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java
rename to repository/src/main/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java
diff --git a/src/main/java/org/alfresco/repo/rating/RateableAspect.java b/repository/src/main/java/org/alfresco/repo/rating/RateableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RateableAspect.java
rename to repository/src/main/java/org/alfresco/repo/rating/RateableAspect.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingCountRollupAlgorithm.java b/repository/src/main/java/org/alfresco/repo/rating/RatingCountRollupAlgorithm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingCountRollupAlgorithm.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingCountRollupAlgorithm.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingNamingConventionsUtil.java b/repository/src/main/java/org/alfresco/repo/rating/RatingNamingConventionsUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingNamingConventionsUtil.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingNamingConventionsUtil.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingSchemeImpl.java b/repository/src/main/java/org/alfresco/repo/rating/RatingSchemeImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingSchemeImpl.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingSchemeImpl.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingSchemeRegistry.java b/repository/src/main/java/org/alfresco/repo/rating/RatingSchemeRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingSchemeRegistry.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingSchemeRegistry.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingServiceImpl.java b/repository/src/main/java/org/alfresco/repo/rating/RatingServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingTotalRollupAlgorithm.java b/repository/src/main/java/org/alfresco/repo/rating/RatingTotalRollupAlgorithm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingTotalRollupAlgorithm.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingTotalRollupAlgorithm.java
diff --git a/src/main/java/org/alfresco/repo/rating/RatingsRelatedAspectBehaviours.java b/repository/src/main/java/org/alfresco/repo/rating/RatingsRelatedAspectBehaviours.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/RatingsRelatedAspectBehaviours.java
rename to repository/src/main/java/org/alfresco/repo/rating/RatingsRelatedAspectBehaviours.java
diff --git a/src/main/java/org/alfresco/repo/rating/script/ScriptRatingService.java b/repository/src/main/java/org/alfresco/repo/rating/script/ScriptRatingService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/script/ScriptRatingService.java
rename to repository/src/main/java/org/alfresco/repo/rating/script/ScriptRatingService.java
diff --git a/src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceExtension.java b/repository/src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceTrait.java b/repository/src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/rating/traitextender/RatingServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/rawevents/AbstractEventProducer.java b/repository/src/main/java/org/alfresco/repo/rawevents/AbstractEventProducer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rawevents/AbstractEventProducer.java
rename to repository/src/main/java/org/alfresco/repo/rawevents/AbstractEventProducer.java
diff --git a/src/main/java/org/alfresco/repo/rawevents/TransactionAwareEventProducer.java b/repository/src/main/java/org/alfresco/repo/rawevents/TransactionAwareEventProducer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rawevents/TransactionAwareEventProducer.java
rename to repository/src/main/java/org/alfresco/repo/rawevents/TransactionAwareEventProducer.java
diff --git a/src/main/java/org/alfresco/repo/rawevents/types/Event.java b/repository/src/main/java/org/alfresco/repo/rawevents/types/Event.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rawevents/types/Event.java
rename to repository/src/main/java/org/alfresco/repo/rawevents/types/Event.java
diff --git a/src/main/java/org/alfresco/repo/rawevents/types/EventImpl.java b/repository/src/main/java/org/alfresco/repo/rawevents/types/EventImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rawevents/types/EventImpl.java
rename to repository/src/main/java/org/alfresco/repo/rawevents/types/EventImpl.java
diff --git a/src/main/java/org/alfresco/repo/rawevents/types/EventType.java b/repository/src/main/java/org/alfresco/repo/rawevents/types/EventType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rawevents/types/EventType.java
rename to repository/src/main/java/org/alfresco/repo/rawevents/types/EventType.java
diff --git a/src/main/java/org/alfresco/repo/rawevents/types/OnContentUpdatePolicyEvent.java b/repository/src/main/java/org/alfresco/repo/rawevents/types/OnContentUpdatePolicyEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rawevents/types/OnContentUpdatePolicyEvent.java
rename to repository/src/main/java/org/alfresco/repo/rawevents/types/OnContentUpdatePolicyEvent.java
diff --git a/src/main/java/org/alfresco/repo/remote/ClientTicketHolder.java b/repository/src/main/java/org/alfresco/repo/remote/ClientTicketHolder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/ClientTicketHolder.java
rename to repository/src/main/java/org/alfresco/repo/remote/ClientTicketHolder.java
diff --git a/src/main/java/org/alfresco/repo/remote/ClientTicketHolderGlobal.java b/repository/src/main/java/org/alfresco/repo/remote/ClientTicketHolderGlobal.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/ClientTicketHolderGlobal.java
rename to repository/src/main/java/org/alfresco/repo/remote/ClientTicketHolderGlobal.java
diff --git a/src/main/java/org/alfresco/repo/remote/ClientTicketHolderThread.java b/repository/src/main/java/org/alfresco/repo/remote/ClientTicketHolderThread.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/ClientTicketHolderThread.java
rename to repository/src/main/java/org/alfresco/repo/remote/ClientTicketHolderThread.java
diff --git a/src/main/java/org/alfresco/repo/remote/ReauthenticatingAdvice.java b/repository/src/main/java/org/alfresco/repo/remote/ReauthenticatingAdvice.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/ReauthenticatingAdvice.java
rename to repository/src/main/java/org/alfresco/repo/remote/ReauthenticatingAdvice.java
diff --git a/src/main/java/org/alfresco/repo/remote/RepoRemoteImpl.java b/repository/src/main/java/org/alfresco/repo/remote/RepoRemoteImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/RepoRemoteImpl.java
rename to repository/src/main/java/org/alfresco/repo/remote/RepoRemoteImpl.java
diff --git a/src/main/java/org/alfresco/repo/remote/RepoRemoteInputStream.java b/repository/src/main/java/org/alfresco/repo/remote/RepoRemoteInputStream.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/RepoRemoteInputStream.java
rename to repository/src/main/java/org/alfresco/repo/remote/RepoRemoteInputStream.java
diff --git a/src/main/java/org/alfresco/repo/remote/RepoRemoteOutputStream.java b/repository/src/main/java/org/alfresco/repo/remote/RepoRemoteOutputStream.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/RepoRemoteOutputStream.java
rename to repository/src/main/java/org/alfresco/repo/remote/RepoRemoteOutputStream.java
diff --git a/src/main/java/org/alfresco/repo/remote/RepoRemoteService.java b/repository/src/main/java/org/alfresco/repo/remote/RepoRemoteService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/RepoRemoteService.java
rename to repository/src/main/java/org/alfresco/repo/remote/RepoRemoteService.java
diff --git a/src/main/java/org/alfresco/repo/remote/RepoRemoteTransportService.java b/repository/src/main/java/org/alfresco/repo/remote/RepoRemoteTransportService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remote/RepoRemoteTransportService.java
rename to repository/src/main/java/org/alfresco/repo/remote/RepoRemoteTransportService.java
diff --git a/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorRequestImpl.java b/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorRequestImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorRequestImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorRequestImpl.java
diff --git a/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java b/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorResponseImpl.java
diff --git a/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java b/repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/AbstractCredentialsImpl.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/AbstractCredentialsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/AbstractCredentialsImpl.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/AbstractCredentialsImpl.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsFactory.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsFactory.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsFactory.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsInfoImpl.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth1CredentialsInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsFactory.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsFactory.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsFactory.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsInfoImpl.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/OAuth2CredentialsInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsFactory.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsFactory.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsFactory.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsInfoImpl.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/PasswordCredentialsInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsInfoFactory.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsInfoFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsInfoFactory.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsInfoFactory.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsModel.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsModel.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsModel.java
diff --git a/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServiceImpl.java b/repository/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/remoteticket/AbstractRemoteAlfrescoTicketImpl.java b/repository/src/main/java/org/alfresco/repo/remoteticket/AbstractRemoteAlfrescoTicketImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteticket/AbstractRemoteAlfrescoTicketImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteticket/AbstractRemoteAlfrescoTicketImpl.java
diff --git a/src/main/java/org/alfresco/repo/remoteticket/AlfTicketRemoteAlfrescoTicketImpl.java b/repository/src/main/java/org/alfresco/repo/remoteticket/AlfTicketRemoteAlfrescoTicketImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteticket/AlfTicketRemoteAlfrescoTicketImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteticket/AlfTicketRemoteAlfrescoTicketImpl.java
diff --git a/src/main/java/org/alfresco/repo/remoteticket/GuestRemoteAlfrescoTicketImpl.java b/repository/src/main/java/org/alfresco/repo/remoteticket/GuestRemoteAlfrescoTicketImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteticket/GuestRemoteAlfrescoTicketImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteticket/GuestRemoteAlfrescoTicketImpl.java
diff --git a/src/main/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java b/repository/src/main/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/CompositeRenditionDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/CompositeRenditionDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/CompositeRenditionDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/CompositeRenditionDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/PerformRenditionActionExecuter.java b/repository/src/main/java/org/alfresco/repo/rendition/PerformRenditionActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/PerformRenditionActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/rendition/PerformRenditionActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenderingEngineDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/RenderingEngineDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenderingEngineDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenderingEngineDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersister.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersister.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersister.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionLocation.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionLocation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionLocation.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionLocation.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionLocationImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionLocationImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionLocationImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionLocationImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionLocationResolver.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionLocationResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionLocationResolver.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionLocationResolver.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionNodeManager.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionNodeManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionNodeManager.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionNodeManager.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionPreventionRegistry.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionPreventionRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionPreventionRegistry.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionPreventionRegistry.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/RenditionedAspect.java b/repository/src/main/java/org/alfresco/repo/rendition/RenditionedAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/RenditionedAspect.java
rename to repository/src/main/java/org/alfresco/repo/rendition/RenditionedAspect.java
diff --git a/src/main/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverImpl.java b/repository/src/main/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/AbstractTransformationRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/AbstractTransformationRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/AbstractTransformationRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/AbstractTransformationRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/CompositeRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/CompositeRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/CompositeRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/CompositeRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/DeleteRenditionActionExecuter.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/DeleteRenditionActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/DeleteRenditionActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/DeleteRenditionActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/FreemarkerRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/FreemarkerRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/FreemarkerRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/FreemarkerRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/ImageRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/ImageRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/ImageRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/ImageRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/ReformatRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/ReformatRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/ReformatRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/ReformatRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java
diff --git a/src/main/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java b/repository/src/main/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java
rename to repository/src/main/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java
diff --git a/src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionDefinition.java b/repository/src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionDefinition.java
rename to repository/src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionDefinition.java
diff --git a/src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionService.java b/repository/src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionService.java
rename to repository/src/main/java/org/alfresco/repo/rendition/script/ScriptRenditionService.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/ContentTransformServiceImpl.java b/repository/src/main/java/org/alfresco/repo/rendition2/ContentTransformServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/ContentTransformServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/ContentTransformServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/LegacyTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/LegacyTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/LegacyTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/LegacyTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistry.java b/repository/src/main/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistry.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistry.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/LocalTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/LocalTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/LocalTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/LocalTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2Impl.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2Impl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2Impl.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinition2Impl.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2Impl.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2Impl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2Impl.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionDefinitionRegistry2Impl.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionEventProcessor.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionEventProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionEventProcessor.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionEventProcessor.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionService2.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionService2.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionService2Exception.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Exception.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionService2Exception.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Exception.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2Impl.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/RenditionService2PreventedException.java b/repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2PreventedException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/RenditionService2PreventedException.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/RenditionService2PreventedException.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/StubTransformReplyProvider.java b/repository/src/main/java/org/alfresco/repo/rendition2/StubTransformReplyProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/StubTransformReplyProvider.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/StubTransformReplyProvider.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/SwitchingSynchronousTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/SwitchingSynchronousTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/SwitchingSynchronousTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/SwitchingSynchronousTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/SwitchingTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java b/repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/SynchronousTransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/SynchronousTransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/SynchronousTransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/SynchronousTransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/TransformClient.java b/repository/src/main/java/org/alfresco/repo/rendition2/TransformClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/TransformClient.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/TransformClient.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/TransformDefinition.java b/repository/src/main/java/org/alfresco/repo/rendition2/TransformDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/TransformDefinition.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/TransformDefinition.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/TransformReplyProvider.java b/repository/src/main/java/org/alfresco/repo/rendition2/TransformReplyProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/TransformReplyProvider.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/TransformReplyProvider.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/TransformRequest.java b/repository/src/main/java/org/alfresco/repo/rendition2/TransformRequest.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/TransformRequest.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/TransformRequest.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/TransformRequestProcessor.java b/repository/src/main/java/org/alfresco/repo/rendition2/TransformRequestProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/TransformRequestProcessor.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/TransformRequestProcessor.java
diff --git a/src/main/java/org/alfresco/repo/rendition2/TransformationOptionsConverter.java b/repository/src/main/java/org/alfresco/repo/rendition2/TransformationOptionsConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rendition2/TransformationOptionsConverter.java
rename to repository/src/main/java/org/alfresco/repo/rendition2/TransformationOptionsConverter.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationActionExecutor.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionImpl.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationDefinitionImpl.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionImpl.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersister.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersister.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersister.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersisterImpl.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersisterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersisterImpl.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationDefinitionPersisterImpl.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationParams.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationParams.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationParams.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationParamsImpl.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationParamsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationParamsImpl.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationParamsImpl.java
diff --git a/src/main/java/org/alfresco/repo/replication/ReplicationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/replication/ReplicationServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/ReplicationServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/replication/ReplicationServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/replication/script/ScriptReplicationDefinition.java b/repository/src/main/java/org/alfresco/repo/replication/script/ScriptReplicationDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/script/ScriptReplicationDefinition.java
rename to repository/src/main/java/org/alfresco/repo/replication/script/ScriptReplicationDefinition.java
diff --git a/src/main/java/org/alfresco/repo/replication/script/ScriptReplicationService.java b/repository/src/main/java/org/alfresco/repo/replication/script/ScriptReplicationService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/replication/script/ScriptReplicationService.java
rename to repository/src/main/java/org/alfresco/repo/replication/script/ScriptReplicationService.java
diff --git a/src/main/java/org/alfresco/repo/rule/LinkRules.java b/repository/src/main/java/org/alfresco/repo/rule/LinkRules.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/LinkRules.java
rename to repository/src/main/java/org/alfresco/repo/rule/LinkRules.java
diff --git a/src/main/java/org/alfresco/repo/rule/ReorderRules.java b/repository/src/main/java/org/alfresco/repo/rule/ReorderRules.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ReorderRules.java
rename to repository/src/main/java/org/alfresco/repo/rule/ReorderRules.java
diff --git a/src/main/java/org/alfresco/repo/rule/RuleModel.java b/repository/src/main/java/org/alfresco/repo/rule/RuleModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/RuleModel.java
rename to repository/src/main/java/org/alfresco/repo/rule/RuleModel.java
diff --git a/src/main/java/org/alfresco/repo/rule/RuleServiceImpl.java b/repository/src/main/java/org/alfresco/repo/rule/RuleServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/RuleServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/rule/RuleServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/rule/RuleTransactionListener.java b/repository/src/main/java/org/alfresco/repo/rule/RuleTransactionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/RuleTransactionListener.java
rename to repository/src/main/java/org/alfresco/repo/rule/RuleTransactionListener.java
diff --git a/src/main/java/org/alfresco/repo/rule/RuleTypeImpl.java b/repository/src/main/java/org/alfresco/repo/rule/RuleTypeImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/RuleTypeImpl.java
rename to repository/src/main/java/org/alfresco/repo/rule/RuleTypeImpl.java
diff --git a/src/main/java/org/alfresco/repo/rule/RulesAspect.java b/repository/src/main/java/org/alfresco/repo/rule/RulesAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/RulesAspect.java
rename to repository/src/main/java/org/alfresco/repo/rule/RulesAspect.java
diff --git a/src/main/java/org/alfresco/repo/rule/RuntimeRuleService.java b/repository/src/main/java/org/alfresco/repo/rule/RuntimeRuleService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/RuntimeRuleService.java
rename to repository/src/main/java/org/alfresco/repo/rule/RuntimeRuleService.java
diff --git a/src/main/java/org/alfresco/repo/rule/UnlinkRules.java b/repository/src/main/java/org/alfresco/repo/rule/UnlinkRules.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/UnlinkRules.java
rename to repository/src/main/java/org/alfresco/repo/rule/UnlinkRules.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/BeforeDeleteChildAssociationRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/BeforeDeleteChildAssociationRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/BeforeDeleteChildAssociationRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/BeforeDeleteChildAssociationRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/OnCreateChildAssociationRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/OnCreateChildAssociationRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/OnCreateChildAssociationRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/OnCreateChildAssociationRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/OnMoveNodeRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/OnPropertyUpdateRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/RestoreNodeRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/RestoreNodeRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/RestoreNodeRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/RestoreNodeRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerAbstractBase.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerAbstractBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerAbstractBase.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerAbstractBase.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/SingleAssocRefPolicyRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/SingleAssocRefPolicyRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/SingleAssocRefPolicyRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/SingleAssocRefPolicyRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/rule/ruletrigger/SingleNodeRefPolicyRuleTrigger.java b/repository/src/main/java/org/alfresco/repo/rule/ruletrigger/SingleNodeRefPolicyRuleTrigger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/rule/ruletrigger/SingleNodeRefPolicyRuleTrigger.java
rename to repository/src/main/java/org/alfresco/repo/rule/ruletrigger/SingleNodeRefPolicyRuleTrigger.java
diff --git a/src/main/java/org/alfresco/repo/scheduler/AlfrescoJobFactory.java b/repository/src/main/java/org/alfresco/repo/scheduler/AlfrescoJobFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/scheduler/AlfrescoJobFactory.java
rename to repository/src/main/java/org/alfresco/repo/scheduler/AlfrescoJobFactory.java
diff --git a/src/main/java/org/alfresco/repo/scheduler/AlfrescoSchedulerFactory.java b/repository/src/main/java/org/alfresco/repo/scheduler/AlfrescoSchedulerFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/scheduler/AlfrescoSchedulerFactory.java
rename to repository/src/main/java/org/alfresco/repo/scheduler/AlfrescoSchedulerFactory.java
diff --git a/src/main/java/org/alfresco/repo/scheduler/SchedulerAware.java b/repository/src/main/java/org/alfresco/repo/scheduler/SchedulerAware.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/scheduler/SchedulerAware.java
rename to repository/src/main/java/org/alfresco/repo/scheduler/SchedulerAware.java
diff --git a/src/main/java/org/alfresco/repo/search/AbstractIndexFilter.java b/repository/src/main/java/org/alfresco/repo/search/AbstractIndexFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/AbstractIndexFilter.java
rename to repository/src/main/java/org/alfresco/repo/search/AbstractIndexFilter.java
diff --git a/src/main/java/org/alfresco/repo/search/AbstractResultSet.java b/repository/src/main/java/org/alfresco/repo/search/AbstractResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/AbstractResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/AbstractResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/AbstractResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/AbstractResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/AbstractResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/AbstractResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/AbstractResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/AbstractResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/AbstractResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/AbstractResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/AbstractSearcherComponent.java b/repository/src/main/java/org/alfresco/repo/search/AbstractSearcherComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/AbstractSearcherComponent.java
rename to repository/src/main/java/org/alfresco/repo/search/AbstractSearcherComponent.java
diff --git a/src/main/java/org/alfresco/repo/search/AspectIndexFilter.java b/repository/src/main/java/org/alfresco/repo/search/AspectIndexFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/AspectIndexFilter.java
rename to repository/src/main/java/org/alfresco/repo/search/AspectIndexFilter.java
diff --git a/src/main/java/org/alfresco/repo/search/CannedQueryDef.java b/repository/src/main/java/org/alfresco/repo/search/CannedQueryDef.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/CannedQueryDef.java
rename to repository/src/main/java/org/alfresco/repo/search/CannedQueryDef.java
diff --git a/src/main/java/org/alfresco/repo/search/CannedQueryDefImpl.java b/repository/src/main/java/org/alfresco/repo/search/CannedQueryDefImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/CannedQueryDefImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/CannedQueryDefImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/DocumentNavigator.java b/repository/src/main/java/org/alfresco/repo/search/DocumentNavigator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/DocumentNavigator.java
rename to repository/src/main/java/org/alfresco/repo/search/DocumentNavigator.java
diff --git a/src/main/java/org/alfresco/repo/search/EmptyResultSet.java b/repository/src/main/java/org/alfresco/repo/search/EmptyResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/EmptyResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/EmptyResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/IndexMode.java b/repository/src/main/java/org/alfresco/repo/search/IndexMode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/IndexMode.java
rename to repository/src/main/java/org/alfresco/repo/search/IndexMode.java
diff --git a/src/main/java/org/alfresco/repo/search/Indexer.java b/repository/src/main/java/org/alfresco/repo/search/Indexer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/Indexer.java
rename to repository/src/main/java/org/alfresco/repo/search/Indexer.java
diff --git a/src/main/java/org/alfresco/repo/search/IndexerAndSearcher.java b/repository/src/main/java/org/alfresco/repo/search/IndexerAndSearcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/IndexerAndSearcher.java
rename to repository/src/main/java/org/alfresco/repo/search/IndexerAndSearcher.java
diff --git a/src/main/java/org/alfresco/repo/search/IndexerAndSearcherFactoryException.java b/repository/src/main/java/org/alfresco/repo/search/IndexerAndSearcherFactoryException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/IndexerAndSearcherFactoryException.java
rename to repository/src/main/java/org/alfresco/repo/search/IndexerAndSearcherFactoryException.java
diff --git a/src/main/java/org/alfresco/repo/search/IndexerComponent.java b/repository/src/main/java/org/alfresco/repo/search/IndexerComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/IndexerComponent.java
rename to repository/src/main/java/org/alfresco/repo/search/IndexerComponent.java
diff --git a/src/main/java/org/alfresco/repo/search/IndexerException.java b/repository/src/main/java/org/alfresco/repo/search/IndexerException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/IndexerException.java
rename to repository/src/main/java/org/alfresco/repo/search/IndexerException.java
diff --git a/src/main/java/org/alfresco/repo/search/NodeServiceXPath.java b/repository/src/main/java/org/alfresco/repo/search/NodeServiceXPath.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/NodeServiceXPath.java
rename to repository/src/main/java/org/alfresco/repo/search/NodeServiceXPath.java
diff --git a/src/main/java/org/alfresco/repo/search/QueryCollection.java b/repository/src/main/java/org/alfresco/repo/search/QueryCollection.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/QueryCollection.java
rename to repository/src/main/java/org/alfresco/repo/search/QueryCollection.java
diff --git a/src/main/java/org/alfresco/repo/search/QueryCollectionImpl.java b/repository/src/main/java/org/alfresco/repo/search/QueryCollectionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/QueryCollectionImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/QueryCollectionImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/QueryParameterDefImpl.java b/repository/src/main/java/org/alfresco/repo/search/QueryParameterDefImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/QueryParameterDefImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/QueryParameterDefImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/QueryParameterRefImpl.java b/repository/src/main/java/org/alfresco/repo/search/QueryParameterRefImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/QueryParameterRefImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/QueryParameterRefImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/QueryRegisterComponent.java b/repository/src/main/java/org/alfresco/repo/search/QueryRegisterComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/QueryRegisterComponent.java
rename to repository/src/main/java/org/alfresco/repo/search/QueryRegisterComponent.java
diff --git a/src/main/java/org/alfresco/repo/search/QueryRegisterComponentImpl.java b/repository/src/main/java/org/alfresco/repo/search/QueryRegisterComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/QueryRegisterComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/QueryRegisterComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/ResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/ResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/ResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/ResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/SearcherComponent.java b/repository/src/main/java/org/alfresco/repo/search/SearcherComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/SearcherComponent.java
rename to repository/src/main/java/org/alfresco/repo/search/SearcherComponent.java
diff --git a/src/main/java/org/alfresco/repo/search/SearcherException.java b/repository/src/main/java/org/alfresco/repo/search/SearcherException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/SearcherException.java
rename to repository/src/main/java/org/alfresco/repo/search/SearcherException.java
diff --git a/src/main/java/org/alfresco/repo/search/SimpleResultSetMetaData.java b/repository/src/main/java/org/alfresco/repo/search/SimpleResultSetMetaData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/SimpleResultSetMetaData.java
rename to repository/src/main/java/org/alfresco/repo/search/SimpleResultSetMetaData.java
diff --git a/src/main/java/org/alfresco/repo/search/TransactionSynchronisationAwareIndexer.java b/repository/src/main/java/org/alfresco/repo/search/TransactionSynchronisationAwareIndexer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/TransactionSynchronisationAwareIndexer.java
rename to repository/src/main/java/org/alfresco/repo/search/TransactionSynchronisationAwareIndexer.java
diff --git a/src/main/java/org/alfresco/repo/search/TypeIndexFilter.java b/repository/src/main/java/org/alfresco/repo/search/TypeIndexFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/TypeIndexFilter.java
rename to repository/src/main/java/org/alfresco/repo/search/TypeIndexFilter.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/DummySuggesterServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/DummySuggesterServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/DummySuggesterServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/DummySuggesterServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/NoActionIndexer.java b/repository/src/main/java/org/alfresco/repo/search/impl/NoActionIndexer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/NoActionIndexer.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/NoActionIndexer.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/NodeSearcher.java b/repository/src/main/java/org/alfresco/repo/search/impl/NodeSearcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/NodeSearcher.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/NodeSearcher.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/SearchServiceSubSystemDelegator.java b/repository/src/main/java/org/alfresco/repo/search/impl/SearchServiceSubSystemDelegator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/SearchServiceSubSystemDelegator.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/SearchServiceSubSystemDelegator.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractAlfrescoFtsQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractAlfrescoFtsQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractAlfrescoFtsQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractAlfrescoFtsQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractIndexerAndSearcher.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractIndexerAndSearcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractIndexerAndSearcher.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractIndexerAndSearcher.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractJSONAPIResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractJSONAPIResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractJSONAPIResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractJSONAPIResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/ClosingIndexSearcher.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/ClosingIndexSearcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/ClosingIndexSearcher.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/ClosingIndexSearcher.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/DebugXPathHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/DebugXPathHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/DebugXPathHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/DebugXPathHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResultFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResultFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResultFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/JSONAPIResultFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/JSONResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/JSONResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/JSONResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/JSONResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneConfig.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneConfig.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneConfig.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexException.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexException.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexException.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexer.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexer.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexer.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerAndSearcher.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerAndSearcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerAndSearcher.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerAndSearcher.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISAlfrescoSqlQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISAlfrescoSqlQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISAlfrescoSqlQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISAlfrescoSqlQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISStrictSqlQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISStrictSqlQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISStrictSqlQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneOpenCMISStrictSqlQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneQueryLanguageSPI.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneQueryLanguageSPI.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneQueryLanguageSPI.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneQueryLanguageSPI.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/LuceneSearcher.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSetRowIteratorImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSetRowIteratorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSetRowIteratorImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSetRowIteratorImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/QueryParameterisationException.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/QueryParameterisationException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/QueryParameterisationException.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/QueryParameterisationException.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclReportResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclReportResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclReportResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclReportResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclTxReportResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclTxReportResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclTxReportResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionAclTxReportResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionCheckResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionCheckResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionCheckResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionCheckResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionFixResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionFixResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionFixResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionFixResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionNodeReportResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionNodeReportResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionNodeReportResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionNodeReportResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionReportResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionReportResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionReportResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionReportResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionStatusResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionStatusResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionStatusResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionStatusResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionTxReportResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionTxReportResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionTxReportResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrActionTxReportResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrCommandBackupResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrCommandBackupResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrCommandBackupResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrCommandBackupResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJsonProcessor.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJsonProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrJsonProcessor.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrJsonProcessor.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrStatsResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrStatsResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrStatsResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrStatsResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/SolrSuggesterResult.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrSuggesterResult.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/SolrSuggesterResult.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/SolrSuggesterResult.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEntry.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEntry.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEntry.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEvent.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEvent.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexEvent.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexMonitor.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexMonitor.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexMonitor.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexType.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexType.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/IndexType.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/lucene/index/TransactionStatus.java b/repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/TransactionStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/lucene/index/TransactionStatus.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/lucene/index/TransactionStatus.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexCategoryServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexCategoryServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexCategoryServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexCategoryServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexer.java b/repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexer.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexer.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexerAndSearcherFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexerAndSearcherFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexerAndSearcherFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexIndexerAndSearcherFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexSearchService.java b/repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexSearchService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexSearchService.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/noindex/NoIndexSearchService.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBColumn.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBColumn.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBColumn.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBColumn.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionArgument.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionArgument.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionArgument.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionArgument.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBJoin.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBJoin.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBJoin.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBJoin.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBListArgument.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBListArgument.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBListArgument.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBListArgument.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBLiteralArgument.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBLiteralArgument.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBLiteralArgument.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBLiteralArgument.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBParameterArgument.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBParameterArgument.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBParameterArgument.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBParameterArgument.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBPropertyArgument.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBPropertyArgument.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBPropertyArgument.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBPropertyArgument.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommand.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommand.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommand.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommandType.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommandType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommandType.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderJoinCommandType.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommand.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommand.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommand.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommand.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommandType.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommandType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommandType.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderPredicatePartCommandType.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryModelFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryModelFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryModelFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryModelFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelectorArgument.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelectorArgument.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelectorArgument.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelectorArgument.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java b/repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrAdminHTTPClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/DbAftsQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/DbAftsQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/DbAftsQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/DbAftsQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/DbCmisQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/DbCmisQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/DbCmisQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/DbCmisQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/DisabledFeatureException.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/DisabledFeatureException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/DisabledFeatureException.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/DisabledFeatureException.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/DynamicSolrStoreMappingWrapperFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/DynamicSolrStoreMappingWrapperFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/DynamicSolrStoreMappingWrapperFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/DynamicSolrStoreMappingWrapperFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/ExplicitSolrStoreMappingWrapper.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/ExplicitSolrStoreMappingWrapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/ExplicitSolrStoreMappingWrapper.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/ExplicitSolrStoreMappingWrapper.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/NoIndexQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/NoIndexQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/NoIndexQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/NoIndexQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminClientInterface.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminClientInterface.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminClientInterface.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminClientInterface.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrAdminHTTPClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupJob.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupJob.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrBackupJob.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrClientUtil.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrClientUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrClientUtil.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrClientUtil.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrIndexerAndSearcherFactory.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrIndexerAndSearcherFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrIndexerAndSearcherFactory.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrIndexerAndSearcherFactory.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrOpenCMISQueryServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrOpenCMISQueryServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrOpenCMISQueryServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrOpenCMISQueryServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrSearchService.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSearchService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrSearchService.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSearchService.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrStatsService.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrStatsService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrStatsService.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrStatsService.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapper.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapper.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapper.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrSuggesterServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSuggesterServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrSuggesterServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrSuggesterServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrXPathQueryLanguage.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrXPathQueryLanguage.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SolrXPathQueryLanguage.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrXPathQueryLanguage.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManager.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManager.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManager.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/Exceptions.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/Exceptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/Exceptions.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/Exceptions.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtils.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtils.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtils.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQueryProvider.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQueryProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQueryProvider.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/FacetQueryProvider.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparator.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparator.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparator.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfig.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfig.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfig.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigException.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigException.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigException.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetModel.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetModel.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetModel.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetProperties.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetProperties.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetProperties.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetProperties.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericBucket.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericBucket.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericBucket.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericBucket.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericFacetResponse.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericFacetResponse.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericFacetResponse.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/GenericFacetResponse.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/ListMetric.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/ListMetric.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/ListMetric.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/ListMetric.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/PercentileMetric.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/PercentileMetric.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/PercentileMetric.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/PercentileMetric.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/SimpleMetric.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/SimpleMetric.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/SimpleMetric.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/SimpleMetric.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/AbstractFacetLabelDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/AbstractFacetLabelDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/AbstractFacetLabelDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/AbstractFacetLabelDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/ContentSizeBucketsDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/ContentSizeBucketsDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/ContentSizeBucketsDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/ContentSizeBucketsDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/DateBucketsDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/DateBucketsDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/DateBucketsDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/DateBucketsDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabel.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabel.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabel.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandlerRegistry.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandlerRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandlerRegistry.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/FacetLabelDisplayHandlerRegistry.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/MimetypeDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/MimetypeDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/MimetypeDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/MimetypeDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/SiteTitleDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/SiteTitleDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/SiteTitleDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/SiteTitleDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/UserNameDisplayHandler.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/UserNameDisplayHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/UserNameDisplayHandler.java
rename to repository/src/main/java/org/alfresco/repo/search/impl/solr/facet/handler/UserNameDisplayHandler.java
diff --git a/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSet.java b/repository/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/results/ChildAssocRefResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/results/DetachedResultSet.java b/repository/src/main/java/org/alfresco/repo/search/results/DetachedResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/DetachedResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/results/DetachedResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/results/DetachedResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/results/DetachedResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/DetachedResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/results/DetachedResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java b/repository/src/main/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
rename to repository/src/main/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
diff --git a/src/main/java/org/alfresco/repo/search/results/SortedResultSet.java b/repository/src/main/java/org/alfresco/repo/search/results/SortedResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/SortedResultSet.java
rename to repository/src/main/java/org/alfresco/repo/search/results/SortedResultSet.java
diff --git a/src/main/java/org/alfresco/repo/search/results/SortedResultSetRow.java b/repository/src/main/java/org/alfresco/repo/search/results/SortedResultSetRow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/SortedResultSetRow.java
rename to repository/src/main/java/org/alfresco/repo/search/results/SortedResultSetRow.java
diff --git a/src/main/java/org/alfresco/repo/search/results/SortedResultSetRowIterator.java b/repository/src/main/java/org/alfresco/repo/search/results/SortedResultSetRowIterator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/results/SortedResultSetRowIterator.java
rename to repository/src/main/java/org/alfresco/repo/search/results/SortedResultSetRowIterator.java
diff --git a/src/main/java/org/alfresco/repo/search/transaction/LuceneTransactionException.java b/repository/src/main/java/org/alfresco/repo/search/transaction/LuceneTransactionException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/transaction/LuceneTransactionException.java
rename to repository/src/main/java/org/alfresco/repo/search/transaction/LuceneTransactionException.java
diff --git a/src/main/java/org/alfresco/repo/search/transaction/SimpleTransaction.java b/repository/src/main/java/org/alfresco/repo/search/transaction/SimpleTransaction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/transaction/SimpleTransaction.java
rename to repository/src/main/java/org/alfresco/repo/search/transaction/SimpleTransaction.java
diff --git a/src/main/java/org/alfresco/repo/search/transaction/SimpleTransactionManager.java b/repository/src/main/java/org/alfresco/repo/search/transaction/SimpleTransactionManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/transaction/SimpleTransactionManager.java
rename to repository/src/main/java/org/alfresco/repo/search/transaction/SimpleTransactionManager.java
diff --git a/src/main/java/org/alfresco/repo/search/transaction/XidException.java b/repository/src/main/java/org/alfresco/repo/search/transaction/XidException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/transaction/XidException.java
rename to repository/src/main/java/org/alfresco/repo/search/transaction/XidException.java
diff --git a/src/main/java/org/alfresco/repo/search/transaction/XidTransaction.java b/repository/src/main/java/org/alfresco/repo/search/transaction/XidTransaction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/search/transaction/XidTransaction.java
rename to repository/src/main/java/org/alfresco/repo/search/transaction/XidTransaction.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationService.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationService.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AbstractAuthenticationService.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationComponent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingAuthenticationService.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingFtpAuthenticator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingFtpAuthenticator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AbstractChainingFtpAuthenticator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AbstractChainingFtpAuthenticator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactory.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactory.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactory.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticatedAuthenticationPassthroughProvider.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticatedAuthenticationPassthroughProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticatedAuthenticationPassthroughProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticatedAuthenticationPassthroughProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponentImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContext.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationContext.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContext.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationDisallowedException.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationDisallowedException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationDisallowedException.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationDisallowedException.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationMaxUsersException.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationMaxUsersException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationMaxUsersException.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationMaxUsersException.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticatorDeletedEvent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticatorDeletedEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticatorDeletedEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticatorDeletedEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/Authorization.java b/repository/src/main/java/org/alfresco/repo/security/authentication/Authorization.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/Authorization.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/Authorization.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/CompositePasswordEncoder.java b/repository/src/main/java/org/alfresco/repo/security/authentication/CompositePasswordEncoder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/CompositePasswordEncoder.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/CompositePasswordEncoder.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java b/repository/src/main/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/DefaultMutableAuthenticationDao.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/HashPasswordTransactionListener.java b/repository/src/main/java/org/alfresco/repo/security/authentication/HashPasswordTransactionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/HashPasswordTransactionListener.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/HashPasswordTransactionListener.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoder.java b/repository/src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoder.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoder.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoderImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoderImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoderImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/MD4PasswordEncoderImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/MessageDigestPasswordEncoder.java b/repository/src/main/java/org/alfresco/repo/security/authentication/MessageDigestPasswordEncoder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/MessageDigestPasswordEncoder.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/MessageDigestPasswordEncoder.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java b/repository/src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/MutableAuthenticationServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/NameBasedUserNameGenerator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/NameBasedUserNameGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/NameBasedUserNameGenerator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/NameBasedUserNameGenerator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/NoOpPasswordEncoderImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/NoOpPasswordEncoderImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/NoOpPasswordEncoderImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/NoOpPasswordEncoderImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/PasswordGenerator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/PasswordGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/PasswordGenerator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/PasswordGenerator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ProtectedUser.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ProtectedUser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ProtectedUser.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ProtectedUser.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/RandomUserNameGenerator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/RandomUserNameGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/RandomUserNameGenerator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/RandomUserNameGenerator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticatedUser.java b/repository/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticatedUser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticatedUser.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticatedUser.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/repository/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationProvider.java b/repository/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ShaPasswordEncoderImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ShaPasswordEncoderImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ShaPasswordEncoderImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ShaPasswordEncoderImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/TenantAwareUserNameGenerator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/TicketCleanupJob.java b/repository/src/main/java/org/alfresco/repo/security/authentication/TicketCleanupJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/TicketCleanupJob.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/TicketCleanupJob.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java b/repository/src/main/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/UserNameGenerator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/UserNameGenerator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/UserNameGenerator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/UserNameGenerator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java b/repository/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapper.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java b/repository/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/external/RemoteUserMapper.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/AlfrescoBearerTokenRequestAuthenticator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/AlfrescoBearerTokenRequestAuthenticator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/AlfrescoBearerTokenRequestAuthenticator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/AlfrescoBearerTokenRequestAuthenticator.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/AuthenticatorAuthzClientFactoryBean.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/AuthenticatorAuthzClientFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/AuthenticatorAuthzClientFactoryBean.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/AuthenticatorAuthzClientFactoryBean.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceConfig.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceHttpFacade.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceHttpFacade.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceHttpFacade.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceHttpFacade.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapper.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapper.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapper.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/jaas/JAASAuthenticationComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ldap/AlfrescoLdapSSLSocketFactory.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ldap/AlfrescoLdapSSLSocketFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ldap/AlfrescoLdapSSLSocketFactory.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ldap/AlfrescoLdapSSLSocketFactory.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPAuthenticationComponentImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPAuthenticationComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPAuthenticationComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPAuthenticationComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactory.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactory.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactory.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ldap/Monitor.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ldap/Monitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ldap/Monitor.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ldap/Monitor.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/ldap/MonitorBeanInfo.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ldap/MonitorBeanInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/ldap/MonitorBeanInfo.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/ldap/MonitorBeanInfo.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationComponent.java b/repository/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationService.java b/repository/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationService.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingAuthenticationService.java
diff --git a/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java
rename to repository/src/main/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java b/repository/src/main/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAO.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAO.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAO.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeLink.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeLink.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeLink.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeLink.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeParametersEntity.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeParametersEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeParametersEntity.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeParametersEntity.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCache.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCache.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCache.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCache.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityDAO.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityDAO.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAO.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityException.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityException.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityException.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityInfo.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityInfo.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityInfo.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityInfoEntity.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityInfoEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityInfoEntity.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityInfoEntity.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityServicePolicies.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/AuthorityTypeBehaviour.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityTypeBehaviour.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/AuthorityTypeBehaviour.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/AuthorityTypeBehaviour.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java b/repository/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/UnknownAuthorityException.java b/repository/src/main/java/org/alfresco/repo/security/authority/UnknownAuthorityException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/UnknownAuthorityException.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/UnknownAuthorityException.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/script/Authority.java b/repository/src/main/java/org/alfresco/repo/security/authority/script/Authority.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/script/Authority.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/script/Authority.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService.java b/repository/src/main/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/script/ScriptGroup.java b/repository/src/main/java/org/alfresco/repo/security/authority/script/ScriptGroup.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/script/ScriptGroup.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/script/ScriptGroup.java
diff --git a/src/main/java/org/alfresco/repo/security/authority/script/ScriptUser.java b/repository/src/main/java/org/alfresco/repo/security/authority/script/ScriptUser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/authority/script/ScriptUser.java
rename to repository/src/main/java/org/alfresco/repo/security/authority/script/ScriptUser.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/ACEType.java b/repository/src/main/java/org/alfresco/repo/security/permissions/ACEType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/ACEType.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/ACEType.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/ACLCopyMode.java b/repository/src/main/java/org/alfresco/repo/security/permissions/ACLCopyMode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/ACLCopyMode.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/ACLCopyMode.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/ACLType.java b/repository/src/main/java/org/alfresco/repo/security/permissions/ACLType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/ACLType.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/ACLType.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/AccessControlEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/AccessControlEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/AccessControlEntryContext.java b/repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlEntryContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/AccessControlEntryContext.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlEntryContext.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/AccessControlList.java b/repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlList.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/AccessControlList.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlList.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/AccessControlListProperties.java b/repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlListProperties.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/AccessControlListProperties.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/AccessControlListProperties.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/AccessDeniedException.java b/repository/src/main/java/org/alfresco/repo/security/permissions/AccessDeniedException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/AccessDeniedException.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/AccessDeniedException.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/AuthorityReference.java b/repository/src/main/java/org/alfresco/repo/security/permissions/AuthorityReference.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/AuthorityReference.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/AuthorityReference.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/DynamicAuthority.java b/repository/src/main/java/org/alfresco/repo/security/permissions/DynamicAuthority.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/DynamicAuthority.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/DynamicAuthority.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/NodePermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/NodePermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/NodePermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/NodePermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckValue.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckValue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionCheckValue.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckValue.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedValue.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedValue.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedValue.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedValue.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionReference.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionReference.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionReference.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionReference.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionServicePolicies.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/PermissionServiceSPI.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionServiceSPI.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/PermissionServiceSPI.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/PermissionServiceSPI.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntryContext.java b/repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntryContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntryContext.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlEntryContext.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlList.java b/repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlList.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlList.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlList.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlListProperties.java b/repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlListProperties.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlListProperties.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/SimpleAccessControlListProperties.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java b/repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/dynamic/OwnerDynamicAuthority.java b/repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/OwnerDynamicAuthority.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/dynamic/OwnerDynamicAuthority.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/OwnerDynamicAuthority.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractNodePermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractNodePermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AbstractNodePermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractNodePermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AccessPermissionImpl.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AccessPermissionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AccessPermissionImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AccessPermissionImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AclChange.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AclChange.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AclChange.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AclChange.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AllowPermissionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AllowPermissionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AllowPermissionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AllowPermissionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/AlwaysProceedMethodInterceptor.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/AlwaysProceedMethodInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/AlwaysProceedMethodInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/AlwaysProceedMethodInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/ExceptionTranslatorMethodInterceptor.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/ExceptionTranslatorMethodInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/ExceptionTranslatorMethodInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/ExceptionTranslatorMethodInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionReferenceImpl.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionReferenceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/PermissionReferenceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionReferenceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/PublicServiceAccessServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/PublicServiceAccessServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/PublicServiceAccessServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/PublicServiceAccessServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/RequiredPermission.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/RequiredPermission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/RequiredPermission.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/RequiredPermission.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/SimpleNodePermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/SimpleNodePermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/SimpleNodePermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/SimpleNodePermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterException.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterException.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterException.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AbstractCannedQueryPermissions.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AbstractCannedQueryPermissions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AbstractCannedQueryPermissions.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AbstractCannedQueryPermissions.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AffirmativeBasedAccessDecisionManger.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AffirmativeBasedAccessDecisionManger.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AffirmativeBasedAccessDecisionManger.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/AffirmativeBasedAccessDecisionManger.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MarkingAfterInvocationProvider.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MarkingAfterInvocationProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MarkingAfterInvocationProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MarkingAfterInvocationProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityBean.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityBean.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityBean.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityInterceptor.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WeakFilteringResultSet.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WeakFilteringResultSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WeakFilteringResultSet.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WeakFilteringResultSet.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WrappedList.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WrappedList.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WrappedList.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/WrappedList.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/AbstractPermission.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/AbstractPermission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/AbstractPermission.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/AbstractPermission.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/DynamicPermission.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/DynamicPermission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/DynamicPermission.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/DynamicPermission.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/GlobalPermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/GlobalPermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/GlobalPermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/GlobalPermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/ModelPermissionEntry.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/ModelPermissionEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/ModelPermissionEntry.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/ModelPermissionEntry.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/NodePermission.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/NodePermission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/NodePermission.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/NodePermission.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/Permission.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/Permission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/Permission.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/Permission.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionGroup.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionGroup.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionGroup.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionGroup.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelBootstrap.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelException.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelException.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelException.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionSet.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionSet.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/PermissionSet.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/model/XMLModelInitialisable.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/XMLModelInitialisable.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/model/XMLModelInitialisable.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/model/XMLModelInitialisable.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceExtension.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceTrait.java b/repository/src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/impl/traitextender/PermissionServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java b/repository/src/main/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java b/repository/src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java
rename to repository/src/main/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java
diff --git a/src/main/java/org/alfresco/repo/security/person/BootstrapHomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/BootstrapHomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/BootstrapHomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/BootstrapHomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java b/repository/src/main/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java
rename to repository/src/main/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java
diff --git a/src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider2.java b/repository/src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider2.java
rename to repository/src/main/java/org/alfresco/repo/security/person/ExistingPathBasedHomeFolderProvider2.java
diff --git a/src/main/java/org/alfresco/repo/security/person/FilterSortPersonEntity.java b/repository/src/main/java/org/alfresco/repo/security/person/FilterSortPersonEntity.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/FilterSortPersonEntity.java
rename to repository/src/main/java/org/alfresco/repo/security/person/FilterSortPersonEntity.java
diff --git a/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQuery.java b/repository/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/security/person/GetPeopleCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/security/person/HomeFolderManager.java b/repository/src/main/java/org/alfresco/repo/security/person/HomeFolderManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/HomeFolderManager.java
rename to repository/src/main/java/org/alfresco/repo/security/person/HomeFolderManager.java
diff --git a/src/main/java/org/alfresco/repo/security/person/HomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/HomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/HomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/HomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/person/HomeFolderProvider2.java b/repository/src/main/java/org/alfresco/repo/security/person/HomeFolderProvider2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/HomeFolderProvider2.java
rename to repository/src/main/java/org/alfresco/repo/security/person/HomeFolderProvider2.java
diff --git a/src/main/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java b/repository/src/main/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
rename to repository/src/main/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
diff --git a/src/main/java/org/alfresco/repo/security/person/HomeSpaceNodeRef.java b/repository/src/main/java/org/alfresco/repo/security/person/HomeSpaceNodeRef.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/HomeSpaceNodeRef.java
rename to repository/src/main/java/org/alfresco/repo/security/person/HomeSpaceNodeRef.java
diff --git a/src/main/java/org/alfresco/repo/security/person/PermissionsManager.java b/repository/src/main/java/org/alfresco/repo/security/person/PermissionsManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/PermissionsManager.java
rename to repository/src/main/java/org/alfresco/repo/security/person/PermissionsManager.java
diff --git a/src/main/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java b/repository/src/main/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/person/PersonException.java b/repository/src/main/java/org/alfresco/repo/security/person/PersonException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/PersonException.java
rename to repository/src/main/java/org/alfresco/repo/security/person/PersonException.java
diff --git a/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/person/PersonServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/person/PersonServiceLoader.java b/repository/src/main/java/org/alfresco/repo/security/person/PersonServiceLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/PersonServiceLoader.java
rename to repository/src/main/java/org/alfresco/repo/security/person/PersonServiceLoader.java
diff --git a/src/main/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java b/repository/src/main/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java
rename to repository/src/main/java/org/alfresco/repo/security/person/PortableHomeFolderManager.java
diff --git a/src/main/java/org/alfresco/repo/security/person/RegexHomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/RegexHomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/RegexHomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/RegexHomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java b/repository/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java
rename to repository/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java
diff --git a/src/main/java/org/alfresco/repo/security/person/UIDBasedHomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/UIDBasedHomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/UIDBasedHomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/UIDBasedHomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/person/UserNameMatcher.java b/repository/src/main/java/org/alfresco/repo/security/person/UserNameMatcher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/UserNameMatcher.java
rename to repository/src/main/java/org/alfresco/repo/security/person/UserNameMatcher.java
diff --git a/src/main/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java b/repository/src/main/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/person/UserNameMatcherImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/person/UsernameHomeFolderProvider.java b/repository/src/main/java/org/alfresco/repo/security/person/UsernameHomeFolderProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/person/UsernameHomeFolderProvider.java
rename to repository/src/main/java/org/alfresco/repo/security/person/UsernameHomeFolderProvider.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java b/repository/src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerStatus.java b/repository/src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerStatus.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerStatus.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/NodeDescription.java b/repository/src/main/java/org/alfresco/repo/security/sync/NodeDescription.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/NodeDescription.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/NodeDescription.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SyncStatus.java b/repository/src/main/java/org/alfresco/repo/security/sync/SyncStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SyncStatus.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SyncStatus.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnostic.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnostic.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnostic.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnostic.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnosticImpl.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnosticImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnosticImpl.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDiagnosticImpl.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryDeleteZoneEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryDeleteZoneEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryDeleteZoneEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryDeleteZoneEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEndEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEndEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEndEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEndEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryStartEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryStartEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryStartEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeDirectoryStartEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeEndEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeEndEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeEndEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeEndEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/SynchronizeStartEvent.java b/repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeStartEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/SynchronizeStartEvent.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/SynchronizeStartEvent.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/TestableChainingUserRegistrySynchronizer.java b/repository/src/main/java/org/alfresco/repo/security/sync/TestableChainingUserRegistrySynchronizer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/TestableChainingUserRegistrySynchronizer.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/TestableChainingUserRegistrySynchronizer.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/UserRegistry.java b/repository/src/main/java/org/alfresco/repo/security/sync/UserRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/UserRegistry.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/UserRegistry.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizer.java b/repository/src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizer.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizer.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizerJob.java b/repository/src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizerJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizerJob.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/UserRegistrySynchronizerJob.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ldap/AbstractDirectoryServiceUserAccountStatusInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPNameResolver.java b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPNameResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ldap/LDAPNameResolver.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPNameResolver.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserAccountStatusInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
diff --git a/src/main/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java b/repository/src/main/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/security/sync/ldap_ad/LDAPADUserAccountStatusInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java b/repository/src/main/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
rename to repository/src/main/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
diff --git a/src/main/java/org/alfresco/repo/service/StoreRedirector.java b/repository/src/main/java/org/alfresco/repo/service/StoreRedirector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/service/StoreRedirector.java
rename to repository/src/main/java/org/alfresco/repo/service/StoreRedirector.java
diff --git a/src/main/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java b/repository/src/main/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
rename to repository/src/main/java/org/alfresco/repo/service/StoreRedirectorProxyFactory.java
diff --git a/src/main/java/org/alfresco/repo/shutdown/ShutdownBackstop.java b/repository/src/main/java/org/alfresco/repo/shutdown/ShutdownBackstop.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/shutdown/ShutdownBackstop.java
rename to repository/src/main/java/org/alfresco/repo/shutdown/ShutdownBackstop.java
diff --git a/src/main/java/org/alfresco/repo/site/AbstractSiteMembership.java b/repository/src/main/java/org/alfresco/repo/site/AbstractSiteMembership.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/AbstractSiteMembership.java
rename to repository/src/main/java/org/alfresco/repo/site/AbstractSiteMembership.java
diff --git a/src/main/java/org/alfresco/repo/site/DocLibNodeLocator.java b/repository/src/main/java/org/alfresco/repo/site/DocLibNodeLocator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/DocLibNodeLocator.java
rename to repository/src/main/java/org/alfresco/repo/site/DocLibNodeLocator.java
diff --git a/src/main/java/org/alfresco/repo/site/RoleComparatorImpl.java b/repository/src/main/java/org/alfresco/repo/site/RoleComparatorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/RoleComparatorImpl.java
rename to repository/src/main/java/org/alfresco/repo/site/RoleComparatorImpl.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteAspect.java b/repository/src/main/java/org/alfresco/repo/site/SiteAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteAspect.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteAspect.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteContainersCannedQuery.java b/repository/src/main/java/org/alfresco/repo/site/SiteContainersCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteContainersCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteContainersCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryFactory.java b/repository/src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryFactory.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryFactory.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteContainersCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteDoesNotExistException.java b/repository/src/main/java/org/alfresco/repo/site/SiteDoesNotExistException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteDoesNotExistException.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteDoesNotExistException.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteGroupCannedQuery.java b/repository/src/main/java/org/alfresco/repo/site/SiteGroupCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteGroupCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteGroupCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteGroupMembership.java b/repository/src/main/java/org/alfresco/repo/site/SiteGroupMembership.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteGroupMembership.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteGroupMembership.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteInfoImpl.java b/repository/src/main/java/org/alfresco/repo/site/SiteInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteMemberInfoImpl.java b/repository/src/main/java/org/alfresco/repo/site/SiteMemberInfoImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteMemberInfoImpl.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteMemberInfoImpl.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteMembersCannedQuery.java b/repository/src/main/java/org/alfresco/repo/site/SiteMembersCannedQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteMembersCannedQuery.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteMembersCannedQuery.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteMembersCannedQueryParams.java b/repository/src/main/java/org/alfresco/repo/site/SiteMembersCannedQueryParams.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteMembersCannedQueryParams.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteMembersCannedQueryParams.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteMembership.java b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteMembership.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteMembership.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteMembershipComparator.java b/repository/src/main/java/org/alfresco/repo/site/SiteMembershipComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteMembershipComparator.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteMembershipComparator.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteModel.java b/repository/src/main/java/org/alfresco/repo/site/SiteModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteModel.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteModel.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteServiceBootstrap.java b/repository/src/main/java/org/alfresco/repo/site/SiteServiceBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteServiceBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteServiceBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteServiceException.java b/repository/src/main/java/org/alfresco/repo/site/SiteServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteServiceException.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteServiceException.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java b/repository/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/site/SiteServiceInternal.java b/repository/src/main/java/org/alfresco/repo/site/SiteServiceInternal.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SiteServiceInternal.java
rename to repository/src/main/java/org/alfresco/repo/site/SiteServiceInternal.java
diff --git a/src/main/java/org/alfresco/repo/site/SitesPermissionCleaner.java b/repository/src/main/java/org/alfresco/repo/site/SitesPermissionCleaner.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/SitesPermissionCleaner.java
rename to repository/src/main/java/org/alfresco/repo/site/SitesPermissionCleaner.java
diff --git a/src/main/java/org/alfresco/repo/site/package-info.java b/repository/src/main/java/org/alfresco/repo/site/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/package-info.java
rename to repository/src/main/java/org/alfresco/repo/site/package-info.java
diff --git a/src/main/java/org/alfresco/repo/site/script/ScriptSiteService.java b/repository/src/main/java/org/alfresco/repo/site/script/ScriptSiteService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/script/ScriptSiteService.java
rename to repository/src/main/java/org/alfresco/repo/site/script/ScriptSiteService.java
diff --git a/src/main/java/org/alfresco/repo/site/script/Site.java b/repository/src/main/java/org/alfresco/repo/site/script/Site.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/site/script/Site.java
rename to repository/src/main/java/org/alfresco/repo/site/script/Site.java
diff --git a/src/main/java/org/alfresco/repo/solr/Acl.java b/repository/src/main/java/org/alfresco/repo/solr/Acl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/Acl.java
rename to repository/src/main/java/org/alfresco/repo/solr/Acl.java
diff --git a/src/main/java/org/alfresco/repo/solr/AclChangeSet.java b/repository/src/main/java/org/alfresco/repo/solr/AclChangeSet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/AclChangeSet.java
rename to repository/src/main/java/org/alfresco/repo/solr/AclChangeSet.java
diff --git a/src/main/java/org/alfresco/repo/solr/AclChangeSetParameters.java b/repository/src/main/java/org/alfresco/repo/solr/AclChangeSetParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/AclChangeSetParameters.java
rename to repository/src/main/java/org/alfresco/repo/solr/AclChangeSetParameters.java
diff --git a/src/main/java/org/alfresco/repo/solr/AclReaders.java b/repository/src/main/java/org/alfresco/repo/solr/AclReaders.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/AclReaders.java
rename to repository/src/main/java/org/alfresco/repo/solr/AclReaders.java
diff --git a/src/main/java/org/alfresco/repo/solr/AlfrescoModel.java b/repository/src/main/java/org/alfresco/repo/solr/AlfrescoModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/AlfrescoModel.java
rename to repository/src/main/java/org/alfresco/repo/solr/AlfrescoModel.java
diff --git a/src/main/java/org/alfresco/repo/solr/AlfrescoModelDiff.java b/repository/src/main/java/org/alfresco/repo/solr/AlfrescoModelDiff.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/AlfrescoModelDiff.java
rename to repository/src/main/java/org/alfresco/repo/solr/AlfrescoModelDiff.java
diff --git a/src/main/java/org/alfresco/repo/solr/MetaDataResultsFilter.java b/repository/src/main/java/org/alfresco/repo/solr/MetaDataResultsFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/MetaDataResultsFilter.java
rename to repository/src/main/java/org/alfresco/repo/solr/MetaDataResultsFilter.java
diff --git a/src/main/java/org/alfresco/repo/solr/NodeMetaData.java b/repository/src/main/java/org/alfresco/repo/solr/NodeMetaData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/NodeMetaData.java
rename to repository/src/main/java/org/alfresco/repo/solr/NodeMetaData.java
diff --git a/src/main/java/org/alfresco/repo/solr/NodeMetaDataParameters.java b/repository/src/main/java/org/alfresco/repo/solr/NodeMetaDataParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/NodeMetaDataParameters.java
rename to repository/src/main/java/org/alfresco/repo/solr/NodeMetaDataParameters.java
diff --git a/src/main/java/org/alfresco/repo/solr/NodeParameters.java b/repository/src/main/java/org/alfresco/repo/solr/NodeParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/NodeParameters.java
rename to repository/src/main/java/org/alfresco/repo/solr/NodeParameters.java
diff --git a/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java b/repository/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java
rename to repository/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java
diff --git a/src/main/java/org/alfresco/repo/solr/SOLRTrackingComponent.java b/repository/src/main/java/org/alfresco/repo/solr/SOLRTrackingComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SOLRTrackingComponent.java
rename to repository/src/main/java/org/alfresco/repo/solr/SOLRTrackingComponent.java
diff --git a/src/main/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/repository/src/main/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/solr/SOLRWatcherJob.java b/repository/src/main/java/org/alfresco/repo/solr/SOLRWatcherJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SOLRWatcherJob.java
rename to repository/src/main/java/org/alfresco/repo/solr/SOLRWatcherJob.java
diff --git a/src/main/java/org/alfresco/repo/solr/SolrActiveEvent.java b/repository/src/main/java/org/alfresco/repo/solr/SolrActiveEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SolrActiveEvent.java
rename to repository/src/main/java/org/alfresco/repo/solr/SolrActiveEvent.java
diff --git a/src/main/java/org/alfresco/repo/solr/SolrEvent.java b/repository/src/main/java/org/alfresco/repo/solr/SolrEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SolrEvent.java
rename to repository/src/main/java/org/alfresco/repo/solr/SolrEvent.java
diff --git a/src/main/java/org/alfresco/repo/solr/SolrInactiveEvent.java b/repository/src/main/java/org/alfresco/repo/solr/SolrInactiveEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/SolrInactiveEvent.java
rename to repository/src/main/java/org/alfresco/repo/solr/SolrInactiveEvent.java
diff --git a/src/main/java/org/alfresco/repo/solr/Transaction.java b/repository/src/main/java/org/alfresco/repo/solr/Transaction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/solr/Transaction.java
rename to repository/src/main/java/org/alfresco/repo/solr/Transaction.java
diff --git a/src/main/java/org/alfresco/repo/subscriptions/SubscriptionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/subscriptions/SubscriptionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/subscriptions/SubscriptionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/subscriptions/SubscriptionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/tagging/InvalidTagException.java b/repository/src/main/java/org/alfresco/repo/tagging/InvalidTagException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/InvalidTagException.java
rename to repository/src/main/java/org/alfresco/repo/tagging/InvalidTagException.java
diff --git a/src/main/java/org/alfresco/repo/tagging/NonExistentTagException.java b/repository/src/main/java/org/alfresco/repo/tagging/NonExistentTagException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/NonExistentTagException.java
rename to repository/src/main/java/org/alfresco/repo/tagging/NonExistentTagException.java
diff --git a/src/main/java/org/alfresco/repo/tagging/RefreshTagScopeActionExecuter.java b/repository/src/main/java/org/alfresco/repo/tagging/RefreshTagScopeActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/RefreshTagScopeActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/tagging/RefreshTagScopeActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/tagging/TagDetailsImpl.java b/repository/src/main/java/org/alfresco/repo/tagging/TagDetailsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/TagDetailsImpl.java
rename to repository/src/main/java/org/alfresco/repo/tagging/TagDetailsImpl.java
diff --git a/src/main/java/org/alfresco/repo/tagging/TagExistsException.java b/repository/src/main/java/org/alfresco/repo/tagging/TagExistsException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/TagExistsException.java
rename to repository/src/main/java/org/alfresco/repo/tagging/TagExistsException.java
diff --git a/src/main/java/org/alfresco/repo/tagging/TagScopeImpl.java b/repository/src/main/java/org/alfresco/repo/tagging/TagScopeImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/TagScopeImpl.java
rename to repository/src/main/java/org/alfresco/repo/tagging/TagScopeImpl.java
diff --git a/src/main/java/org/alfresco/repo/tagging/TagScopePropertyMethodInterceptor.java b/repository/src/main/java/org/alfresco/repo/tagging/TagScopePropertyMethodInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/TagScopePropertyMethodInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/tagging/TagScopePropertyMethodInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/tagging/TaggingException.java b/repository/src/main/java/org/alfresco/repo/tagging/TaggingException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/TaggingException.java
rename to repository/src/main/java/org/alfresco/repo/tagging/TaggingException.java
diff --git a/src/main/java/org/alfresco/repo/tagging/TaggingServiceImpl.java b/repository/src/main/java/org/alfresco/repo/tagging/TaggingServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/TaggingServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/tagging/TaggingServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuter.java b/repository/src/main/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/tagging/UpdateTagScopesQuartzJob.java b/repository/src/main/java/org/alfresco/repo/tagging/UpdateTagScopesQuartzJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/UpdateTagScopesQuartzJob.java
rename to repository/src/main/java/org/alfresco/repo/tagging/UpdateTagScopesQuartzJob.java
diff --git a/src/main/java/org/alfresco/repo/tagging/script/PagedTagsWrapper.java b/repository/src/main/java/org/alfresco/repo/tagging/script/PagedTagsWrapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/script/PagedTagsWrapper.java
rename to repository/src/main/java/org/alfresco/repo/tagging/script/PagedTagsWrapper.java
diff --git a/src/main/java/org/alfresco/repo/tagging/script/ScriptTaggingService.java b/repository/src/main/java/org/alfresco/repo/tagging/script/ScriptTaggingService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/script/ScriptTaggingService.java
rename to repository/src/main/java/org/alfresco/repo/tagging/script/ScriptTaggingService.java
diff --git a/src/main/java/org/alfresco/repo/tagging/script/TagScope.java b/repository/src/main/java/org/alfresco/repo/tagging/script/TagScope.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tagging/script/TagScope.java
rename to repository/src/main/java/org/alfresco/repo/tagging/script/TagScope.java
diff --git a/src/main/java/org/alfresco/repo/template/BaseContentNode.java b/repository/src/main/java/org/alfresco/repo/template/BaseContentNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/BaseContentNode.java
rename to repository/src/main/java/org/alfresco/repo/template/BaseContentNode.java
diff --git a/src/main/java/org/alfresco/repo/template/BasePathResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/BasePathResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/BasePathResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/BasePathResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/BasePermissionsNode.java b/repository/src/main/java/org/alfresco/repo/template/BasePermissionsNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/BasePermissionsNode.java
rename to repository/src/main/java/org/alfresco/repo/template/BasePermissionsNode.java
diff --git a/src/main/java/org/alfresco/repo/template/BaseSearchResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/BaseSearchResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/BaseSearchResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/BaseSearchResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/BaseTemplateMap.java b/repository/src/main/java/org/alfresco/repo/template/BaseTemplateMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/BaseTemplateMap.java
rename to repository/src/main/java/org/alfresco/repo/template/BaseTemplateMap.java
diff --git a/src/main/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java b/repository/src/main/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java
rename to repository/src/main/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java
diff --git a/src/main/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java b/repository/src/main/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java
rename to repository/src/main/java/org/alfresco/repo/template/ClassPathRepoTemplateLoader.java
diff --git a/src/main/java/org/alfresco/repo/template/ClassPathTemplateLoader.java b/repository/src/main/java/org/alfresco/repo/template/ClassPathTemplateLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/ClassPathTemplateLoader.java
rename to repository/src/main/java/org/alfresco/repo/template/ClassPathTemplateLoader.java
diff --git a/src/main/java/org/alfresco/repo/template/Classification.java b/repository/src/main/java/org/alfresco/repo/template/Classification.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/Classification.java
rename to repository/src/main/java/org/alfresco/repo/template/Classification.java
diff --git a/src/main/java/org/alfresco/repo/template/CropContentMethod.java b/repository/src/main/java/org/alfresco/repo/template/CropContentMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/CropContentMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/CropContentMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/DateCompareMethod.java b/repository/src/main/java/org/alfresco/repo/template/DateCompareMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/DateCompareMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/DateCompareMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/DateIncrementMethod.java b/repository/src/main/java/org/alfresco/repo/template/DateIncrementMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/DateIncrementMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/DateIncrementMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/FreeMarkerProcessor.java b/repository/src/main/java/org/alfresco/repo/template/FreeMarkerProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/FreeMarkerProcessor.java
rename to repository/src/main/java/org/alfresco/repo/template/FreeMarkerProcessor.java
diff --git a/src/main/java/org/alfresco/repo/template/HasAspectMethod.java b/repository/src/main/java/org/alfresco/repo/template/HasAspectMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/HasAspectMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/HasAspectMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/HasPermissionMethod.java b/repository/src/main/java/org/alfresco/repo/template/HasPermissionMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/HasPermissionMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/HasPermissionMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/I18NMessageMethod.java b/repository/src/main/java/org/alfresco/repo/template/I18NMessageMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/I18NMessageMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/I18NMessageMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java b/repository/src/main/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/ISO8601DateFormatMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/LuceneSearchResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/LuceneSearchResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/LuceneSearchResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/LuceneSearchResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/NamePathResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/NamePathResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/NamePathResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/NamePathResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/NodeSearchResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/NodeSearchResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/NodeSearchResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/NodeSearchResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/People.java b/repository/src/main/java/org/alfresco/repo/template/People.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/People.java
rename to repository/src/main/java/org/alfresco/repo/template/People.java
diff --git a/src/main/java/org/alfresco/repo/template/PropertyConverter.java b/repository/src/main/java/org/alfresco/repo/template/PropertyConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/PropertyConverter.java
rename to repository/src/main/java/org/alfresco/repo/template/PropertyConverter.java
diff --git a/src/main/java/org/alfresco/repo/template/QNameAwareObjectWrapper.java b/repository/src/main/java/org/alfresco/repo/template/QNameAwareObjectWrapper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/QNameAwareObjectWrapper.java
rename to repository/src/main/java/org/alfresco/repo/template/QNameAwareObjectWrapper.java
diff --git a/src/main/java/org/alfresco/repo/template/SavedSearchResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/SavedSearchResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/SavedSearchResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/SavedSearchResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/Session.java b/repository/src/main/java/org/alfresco/repo/template/Session.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/Session.java
rename to repository/src/main/java/org/alfresco/repo/template/Session.java
diff --git a/src/main/java/org/alfresco/repo/template/ShortQNameMethod.java b/repository/src/main/java/org/alfresco/repo/template/ShortQNameMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/ShortQNameMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/ShortQNameMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/Site.java b/repository/src/main/java/org/alfresco/repo/template/Site.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/Site.java
rename to repository/src/main/java/org/alfresco/repo/template/Site.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateAssociation.java b/repository/src/main/java/org/alfresco/repo/template/TemplateAssociation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateAssociation.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateAssociation.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateContent.java b/repository/src/main/java/org/alfresco/repo/template/TemplateContent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateContent.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateContent.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateNode.java b/repository/src/main/java/org/alfresco/repo/template/TemplateNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateNode.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateNode.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateNodeRef.java b/repository/src/main/java/org/alfresco/repo/template/TemplateNodeRef.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateNodeRef.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateNodeRef.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplatePermissions.java b/repository/src/main/java/org/alfresco/repo/template/TemplatePermissions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplatePermissions.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplatePermissions.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateProcessorMethod.java b/repository/src/main/java/org/alfresco/repo/template/TemplateProcessorMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateProcessorMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateProcessorMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateProperties.java b/repository/src/main/java/org/alfresco/repo/template/TemplateProperties.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateProperties.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateProperties.java
diff --git a/src/main/java/org/alfresco/repo/template/TemplateSource.java b/repository/src/main/java/org/alfresco/repo/template/TemplateSource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/TemplateSource.java
rename to repository/src/main/java/org/alfresco/repo/template/TemplateSource.java
diff --git a/src/main/java/org/alfresco/repo/template/URLDecodeMethod.java b/repository/src/main/java/org/alfresco/repo/template/URLDecodeMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/URLDecodeMethod.java
rename to repository/src/main/java/org/alfresco/repo/template/URLDecodeMethod.java
diff --git a/src/main/java/org/alfresco/repo/template/VersionHistoryNode.java b/repository/src/main/java/org/alfresco/repo/template/VersionHistoryNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/VersionHistoryNode.java
rename to repository/src/main/java/org/alfresco/repo/template/VersionHistoryNode.java
diff --git a/src/main/java/org/alfresco/repo/template/Workflow.java b/repository/src/main/java/org/alfresco/repo/template/Workflow.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/Workflow.java
rename to repository/src/main/java/org/alfresco/repo/template/Workflow.java
diff --git a/src/main/java/org/alfresco/repo/template/XPathResultsMap.java b/repository/src/main/java/org/alfresco/repo/template/XPathResultsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/XPathResultsMap.java
rename to repository/src/main/java/org/alfresco/repo/template/XPathResultsMap.java
diff --git a/src/main/java/org/alfresco/repo/template/XSLTProcessor.java b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/XSLTProcessor.java
rename to repository/src/main/java/org/alfresco/repo/template/XSLTProcessor.java
diff --git a/src/main/java/org/alfresco/repo/template/XSLTProcessorMethodInvoker.java b/repository/src/main/java/org/alfresco/repo/template/XSLTProcessorMethodInvoker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/XSLTProcessorMethodInvoker.java
rename to repository/src/main/java/org/alfresco/repo/template/XSLTProcessorMethodInvoker.java
diff --git a/src/main/java/org/alfresco/repo/template/XSLTemplateModel.java b/repository/src/main/java/org/alfresco/repo/template/XSLTemplateModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/template/XSLTemplateModel.java
rename to repository/src/main/java/org/alfresco/repo/template/XSLTemplateModel.java
diff --git a/src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java b/repository/src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
rename to repository/src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
diff --git a/src/main/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java b/repository/src/main/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptor.java b/repository/src/main/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/tenant/MultiTServiceImpl.java b/repository/src/main/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java b/repository/src/main/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/tenant/Network.java b/repository/src/main/java/org/alfresco/repo/tenant/Network.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/Network.java
rename to repository/src/main/java/org/alfresco/repo/tenant/Network.java
diff --git a/src/main/java/org/alfresco/repo/tenant/NetworksService.java b/repository/src/main/java/org/alfresco/repo/tenant/NetworksService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/NetworksService.java
rename to repository/src/main/java/org/alfresco/repo/tenant/NetworksService.java
diff --git a/src/main/java/org/alfresco/repo/tenant/NetworksServiceImpl.java b/repository/src/main/java/org/alfresco/repo/tenant/NetworksServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/NetworksServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/tenant/NetworksServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/tenant/Quota.java b/repository/src/main/java/org/alfresco/repo/tenant/Quota.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/Quota.java
rename to repository/src/main/java/org/alfresco/repo/tenant/Quota.java
diff --git a/src/main/java/org/alfresco/repo/tenant/RunAsTenantInterceptor.java b/repository/src/main/java/org/alfresco/repo/tenant/RunAsTenantInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/RunAsTenantInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/tenant/RunAsTenantInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/tenant/SingleTAdminServiceImpl.java b/repository/src/main/java/org/alfresco/repo/tenant/SingleTAdminServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/SingleTAdminServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/tenant/SingleTAdminServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantAdminService.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantAdminService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantAdminService.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantAdminService.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantBasicDataSource.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantBasicDataSource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantBasicDataSource.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantBasicDataSource.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantDisabledException.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantDisabledException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantDisabledException.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantDisabledException.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantDomainMismatchException.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantDomainMismatchException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantDomainMismatchException.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantDomainMismatchException.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantInterpreter.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingContentStore.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantRoutingDataSource.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingDataSource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantRoutingDataSource.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingDataSource.java
diff --git a/src/main/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java b/repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java
rename to repository/src/main/java/org/alfresco/repo/tenant/TenantRoutingFileContentStore.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/AddFailedThumbnailActionExecuter.java b/repository/src/main/java/org/alfresco/repo/thumbnail/AddFailedThumbnailActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/AddFailedThumbnailActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/AddFailedThumbnailActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java b/repository/src/main/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/FailedThumbnailSourceAspect.java b/repository/src/main/java/org/alfresco/repo/thumbnail/FailedThumbnailSourceAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/FailedThumbnailSourceAspect.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/FailedThumbnailSourceAspect.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/FailureHandlingOptions.java b/repository/src/main/java/org/alfresco/repo/thumbnail/FailureHandlingOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/FailureHandlingOptions.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/FailureHandlingOptions.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/SimpleThumbnailer.java b/repository/src/main/java/org/alfresco/repo/thumbnail/SimpleThumbnailer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/SimpleThumbnailer.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/SimpleThumbnailer.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinition.java b/repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinition.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinition.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinitionSpringRegisterer.java b/repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinitionSpringRegisterer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinitionSpringRegisterer.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailDefinitionSpringRegisterer.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/ThumbnailHelper.java b/repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/ThumbnailHelper.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailHelper.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRegistry.java b/repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/ThumbnailRegistry.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRegistry.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRenditionConvertor.java b/repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRenditionConvertor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/ThumbnailRenditionConvertor.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailRenditionConvertor.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java b/repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java b/repository/src/main/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluator.java b/repository/src/main/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluator.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluator.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnail.java b/repository/src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnail.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnail.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnail.java
diff --git a/src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnailService.java b/repository/src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnailService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnailService.java
rename to repository/src/main/java/org/alfresco/repo/thumbnail/script/ScriptThumbnailService.java
diff --git a/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionException.java b/repository/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionException.java
rename to repository/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionException.java
diff --git a/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java b/repository/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
rename to repository/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
diff --git a/src/main/java/org/alfresco/repo/transaction/CheckTransactionAdvice.java b/repository/src/main/java/org/alfresco/repo/transaction/CheckTransactionAdvice.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/CheckTransactionAdvice.java
rename to repository/src/main/java/org/alfresco/repo/transaction/CheckTransactionAdvice.java
diff --git a/src/main/java/org/alfresco/repo/transaction/DAOAdapter.java b/repository/src/main/java/org/alfresco/repo/transaction/DAOAdapter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/DAOAdapter.java
rename to repository/src/main/java/org/alfresco/repo/transaction/DAOAdapter.java
diff --git a/src/main/java/org/alfresco/repo/transaction/DoNotRetryException.java b/repository/src/main/java/org/alfresco/repo/transaction/DoNotRetryException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/DoNotRetryException.java
rename to repository/src/main/java/org/alfresco/repo/transaction/DoNotRetryException.java
diff --git a/src/main/java/org/alfresco/repo/transaction/DummyTransactionService.java b/repository/src/main/java/org/alfresco/repo/transaction/DummyTransactionService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/DummyTransactionService.java
rename to repository/src/main/java/org/alfresco/repo/transaction/DummyTransactionService.java
diff --git a/src/main/java/org/alfresco/repo/transaction/LuceneIndexerAndSearcherAdapter.java b/repository/src/main/java/org/alfresco/repo/transaction/LuceneIndexerAndSearcherAdapter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/LuceneIndexerAndSearcherAdapter.java
rename to repository/src/main/java/org/alfresco/repo/transaction/LuceneIndexerAndSearcherAdapter.java
diff --git a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java b/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java
rename to repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionAdvice.java
diff --git a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java b/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java
rename to repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java
diff --git a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java b/repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/transaction/SingleEntryTransactionResourceInterceptor.java b/repository/src/main/java/org/alfresco/repo/transaction/SingleEntryTransactionResourceInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/SingleEntryTransactionResourceInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/transaction/SingleEntryTransactionResourceInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TooBusyException.java b/repository/src/main/java/org/alfresco/repo/transaction/TooBusyException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TooBusyException.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TooBusyException.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionAwareSingleton.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionAwareSingleton.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionAwareSingleton.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionAwareSingleton.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionListener.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionListener.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionListener.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionUtil.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionUtil.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionUtil.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionalDao.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionalDao.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionalDao.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionalDao.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionalDaoInterceptor.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionalDaoInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionalDaoInterceptor.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionalDaoInterceptor.java
diff --git a/src/main/java/org/alfresco/repo/transaction/TransactionalResourceHelper.java b/repository/src/main/java/org/alfresco/repo/transaction/TransactionalResourceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transaction/TransactionalResourceHelper.java
rename to repository/src/main/java/org/alfresco/repo/transaction/TransactionalResourceHelper.java
diff --git a/src/main/java/org/alfresco/repo/transfer/AbstractManifestProcessorBase.java b/repository/src/main/java/org/alfresco/repo/transfer/AbstractManifestProcessorBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/AbstractManifestProcessorBase.java
rename to repository/src/main/java/org/alfresco/repo/transfer/AbstractManifestProcessorBase.java
diff --git a/src/main/java/org/alfresco/repo/transfer/AbstractNodeFilter.java b/repository/src/main/java/org/alfresco/repo/transfer/AbstractNodeFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/AbstractNodeFilter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/AbstractNodeFilter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/AbstractNodeFinder.java b/repository/src/main/java/org/alfresco/repo/transfer/AbstractNodeFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/AbstractNodeFinder.java
rename to repository/src/main/java/org/alfresco/repo/transfer/AbstractNodeFinder.java
diff --git a/src/main/java/org/alfresco/repo/transfer/AbstractTransferProgressMonitor.java b/repository/src/main/java/org/alfresco/repo/transfer/AbstractTransferProgressMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/AbstractTransferProgressMonitor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/AbstractTransferProgressMonitor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/AlienProcessor.java b/repository/src/main/java/org/alfresco/repo/transfer/AlienProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/AlienProcessor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/AlienProcessor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/AlienProcessorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/AlienProcessorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/AlienProcessorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/AlienProcessorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/BasicCorrespondingNodeResolverImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/BasicCorrespondingNodeResolverImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/BasicCorrespondingNodeResolverImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/BasicCorrespondingNodeResolverImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/CachingCorrespondingNodeResolverImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/CachingCorrespondingNodeResolverImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/CachingCorrespondingNodeResolverImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/CachingCorrespondingNodeResolverImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ChangeCapturingProgressMonitor.java b/repository/src/main/java/org/alfresco/repo/transfer/ChangeCapturingProgressMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ChangeCapturingProgressMonitor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ChangeCapturingProgressMonitor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java b/repository/src/main/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ChildAssociatedNodeFinder.java
diff --git a/src/main/java/org/alfresco/repo/transfer/CompositeNodeFilter.java b/repository/src/main/java/org/alfresco/repo/transfer/CompositeNodeFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/CompositeNodeFilter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/CompositeNodeFilter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/CompositeNodeFinder.java b/repository/src/main/java/org/alfresco/repo/transfer/CompositeNodeFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/CompositeNodeFinder.java
rename to repository/src/main/java/org/alfresco/repo/transfer/CompositeNodeFinder.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ContentChunkProcessor.java b/repository/src/main/java/org/alfresco/repo/transfer/ContentChunkProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ContentChunkProcessor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ContentChunkProcessor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ContentChunker.java b/repository/src/main/java/org/alfresco/repo/transfer/ContentChunker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ContentChunker.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ContentChunker.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ContentChunkerImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/ContentChunkerImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ContentChunkerImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ContentChunkerImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ContentClassFilter.java b/repository/src/main/java/org/alfresco/repo/transfer/ContentClassFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ContentClassFilter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ContentClassFilter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ContentDataPart.java b/repository/src/main/java/org/alfresco/repo/transfer/ContentDataPart.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ContentDataPart.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ContentDataPart.java
diff --git a/src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolver.java b/repository/src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolver.java
rename to repository/src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolver.java
diff --git a/src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolverFactory.java b/repository/src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolverFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolverFactory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/CorrespondingNodeResolverFactory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/CreateTransferTargetActionExecuter.java b/repository/src/main/java/org/alfresco/repo/transfer/CreateTransferTargetActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/CreateTransferTargetActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/CreateTransferTargetActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/DefaultCorrespondingNodeResolverFactory.java b/repository/src/main/java/org/alfresco/repo/transfer/DefaultCorrespondingNodeResolverFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/DefaultCorrespondingNodeResolverFactory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/DefaultCorrespondingNodeResolverFactory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/DefaultManifestProcessorFactoryImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/DefaultManifestProcessorFactoryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/DefaultManifestProcessorFactoryImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/DefaultManifestProcessorFactoryImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/DeltaList.java b/repository/src/main/java/org/alfresco/repo/transfer/DeltaList.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/DeltaList.java
rename to repository/src/main/java/org/alfresco/repo/transfer/DeltaList.java
diff --git a/src/main/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/HttpMethodFactory.java b/repository/src/main/java/org/alfresco/repo/transfer/HttpMethodFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/HttpMethodFactory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/HttpMethodFactory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/LoggingTransferProgressMonitorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/LoggingTransferProgressMonitorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/LoggingTransferProgressMonitorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/LoggingTransferProgressMonitorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/ManifestProcessorFactory.java b/repository/src/main/java/org/alfresco/repo/transfer/ManifestProcessorFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/ManifestProcessorFactory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/ManifestProcessorFactory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/PathHelper.java b/repository/src/main/java/org/alfresco/repo/transfer/PathHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/PathHelper.java
rename to repository/src/main/java/org/alfresco/repo/transfer/PathHelper.java
diff --git a/src/main/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java b/repository/src/main/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java
rename to repository/src/main/java/org/alfresco/repo/transfer/PeerAssociatedNodeFinder.java
diff --git a/src/main/java/org/alfresco/repo/transfer/PrimaryParentNodeFinder.java b/repository/src/main/java/org/alfresco/repo/transfer/PrimaryParentNodeFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/PrimaryParentNodeFinder.java
rename to repository/src/main/java/org/alfresco/repo/transfer/PrimaryParentNodeFinder.java
diff --git a/src/main/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/RepoRequisiteManifestProcessorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/RepoRequisiteManifestProcessorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/RepoRequisiteManifestProcessorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/RepoRequisiteManifestProcessorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/RepoSecondaryManifestProcessorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/RepoSecondaryManifestProcessorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/RepoSecondaryManifestProcessorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/RepoSecondaryManifestProcessorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/RepoTertiaryManifestProcessorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/RepoTertiaryManifestProcessorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/RepoTertiaryManifestProcessorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/RepoTertiaryManifestProcessorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/RepoTransferProgressMonitorImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/RepoTransferProgressMonitorImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/RepoTransferProgressMonitorImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/RepoTransferProgressMonitorImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/RepoTransferReceiverImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/StandardHttpMethodFactoryImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/StandardHttpMethodFactoryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/StandardHttpMethodFactoryImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/StandardHttpMethodFactoryImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerFactoryImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerFactoryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerFactoryImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerFactoryImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/StandardNodeCrawlerImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/Transfer.java b/repository/src/main/java/org/alfresco/repo/transfer/Transfer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/Transfer.java
rename to repository/src/main/java/org/alfresco/repo/transfer/Transfer.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferAsyncAction.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferAsyncAction.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferAsyncAction.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferAsyncAction.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferCommitActionExecuter.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferCommitActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferCommitActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferCommitActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferCommitTransactionListener.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferCommitTransactionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferCommitTransactionListener.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferCommitTransactionListener.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferCommons.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferCommons.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferCommons.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferCommons.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferContext.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferContext.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferContext.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferDestinationReportWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferDestinationReportWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferDestinationReportWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferDestinationReportWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferEndEventImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferEndEventImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferEndEventImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferEndEventImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferEventImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferEventImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferEventImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferEventImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferEventProcessor.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferEventProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferEventProcessor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferEventProcessor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferFatalException.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferFatalException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferFatalException.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferFatalException.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferModel.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferModel.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferModel.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferOneNodeActionExecuter.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferOneNodeActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferOneNodeActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferOneNodeActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferProcessingException.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferProcessingException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferProcessingException.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferProcessingException.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferProgressMonitor.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferProgressMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferProgressMonitor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferProgressMonitor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferSummaryAware.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferSummaryAware.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferSummaryAware.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferSummaryAware.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferSummaryReport.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferSummaryReport.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferSummaryReport.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferSummaryReport.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferSummaryReportImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferSummaryReportImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferSummaryReportImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferSummaryReportImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferTargetImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferTargetImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferTargetImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferTargetImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferTestUtil.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferTestUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferTestUtil.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferTestUtil.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferTransmitter.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferTransmitter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferTransmitter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferTransmitter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferTreeActionExecuter.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferTreeActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferTreeActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferTreeActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferTreeWithCancelActionExecuter.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferTreeWithCancelActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferTreeWithCancelActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferTreeWithCancelActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferVersionChecker.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferVersionChecker.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferVersionChecker.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferVersionChecker.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerNoOp.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerNoOp.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerNoOp.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferVersionCheckerNoOp.java
diff --git a/src/main/java/org/alfresco/repo/transfer/TransferVersionImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/TransferVersionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/TransferVersionImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/TransferVersionImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/XMLWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/XMLWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/XMLWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/XMLWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/ManifestAccessControl.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestAccessControl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/ManifestAccessControl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestAccessControl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/ManifestCategory.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestCategory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/ManifestCategory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestCategory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/ManifestModel.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/ManifestModel.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestModel.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/ManifestPermission.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestPermission.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/ManifestPermission.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/ManifestPermission.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestDeletedNode.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestDeletedNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestDeletedNode.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestDeletedNode.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestHeader.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestHeader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestHeader.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestHeader.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNode.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNode.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNode.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactory.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeHelper.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeHelper.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeHelper.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNormalNode.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNormalNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNormalNode.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestNormalNode.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestProcessor.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestProcessor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestProcessor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/TransferManifestWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/manifest/package-info.java b/repository/src/main/java/org/alfresco/repo/transfer/manifest/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/manifest/package-info.java
rename to repository/src/main/java/org/alfresco/repo/transfer/manifest/package-info.java
diff --git a/src/main/java/org/alfresco/repo/transfer/package-info.java b/repository/src/main/java/org/alfresco/repo/transfer/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/package-info.java
rename to repository/src/main/java/org/alfresco/repo/transfer/package-info.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/TransferReportModel.java b/repository/src/main/java/org/alfresco/repo/transfer/report/TransferReportModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/TransferReportModel.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/TransferReportModel.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/TransferReportModel2.java b/repository/src/main/java/org/alfresco/repo/transfer/report/TransferReportModel2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/TransferReportModel2.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/TransferReportModel2.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/TransferReporter.java b/repository/src/main/java/org/alfresco/repo/transfer/report/TransferReporter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/TransferReporter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/TransferReporter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java b/repository/src/main/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/TransferReporterImpl.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatter.java b/repository/src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatterFactory.java b/repository/src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatterFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatterFactory.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/XMLTransferEventFormatterFactory.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/XMLTransferReportWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/report/package-info.java b/repository/src/main/java/org/alfresco/repo/transfer/report/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/report/package-info.java
rename to repository/src/main/java/org/alfresco/repo/transfer/report/package-info.java
diff --git a/src/main/java/org/alfresco/repo/transfer/reportd/TransferDestinationReportModel.java b/repository/src/main/java/org/alfresco/repo/transfer/reportd/TransferDestinationReportModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/reportd/TransferDestinationReportModel.java
rename to repository/src/main/java/org/alfresco/repo/transfer/reportd/TransferDestinationReportModel.java
diff --git a/src/main/java/org/alfresco/repo/transfer/reportd/XMLTransferDestinationReportWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/reportd/XMLTransferDestinationReportWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/reportd/XMLTransferDestinationReportWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/reportd/XMLTransferDestinationReportWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/reportd/package-info.java b/repository/src/main/java/org/alfresco/repo/transfer/reportd/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/reportd/package-info.java
rename to repository/src/main/java/org/alfresco/repo/transfer/reportd/package-info.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/DeltaListRequsiteProcessor.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/DeltaListRequsiteProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/DeltaListRequsiteProcessor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/DeltaListRequsiteProcessor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/RequsiteModel.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/RequsiteModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/RequsiteModel.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/RequsiteModel.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteProcessor.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteProcessor.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteProcessor.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/TransferRequsiteWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteReader.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteReader.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteReader.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteReader.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteWriter.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteWriter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteWriter.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/XMLTransferRequsiteWriter.java
diff --git a/src/main/java/org/alfresco/repo/transfer/requisite/package-info.java b/repository/src/main/java/org/alfresco/repo/transfer/requisite/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/requisite/package-info.java
rename to repository/src/main/java/org/alfresco/repo/transfer/requisite/package-info.java
diff --git a/src/main/java/org/alfresco/repo/transfer/script/ScriptTransferService.java b/repository/src/main/java/org/alfresco/repo/transfer/script/ScriptTransferService.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/script/ScriptTransferService.java
rename to repository/src/main/java/org/alfresco/repo/transfer/script/ScriptTransferService.java
diff --git a/src/main/java/org/alfresco/repo/transfer/script/ScriptTransferTarget.java b/repository/src/main/java/org/alfresco/repo/transfer/script/ScriptTransferTarget.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/script/ScriptTransferTarget.java
rename to repository/src/main/java/org/alfresco/repo/transfer/script/ScriptTransferTarget.java
diff --git a/src/main/java/org/alfresco/repo/transfer/script/package-info.java b/repository/src/main/java/org/alfresco/repo/transfer/script/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/transfer/script/package-info.java
rename to repository/src/main/java/org/alfresco/repo/transfer/script/package-info.java
diff --git a/src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java b/repository/src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java
rename to repository/src/main/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerImpl.java
diff --git a/src/main/java/org/alfresco/repo/usage/ContentUsageImpl.java b/repository/src/main/java/org/alfresco/repo/usage/ContentUsageImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/ContentUsageImpl.java
rename to repository/src/main/java/org/alfresco/repo/usage/ContentUsageImpl.java
diff --git a/src/main/java/org/alfresco/repo/usage/RepoUsageComponent.java b/repository/src/main/java/org/alfresco/repo/usage/RepoUsageComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/RepoUsageComponent.java
rename to repository/src/main/java/org/alfresco/repo/usage/RepoUsageComponent.java
diff --git a/src/main/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java b/repository/src/main/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java
rename to repository/src/main/java/org/alfresco/repo/usage/RepoUsageComponentImpl.java
diff --git a/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java b/repository/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java
rename to repository/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java
diff --git a/src/main/java/org/alfresco/repo/usage/UsageQuotaProtector.java b/repository/src/main/java/org/alfresco/repo/usage/UsageQuotaProtector.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/UsageQuotaProtector.java
rename to repository/src/main/java/org/alfresco/repo/usage/UsageQuotaProtector.java
diff --git a/src/main/java/org/alfresco/repo/usage/UsageServiceImpl.java b/repository/src/main/java/org/alfresco/repo/usage/UsageServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/UsageServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/usage/UsageServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/usage/UserUsageCollapseJob.java b/repository/src/main/java/org/alfresco/repo/usage/UserUsageCollapseJob.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/UserUsageCollapseJob.java
rename to repository/src/main/java/org/alfresco/repo/usage/UserUsageCollapseJob.java
diff --git a/src/main/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java b/repository/src/main/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
rename to repository/src/main/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
diff --git a/src/main/java/org/alfresco/repo/util/PostTxnCallbackScheduler.java b/repository/src/main/java/org/alfresco/repo/util/PostTxnCallbackScheduler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/util/PostTxnCallbackScheduler.java
rename to repository/src/main/java/org/alfresco/repo/util/PostTxnCallbackScheduler.java
diff --git a/src/main/java/org/alfresco/repo/version/Node2ServiceImpl.java b/repository/src/main/java/org/alfresco/repo/version/Node2ServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/Node2ServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/Node2ServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/NodeServiceImpl.java b/repository/src/main/java/org/alfresco/repo/version/NodeServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/NodeServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/NodeServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/Version2Model.java b/repository/src/main/java/org/alfresco/repo/version/Version2Model.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/Version2Model.java
rename to repository/src/main/java/org/alfresco/repo/version/Version2Model.java
diff --git a/src/main/java/org/alfresco/repo/version/Version2ServiceImpl.java b/repository/src/main/java/org/alfresco/repo/version/Version2ServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/Version2ServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/Version2ServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionBaseModel.java b/repository/src/main/java/org/alfresco/repo/version/VersionBaseModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionBaseModel.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionBaseModel.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionModel.java b/repository/src/main/java/org/alfresco/repo/version/VersionModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionModel.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionModel.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionRevertCallback.java b/repository/src/main/java/org/alfresco/repo/version/VersionRevertCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionRevertCallback.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionRevertCallback.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionRevertDetails.java b/repository/src/main/java/org/alfresco/repo/version/VersionRevertDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionRevertDetails.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionRevertDetails.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionRevertDetailsImpl.java b/repository/src/main/java/org/alfresco/repo/version/VersionRevertDetailsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionRevertDetailsImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionRevertDetailsImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/version/VersionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionServicePolicies.java b/repository/src/main/java/org/alfresco/repo/version/VersionServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionServicePolicies.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionServicePolicies.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java b/repository/src/main/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java
diff --git a/src/main/java/org/alfresco/repo/version/VersionableAspect.java b/repository/src/main/java/org/alfresco/repo/version/VersionableAspect.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/VersionableAspect.java
rename to repository/src/main/java/org/alfresco/repo/version/VersionableAspect.java
diff --git a/src/main/java/org/alfresco/repo/version/common/AbstractVersionServiceImpl.java b/repository/src/main/java/org/alfresco/repo/version/common/AbstractVersionServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/common/AbstractVersionServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/common/AbstractVersionServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/common/VersionHistoryImpl.java b/repository/src/main/java/org/alfresco/repo/version/common/VersionHistoryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/common/VersionHistoryImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/common/VersionHistoryImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/common/VersionImpl.java b/repository/src/main/java/org/alfresco/repo/version/common/VersionImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/common/VersionImpl.java
rename to repository/src/main/java/org/alfresco/repo/version/common/VersionImpl.java
diff --git a/src/main/java/org/alfresco/repo/version/common/VersionLabelComparator.java b/repository/src/main/java/org/alfresco/repo/version/common/VersionLabelComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/common/VersionLabelComparator.java
rename to repository/src/main/java/org/alfresco/repo/version/common/VersionLabelComparator.java
diff --git a/src/main/java/org/alfresco/repo/version/common/VersionUtil.java b/repository/src/main/java/org/alfresco/repo/version/common/VersionUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/common/VersionUtil.java
rename to repository/src/main/java/org/alfresco/repo/version/common/VersionUtil.java
diff --git a/src/main/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java b/repository/src/main/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java
rename to repository/src/main/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java
diff --git a/src/main/java/org/alfresco/repo/version/traitextender/VersionServiceExtension.java b/repository/src/main/java/org/alfresco/repo/version/traitextender/VersionServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/traitextender/VersionServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/version/traitextender/VersionServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/version/traitextender/VersionServiceTrait.java b/repository/src/main/java/org/alfresco/repo/version/traitextender/VersionServiceTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/version/traitextender/VersionServiceTrait.java
rename to repository/src/main/java/org/alfresco/repo/version/traitextender/VersionServiceTrait.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ActualEnvironment.java b/repository/src/main/java/org/alfresco/repo/virtual/ActualEnvironment.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ActualEnvironment.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ActualEnvironment.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ActualEnvironmentException.java b/repository/src/main/java/org/alfresco/repo/virtual/ActualEnvironmentException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ActualEnvironmentException.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ActualEnvironmentException.java
diff --git a/src/main/java/org/alfresco/repo/virtual/AlfrescoAPIFacet.java b/repository/src/main/java/org/alfresco/repo/virtual/AlfrescoAPIFacet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/AlfrescoAPIFacet.java
rename to repository/src/main/java/org/alfresco/repo/virtual/AlfrescoAPIFacet.java
diff --git a/src/main/java/org/alfresco/repo/virtual/AlfrescoEnviroment.java b/repository/src/main/java/org/alfresco/repo/virtual/AlfrescoEnviroment.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/AlfrescoEnviroment.java
rename to repository/src/main/java/org/alfresco/repo/virtual/AlfrescoEnviroment.java
diff --git a/src/main/java/org/alfresco/repo/virtual/AlfrescoScriptVirtualContext.java b/repository/src/main/java/org/alfresco/repo/virtual/AlfrescoScriptVirtualContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/AlfrescoScriptVirtualContext.java
rename to repository/src/main/java/org/alfresco/repo/virtual/AlfrescoScriptVirtualContext.java
diff --git a/src/main/java/org/alfresco/repo/virtual/CoreAPIFacet.java b/repository/src/main/java/org/alfresco/repo/virtual/CoreAPIFacet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/CoreAPIFacet.java
rename to repository/src/main/java/org/alfresco/repo/virtual/CoreAPIFacet.java
diff --git a/src/main/java/org/alfresco/repo/virtual/PublicAPIFacet.java b/repository/src/main/java/org/alfresco/repo/virtual/PublicAPIFacet.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/PublicAPIFacet.java
rename to repository/src/main/java/org/alfresco/repo/virtual/PublicAPIFacet.java
diff --git a/src/main/java/org/alfresco/repo/virtual/VirtualContentModel.java b/repository/src/main/java/org/alfresco/repo/virtual/VirtualContentModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/VirtualContentModel.java
rename to repository/src/main/java/org/alfresco/repo/virtual/VirtualContentModel.java
diff --git a/src/main/java/org/alfresco/repo/virtual/VirtualContext.java b/repository/src/main/java/org/alfresco/repo/virtual/VirtualContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/VirtualContext.java
rename to repository/src/main/java/org/alfresco/repo/virtual/VirtualContext.java
diff --git a/src/main/java/org/alfresco/repo/virtual/VirtualizationException.java b/repository/src/main/java/org/alfresco/repo/virtual/VirtualizationException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/VirtualizationException.java
rename to repository/src/main/java/org/alfresco/repo/virtual/VirtualizationException.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparator.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparator.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparator.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/GetPathMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualDefaultCopyBehaviourCallbackExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualDefaultCopyBehaviourCallbackExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualDefaultCopyBehaviourCallbackExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualDefaultCopyBehaviourCallbackExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualSpringBeanExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/bundle/VirtualWorkflowPackageExtension.java b/repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualWorkflowPackageExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/bundle/VirtualWorkflowPackageExtension.java
rename to repository/src/main/java/org/alfresco/repo/virtual/bundle/VirtualWorkflowPackageExtension.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/CompanyHomeContext.java b/repository/src/main/java/org/alfresco/repo/virtual/config/CompanyHomeContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/CompanyHomeContext.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/CompanyHomeContext.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/NodeRefContext.java b/repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefContext.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/NodeRefContext.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefContext.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/NodeRefExpression.java b/repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefExpression.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/NodeRefExpression.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefExpression.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpression.java b/repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpression.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpression.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpression.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionFactory.java b/repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionFactory.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionFactory.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/NodeRefResolver.java b/repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/NodeRefResolver.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/NodeRefResolver.java
diff --git a/src/main/java/org/alfresco/repo/virtual/config/RepositoryNodeRefResolver.java b/repository/src/main/java/org/alfresco/repo/virtual/config/RepositoryNodeRefResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/config/RepositoryNodeRefResolver.java
rename to repository/src/main/java/org/alfresco/repo/virtual/config/RepositoryNodeRefResolver.java
diff --git a/src/main/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/page/InvalidPageBounds.java b/repository/src/main/java/org/alfresco/repo/virtual/page/InvalidPageBounds.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/page/InvalidPageBounds.java
rename to repository/src/main/java/org/alfresco/repo/virtual/page/InvalidPageBounds.java
diff --git a/src/main/java/org/alfresco/repo/virtual/page/PageCollationException.java b/repository/src/main/java/org/alfresco/repo/virtual/page/PageCollationException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/page/PageCollationException.java
rename to repository/src/main/java/org/alfresco/repo/virtual/page/PageCollationException.java
diff --git a/src/main/java/org/alfresco/repo/virtual/page/PageCollator.java b/repository/src/main/java/org/alfresco/repo/virtual/page/PageCollator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/page/PageCollator.java
rename to repository/src/main/java/org/alfresco/repo/virtual/page/PageCollator.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/AbstractProtocolMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/AbstractProtocolMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/AbstractProtocolMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/AbstractProtocolMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ClasspathResource.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ClasspathResource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ClasspathResource.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ClasspathResource.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Encoding.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Encoding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Encoding.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Encoding.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Encodings.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Encodings.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Encodings.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Encodings.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetActualNodeRefMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetActualNodeRefMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetActualNodeRefMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetActualNodeRefMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetChildByIdMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetChildByIdMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetChildByIdMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetChildByIdMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetReferenceType.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetReferenceType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetReferenceType.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetReferenceType.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetTemplatePathMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetTemplatePathMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetTemplatePathMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetTemplatePathMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/GetVanillaScriptInputStreamMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/GetVanillaScriptInputStreamMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/GetVanillaScriptInputStreamMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/GetVanillaScriptInputStreamMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/HashEncodingArtefact.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/HashEncodingArtefact.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/HashEncodingArtefact.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/HashEncodingArtefact.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/HashReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/HashReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/HashReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/HashReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/HashStore.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/HashStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/HashStore.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/HashStore.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/HashStoreConfiguration.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/HashStoreConfiguration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/HashStoreConfiguration.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/HashStoreConfiguration.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/HashStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/HashStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/HashStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/HashStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/HierarchicalPathHasher.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/HierarchicalPathHasher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/HierarchicalPathHasher.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/HierarchicalPathHasher.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NodeHashReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NodeHashReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NodeHashReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NodeHashReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NodeHashStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NodeHashStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NodeHashStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NodeHashStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NodeProtocol.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NodeProtocol.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NodeProtocol.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NodeProtocol.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NodeRefHasher.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NodeRefHasher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NodeRefHasher.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NodeRefHasher.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasher.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/NumericPathHasher.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/NumericPathHasher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/NumericPathHasher.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/NumericPathHasher.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Parameter.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Parameter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Parameter.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Parameter.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/PathHasher.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/PathHasher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/PathHasher.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/PathHasher.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/PlainEncoding.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/PlainEncoding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/PlainEncoding.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/PlainEncoding.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/PlainReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/PlainReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/PlainReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/PlainReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/PlainStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/PlainStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/PlainStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/PlainStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Protocol.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Protocol.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Protocol.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Protocol.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolHashStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethodException.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethodException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethodException.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ProtocolMethodException.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Protocols.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Protocols.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Protocols.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Protocols.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Reference.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Reference.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Reference.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Reference.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ReferenceEncodingException.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceEncodingException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ReferenceEncodingException.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceEncodingException.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParameter.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParameter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ReferenceParameter.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParameter.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParseException.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParseException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ReferenceParseException.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParseException.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/RepositoryLocation.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryLocation.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/RepositoryLocation.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryLocation.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/RepositoryNodeRef.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryNodeRef.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/RepositoryNodeRef.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryNodeRef.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/RepositoryPath.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryPath.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/RepositoryPath.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryPath.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/RepositoryResource.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryResource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/RepositoryResource.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/RepositoryResource.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Resource.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Resource.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Resource.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Resource.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ResourceParameter.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ResourceParameter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ResourceParameter.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ResourceParameter.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessingError.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessingError.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessingError.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessingError.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessor.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessor.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ResourceProcessor.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/StoredPathHasher.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/StoredPathHasher.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/StoredPathHasher.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/StoredPathHasher.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/StringParameter.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/StringParameter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/StringParameter.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/StringParameter.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/Stringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/Stringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/Stringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/Stringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ValueParameter.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ValueParameter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ValueParameter.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ValueParameter.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/VanillaHashReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/VanillaHashReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/VanillaHashReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/VanillaHashReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/VanillaHashStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/VanillaHashStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/VanillaHashStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/VanillaHashStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/VanillaProtocol.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/VanillaProtocol.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/VanillaProtocol.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/VanillaProtocol.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/VirtualHashReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/VirtualHashReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/VirtualHashReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/VirtualHashReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/VirtualHashStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/VirtualHashStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/VirtualHashStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/VirtualHashStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/VirtualProtocol.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/VirtualProtocol.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/VirtualProtocol.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/VirtualProtocol.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ZeroEncoding.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ZeroEncoding.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ZeroEncoding.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ZeroEncoding.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ZeroReferenceParser.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ZeroReferenceParser.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ZeroReferenceParser.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ZeroReferenceParser.java
diff --git a/src/main/java/org/alfresco/repo/virtual/ref/ZeroStringifier.java b/repository/src/main/java/org/alfresco/repo/virtual/ref/ZeroStringifier.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/ref/ZeroStringifier.java
rename to repository/src/main/java/org/alfresco/repo/virtual/ref/ZeroStringifier.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/AspectVirtualizationMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/AspectVirtualizationMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/AspectVirtualizationMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/AspectVirtualizationMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/CustomVirtualizationMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/CustomVirtualizationMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/CustomVirtualizationMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/CustomVirtualizationMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/GetAllSetPermissionsMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/GetChildAssocsMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/GetSetPermissionsMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/HasPermissionMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/ReferenceComparator.java b/repository/src/main/java/org/alfresco/repo/virtual/store/ReferenceComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/ReferenceComparator.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/ReferenceComparator.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/TemplateVirtualizationMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/TemplateVirtualizationMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/TemplateVirtualizationMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/TemplateVirtualizationMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/VirtualFolderDefinitionResolver.java b/repository/src/main/java/org/alfresco/repo/virtual/store/VirtualFolderDefinitionResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/VirtualFolderDefinitionResolver.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/VirtualFolderDefinitionResolver.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/VirtualStore.java b/repository/src/main/java/org/alfresco/repo/virtual/store/VirtualStore.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/VirtualStore.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/VirtualStore.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java b/repository/src/main/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java b/repository/src/main/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/VirtualUserPermissions.java
diff --git a/src/main/java/org/alfresco/repo/virtual/store/VirtualizationMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/store/VirtualizationMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/store/VirtualizationMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/store/VirtualizationMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/ApplyTemplateMethod.java b/repository/src/main/java/org/alfresco/repo/virtual/template/ApplyTemplateMethod.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/ApplyTemplateMethod.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/ApplyTemplateMethod.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/BasicConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/BasicConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/BasicConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/BasicConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/FilesFoldersConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/FilesFoldersConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/FilesFoldersConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/FilesFoldersConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/FilingData.java b/repository/src/main/java/org/alfresco/repo/virtual/template/FilingData.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/FilingData.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/FilingData.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/FilingParameters.java b/repository/src/main/java/org/alfresco/repo/virtual/template/FilingParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/FilingParameters.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/FilingParameters.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/FilingRule.java b/repository/src/main/java/org/alfresco/repo/virtual/template/FilingRule.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/FilingRule.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/FilingRule.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/IgnoreConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/IgnoreConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/IgnoreConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/IgnoreConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/NamePatternPropertyValueConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/NamePatternPropertyValueConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/NamePatternPropertyValueConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/NamePatternPropertyValueConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/NodeFilingRule.java b/repository/src/main/java/org/alfresco/repo/virtual/template/NodeFilingRule.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/NodeFilingRule.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/NodeFilingRule.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/NullFilingRule.java b/repository/src/main/java/org/alfresco/repo/virtual/template/NullFilingRule.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/NullFilingRule.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/NullFilingRule.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/PagingRequestConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/PagingRequestConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/PagingRequestConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/PagingRequestConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/PropertyValueConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/PropertyValueConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/PropertyValueConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/PropertyValueConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/SortConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/SortConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/SortConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/SortConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/TemplateFilingRule.java b/repository/src/main/java/org/alfresco/repo/virtual/template/TemplateFilingRule.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/TemplateFilingRule.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/TemplateFilingRule.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/TemplateResourceProcessor.java b/repository/src/main/java/org/alfresco/repo/virtual/template/TemplateResourceProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/TemplateResourceProcessor.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/TemplateResourceProcessor.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/VirtualFolderDefinition.java b/repository/src/main/java/org/alfresco/repo/virtual/template/VirtualFolderDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/VirtualFolderDefinition.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/VirtualFolderDefinition.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/VirtualQuery.java b/repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/VirtualQuery.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQuery.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraint.java b/repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraint.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraint.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraintDecorator.java b/repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraintDecorator.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraintDecorator.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryConstraintDecorator.java
diff --git a/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java b/repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
rename to repository/src/main/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
diff --git a/src/main/java/org/alfresco/repo/webdav/LockInfo.java b/repository/src/main/java/org/alfresco/repo/webdav/LockInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/webdav/LockInfo.java
rename to repository/src/main/java/org/alfresco/repo/webdav/LockInfo.java
diff --git a/src/main/java/org/alfresco/repo/webdav/MTNodesCache2.java b/repository/src/main/java/org/alfresco/repo/webdav/MTNodesCache2.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/webdav/MTNodesCache2.java
rename to repository/src/main/java/org/alfresco/repo/webdav/MTNodesCache2.java
diff --git a/src/main/java/org/alfresco/repo/webdav/WebDavBootstrap.java b/repository/src/main/java/org/alfresco/repo/webdav/WebDavBootstrap.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/webdav/WebDavBootstrap.java
rename to repository/src/main/java/org/alfresco/repo/webdav/WebDavBootstrap.java
diff --git a/src/main/java/org/alfresco/repo/webdav/WebDavServiceImpl.java b/repository/src/main/java/org/alfresco/repo/webdav/WebDavServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/webdav/WebDavServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/webdav/WebDavServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/AbstractWorkflowNodeConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/AbstractWorkflowPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java b/repository/src/main/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java
rename to repository/src/main/java/org/alfresco/repo/workflow/AlfrescoBpmEngine.java
diff --git a/src/main/java/org/alfresco/repo/workflow/BPMEngine.java b/repository/src/main/java/org/alfresco/repo/workflow/BPMEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/BPMEngine.java
rename to repository/src/main/java/org/alfresco/repo/workflow/BPMEngine.java
diff --git a/src/main/java/org/alfresco/repo/workflow/BPMEngineRegistry.java b/repository/src/main/java/org/alfresco/repo/workflow/BPMEngineRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/BPMEngineRegistry.java
rename to repository/src/main/java/org/alfresco/repo/workflow/BPMEngineRegistry.java
diff --git a/src/main/java/org/alfresco/repo/workflow/CancelWorkflowActionExecuter.java b/repository/src/main/java/org/alfresco/repo/workflow/CancelWorkflowActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/CancelWorkflowActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/CancelWorkflowActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/DefaultWorkflowPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/NodeConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/NodeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/NodeConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/NodeConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/PackageManager.java b/repository/src/main/java/org/alfresco/repo/workflow/PackageManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/PackageManager.java
rename to repository/src/main/java/org/alfresco/repo/workflow/PackageManager.java
diff --git a/src/main/java/org/alfresco/repo/workflow/PropertyValueSizeIsMoreMaxLengthException.java b/repository/src/main/java/org/alfresco/repo/workflow/PropertyValueSizeIsMoreMaxLengthException.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/PropertyValueSizeIsMoreMaxLengthException.java
rename to repository/src/main/java/org/alfresco/repo/workflow/PropertyValueSizeIsMoreMaxLengthException.java
diff --git a/src/main/java/org/alfresco/repo/workflow/StartWorkflowActionExecuter.java b/repository/src/main/java/org/alfresco/repo/workflow/StartWorkflowActionExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/StartWorkflowActionExecuter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/StartWorkflowActionExecuter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/TaskComponent.java b/repository/src/main/java/org/alfresco/repo/workflow/TaskComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/TaskComponent.java
rename to repository/src/main/java/org/alfresco/repo/workflow/TaskComponent.java
diff --git a/src/main/java/org/alfresco/repo/workflow/TaskUpdater.java b/repository/src/main/java/org/alfresco/repo/workflow/TaskUpdater.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/TaskUpdater.java
rename to repository/src/main/java/org/alfresco/repo/workflow/TaskUpdater.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowAdminServiceImpl.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowAdminServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowAdminServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowAdminServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowAuthorityManager.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowBuilder.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowBuilder.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowBuilder.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowBuilder.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowComponent.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowComponent.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowComponent.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowConstants.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowConstants.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowConstants.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowConstants.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowDefinitionType.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowDefinitionType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowDefinitionType.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowDefinitionType.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowDeployer.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowDeployer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowDeployer.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowDeployer.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowEngine.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowEngine.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowEngine.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowModel.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModel.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowModel.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowModel.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowNodeConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowPackageComponent.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowPackageComponent.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowPackageComponent.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowPackageComponent.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowPropertyHandlerRegistry.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowQNameConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
rename to repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiConstants.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiNodeConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNode.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiScriptNodeList.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTaskTypeManager.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiTypeConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiUtil.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoCallActivityBpmnParseHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoCallActivityBpmnParseHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoCallActivityBpmnParseHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoCallActivityBpmnParseHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessBpmnParseHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessBpmnParseHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessBpmnParseHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessBpmnParseHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoUserTaskBpmnParseHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoUserTaskBpmnParseHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoUserTaskBpmnParseHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoUserTaskBpmnParseHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedAsyncJobHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedAsyncJobHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedAsyncJobHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedAsyncJobHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/AuthenticatedTimerJobHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/BaseExecutionListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/BaseExecutionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/BaseExecutionListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/BaseExecutionListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/BaseJavaDelegate.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/BaseJavaDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/BaseJavaDelegate.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/BaseJavaDelegate.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/listener/ConvertDateToISO8601.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/listener/ConvertDateToISO8601.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/listener/ConvertDateToISO8601.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/listener/ConvertDateToISO8601.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/listener/ProcessStartExecutionListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/listener/ProcessStartExecutionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/listener/ProcessStartExecutionListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/listener/ProcessStartExecutionListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/listener/ScriptExecutionListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDescriptionPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDueDatePropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDueDatePropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDueDatePropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiDueDatePropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiOwnerPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPackagePropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/script/AlfrescoScriptDelegate.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/AlfrescoScriptDelegate.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/script/AlfrescoScriptDelegate.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/script/AlfrescoScriptDelegate.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/script/DelegateExecutionScriptBase.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/DelegateExecutionScriptBase.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/script/DelegateExecutionScriptBase.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/script/DelegateExecutionScriptBase.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/ScriptTaskListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCompleteListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskNotificationListener.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/variable/CustomStringVariableType.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/variable/CustomStringVariableType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/variable/CustomStringVariableType.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/variable/CustomStringVariableType.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeListVariableType.java
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java
rename to repository/src/main/java/org/alfresco/repo/workflow/activiti/variable/ScriptNodeVariableType.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowDefinition.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowDefinition.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowDefinition.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowInstance.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowInstance.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowInstance.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowNode.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowNode.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowNode.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowNode.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowPath.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowPath.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowPath.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowPath.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTransition.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTransition.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTransition.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTransition.java
diff --git a/src/main/java/org/alfresco/repo/workflow/jscript/WorkflowManager.java b/repository/src/main/java/org/alfresco/repo/workflow/jscript/WorkflowManager.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/jscript/WorkflowManager.java
rename to repository/src/main/java/org/alfresco/repo/workflow/jscript/WorkflowManager.java
diff --git a/src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageExtension.java b/repository/src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageExtension.java
rename to repository/src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageExtension.java
diff --git a/src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageTrait.java b/repository/src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageTrait.java
rename to repository/src/main/java/org/alfresco/repo/workflow/traitextender/WorkflowPackageTrait.java
diff --git a/src/main/java/org/alfresco/schedule/AbstractScheduledLockedJob.java b/repository/src/main/java/org/alfresco/schedule/AbstractScheduledLockedJob.java
similarity index 100%
rename from src/main/java/org/alfresco/schedule/AbstractScheduledLockedJob.java
rename to repository/src/main/java/org/alfresco/schedule/AbstractScheduledLockedJob.java
diff --git a/src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java b/repository/src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java
similarity index 100%
rename from src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java
rename to repository/src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java
diff --git a/src/main/java/org/alfresco/schedule/ScheduledJobLockExecuter.java b/repository/src/main/java/org/alfresco/schedule/ScheduledJobLockExecuter.java
similarity index 100%
rename from src/main/java/org/alfresco/schedule/ScheduledJobLockExecuter.java
rename to repository/src/main/java/org/alfresco/schedule/ScheduledJobLockExecuter.java
diff --git a/src/main/java/org/alfresco/service/ServiceException.java b/repository/src/main/java/org/alfresco/service/ServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/ServiceException.java
rename to repository/src/main/java/org/alfresco/service/ServiceException.java
diff --git a/src/main/java/org/alfresco/service/ServiceRegistry.java b/repository/src/main/java/org/alfresco/service/ServiceRegistry.java
similarity index 100%
rename from src/main/java/org/alfresco/service/ServiceRegistry.java
rename to repository/src/main/java/org/alfresco/service/ServiceRegistry.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/Action.java b/repository/src/main/java/org/alfresco/service/cmr/action/Action.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/Action.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/Action.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionCondition.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionCondition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionCondition.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionCondition.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionConditionDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionConditionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionConditionDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionConditionDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionExecutionStatus.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionExecutionStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionExecutionStatus.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionExecutionStatus.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionList.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionList.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionList.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionList.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionService.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionServiceTransientException.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionServiceTransientException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionServiceTransientException.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionServiceTransientException.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionStatus.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionStatus.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionStatus.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ActionTrackingService.java b/repository/src/main/java/org/alfresco/service/cmr/action/ActionTrackingService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ActionTrackingService.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ActionTrackingService.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/CancellableAction.java b/repository/src/main/java/org/alfresco/service/cmr/action/CancellableAction.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/CancellableAction.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/CancellableAction.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/CompositeAction.java b/repository/src/main/java/org/alfresco/service/cmr/action/CompositeAction.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/CompositeAction.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/CompositeAction.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/CompositeActionCondition.java b/repository/src/main/java/org/alfresco/service/cmr/action/CompositeActionCondition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/CompositeActionCondition.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/CompositeActionCondition.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ExecutionDetails.java b/repository/src/main/java/org/alfresco/service/cmr/action/ExecutionDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ExecutionDetails.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ExecutionDetails.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ExecutionSummary.java b/repository/src/main/java/org/alfresco/service/cmr/action/ExecutionSummary.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ExecutionSummary.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ExecutionSummary.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ParameterConstraint.java b/repository/src/main/java/org/alfresco/service/cmr/action/ParameterConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ParameterConstraint.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ParameterConstraint.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ParameterDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/action/ParameterDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ParameterDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ParameterDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ParameterizedItem.java b/repository/src/main/java/org/alfresco/service/cmr/action/ParameterizedItem.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ParameterizedItem.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ParameterizedItem.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/ParameterizedItemDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/action/ParameterizedItemDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/ParameterizedItemDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/ParameterizedItemDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/scheduled/SchedulableAction.java b/repository/src/main/java/org/alfresco/service/cmr/action/scheduled/SchedulableAction.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/scheduled/SchedulableAction.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/scheduled/SchedulableAction.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedAction.java b/repository/src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedAction.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedAction.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedAction.java
diff --git a/src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedActionService.java b/repository/src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedActionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedActionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/action/scheduled/ScheduledPersistedActionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java b/repository/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/ActivitiesTransactionListener.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivityInfo.java b/repository/src/main/java/org/alfresco/service/cmr/activities/ActivityInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/ActivityInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/ActivityInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java b/repository/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/ActivityPostService.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java b/repository/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/ActivityPoster.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/ActivityService.java b/repository/src/main/java/org/alfresco/service/cmr/activities/ActivityService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/ActivityService.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/ActivityService.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/FeedControl.java b/repository/src/main/java/org/alfresco/service/cmr/activities/FeedControl.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/FeedControl.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/FeedControl.java
diff --git a/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java b/repository/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java
rename to repository/src/main/java/org/alfresco/service/cmr/activities/FileFolderActivityPosterImpl.java
diff --git a/src/main/java/org/alfresco/service/cmr/admin/PatchException.java b/repository/src/main/java/org/alfresco/service/cmr/admin/PatchException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/admin/PatchException.java
rename to repository/src/main/java/org/alfresco/service/cmr/admin/PatchException.java
diff --git a/src/main/java/org/alfresco/service/cmr/admin/RepoAdminService.java b/repository/src/main/java/org/alfresco/service/cmr/admin/RepoAdminService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/admin/RepoAdminService.java
rename to repository/src/main/java/org/alfresco/service/cmr/admin/RepoAdminService.java
diff --git a/src/main/java/org/alfresco/service/cmr/admin/RepoUsage.java b/repository/src/main/java/org/alfresco/service/cmr/admin/RepoUsage.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/admin/RepoUsage.java
rename to repository/src/main/java/org/alfresco/service/cmr/admin/RepoUsage.java
diff --git a/src/main/java/org/alfresco/service/cmr/admin/RepoUsageStatus.java b/repository/src/main/java/org/alfresco/service/cmr/admin/RepoUsageStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/admin/RepoUsageStatus.java
rename to repository/src/main/java/org/alfresco/service/cmr/admin/RepoUsageStatus.java
diff --git a/src/main/java/org/alfresco/service/cmr/attributes/AttributeService.java b/repository/src/main/java/org/alfresco/service/cmr/attributes/AttributeService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/attributes/AttributeService.java
rename to repository/src/main/java/org/alfresco/service/cmr/attributes/AttributeService.java
diff --git a/src/main/java/org/alfresco/service/cmr/attributes/DuplicateAttributeException.java b/repository/src/main/java/org/alfresco/service/cmr/attributes/DuplicateAttributeException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/attributes/DuplicateAttributeException.java
rename to repository/src/main/java/org/alfresco/service/cmr/attributes/DuplicateAttributeException.java
diff --git a/src/main/java/org/alfresco/service/cmr/audit/AuditInfo.java b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/audit/AuditInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/audit/AuditInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/audit/AuditQueryParameters.java b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditQueryParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/audit/AuditQueryParameters.java
rename to repository/src/main/java/org/alfresco/service/cmr/audit/AuditQueryParameters.java
diff --git a/src/main/java/org/alfresco/service/cmr/audit/AuditService.java b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/audit/AuditService.java
rename to repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java
diff --git a/src/main/java/org/alfresco/service/cmr/blog/BlogPostInfo.java b/repository/src/main/java/org/alfresco/service/cmr/blog/BlogPostInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/blog/BlogPostInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/blog/BlogPostInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/blog/BlogService.java b/repository/src/main/java/org/alfresco/service/cmr/blog/BlogService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/blog/BlogService.java
rename to repository/src/main/java/org/alfresco/service/cmr/blog/BlogService.java
diff --git a/src/main/java/org/alfresco/service/cmr/calendar/CalendarEntry.java b/repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarEntry.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/calendar/CalendarEntry.java
rename to repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarEntry.java
diff --git a/src/main/java/org/alfresco/service/cmr/calendar/CalendarEntryDTO.java b/repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarEntryDTO.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/calendar/CalendarEntryDTO.java
rename to repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarEntryDTO.java
diff --git a/src/main/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java b/repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java
rename to repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java
diff --git a/src/main/java/org/alfresco/service/cmr/calendar/CalendarService.java b/repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/calendar/CalendarService.java
rename to repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarService.java
diff --git a/src/main/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelper.java b/repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelper.java
rename to repository/src/main/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelper.java
diff --git a/src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInService.java b/repository/src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInService.java
rename to repository/src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInService.java
diff --git a/src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/coci/CheckOutCheckInServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/discussion/DiscussionService.java b/repository/src/main/java/org/alfresco/service/cmr/discussion/DiscussionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/discussion/DiscussionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/discussion/DiscussionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/discussion/PostInfo.java b/repository/src/main/java/org/alfresco/service/cmr/discussion/PostInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/discussion/PostInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/discussion/PostInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/discussion/PostWithReplies.java b/repository/src/main/java/org/alfresco/service/cmr/discussion/PostWithReplies.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/discussion/PostWithReplies.java
rename to repository/src/main/java/org/alfresco/service/cmr/discussion/PostWithReplies.java
diff --git a/src/main/java/org/alfresco/service/cmr/discussion/TopicInfo.java b/repository/src/main/java/org/alfresco/service/cmr/discussion/TopicInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/discussion/TopicInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/discussion/TopicInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/download/DownloadRequest.java b/repository/src/main/java/org/alfresco/service/cmr/download/DownloadRequest.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/download/DownloadRequest.java
rename to repository/src/main/java/org/alfresco/service/cmr/download/DownloadRequest.java
diff --git a/src/main/java/org/alfresco/service/cmr/download/DownloadService.java b/repository/src/main/java/org/alfresco/service/cmr/download/DownloadService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/download/DownloadService.java
rename to repository/src/main/java/org/alfresco/service/cmr/download/DownloadService.java
diff --git a/src/main/java/org/alfresco/service/cmr/download/DownloadStatus.java b/repository/src/main/java/org/alfresco/service/cmr/download/DownloadStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/download/DownloadStatus.java
rename to repository/src/main/java/org/alfresco/service/cmr/download/DownloadStatus.java
diff --git a/src/main/java/org/alfresco/service/cmr/download/DownloadStatusUpdateService.java b/repository/src/main/java/org/alfresco/service/cmr/download/DownloadStatusUpdateService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/download/DownloadStatusUpdateService.java
rename to repository/src/main/java/org/alfresco/service/cmr/download/DownloadStatusUpdateService.java
diff --git a/src/main/java/org/alfresco/service/cmr/download/package-info.java b/repository/src/main/java/org/alfresco/service/cmr/download/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/download/package-info.java
rename to repository/src/main/java/org/alfresco/service/cmr/download/package-info.java
diff --git a/src/main/java/org/alfresco/service/cmr/email/EmailDelivery.java b/repository/src/main/java/org/alfresco/service/cmr/email/EmailDelivery.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/email/EmailDelivery.java
rename to repository/src/main/java/org/alfresco/service/cmr/email/EmailDelivery.java
diff --git a/src/main/java/org/alfresco/service/cmr/email/EmailMessage.java b/repository/src/main/java/org/alfresco/service/cmr/email/EmailMessage.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/email/EmailMessage.java
rename to repository/src/main/java/org/alfresco/service/cmr/email/EmailMessage.java
diff --git a/src/main/java/org/alfresco/service/cmr/email/EmailMessageException.java b/repository/src/main/java/org/alfresco/service/cmr/email/EmailMessageException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/email/EmailMessageException.java
rename to repository/src/main/java/org/alfresco/service/cmr/email/EmailMessageException.java
diff --git a/src/main/java/org/alfresco/service/cmr/email/EmailMessagePart.java b/repository/src/main/java/org/alfresco/service/cmr/email/EmailMessagePart.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/email/EmailMessagePart.java
rename to repository/src/main/java/org/alfresco/service/cmr/email/EmailMessagePart.java
diff --git a/src/main/java/org/alfresco/service/cmr/email/EmailService.java b/repository/src/main/java/org/alfresco/service/cmr/email/EmailService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/email/EmailService.java
rename to repository/src/main/java/org/alfresco/service/cmr/email/EmailService.java
diff --git a/src/main/java/org/alfresco/service/cmr/favourites/FavouritesService.java b/repository/src/main/java/org/alfresco/service/cmr/favourites/FavouritesService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/favourites/FavouritesService.java
rename to repository/src/main/java/org/alfresco/service/cmr/favourites/FavouritesService.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/Invitation.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/Invitation.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/Invitation.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/Invitation.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/InvitationException.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/InvitationException.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationException.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionForbidden.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionForbidden.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionForbidden.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionForbidden.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionNotFound.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionNotFound.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionNotFound.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionNotFound.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionUserError.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionUserError.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionUserError.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationExceptionUserError.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/InvitationSearchCriteria.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationSearchCriteria.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/InvitationSearchCriteria.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationSearchCriteria.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/InvitationService.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/InvitationService.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/InvitationService.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/ModeratedInvitation.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/ModeratedInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/ModeratedInvitation.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/ModeratedInvitation.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java
diff --git a/src/main/java/org/alfresco/service/cmr/invitation/package-info.java b/repository/src/main/java/org/alfresco/service/cmr/invitation/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/invitation/package-info.java
rename to repository/src/main/java/org/alfresco/service/cmr/invitation/package-info.java
diff --git a/src/main/java/org/alfresco/service/cmr/links/LinkInfo.java b/repository/src/main/java/org/alfresco/service/cmr/links/LinkInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/links/LinkInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/links/LinkInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/links/LinksService.java b/repository/src/main/java/org/alfresco/service/cmr/links/LinksService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/links/LinksService.java
rename to repository/src/main/java/org/alfresco/service/cmr/links/LinksService.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/LockService.java b/repository/src/main/java/org/alfresco/service/cmr/lock/LockService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/LockService.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/LockService.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/LockStatus.java b/repository/src/main/java/org/alfresco/service/cmr/lock/LockStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/LockStatus.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/LockStatus.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/LockType.java b/repository/src/main/java/org/alfresco/service/cmr/lock/LockType.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/LockType.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/LockType.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/NodeLockedException.java b/repository/src/main/java/org/alfresco/service/cmr/lock/NodeLockedException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/NodeLockedException.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/NodeLockedException.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java b/repository/src/main/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/UnableToAquireLockException.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java b/repository/src/main/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/UnableToReleaseLockException.java
diff --git a/src/main/java/org/alfresco/service/cmr/lock/package-info.java b/repository/src/main/java/org/alfresco/service/cmr/lock/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/lock/package-info.java
rename to repository/src/main/java/org/alfresco/service/cmr/lock/package-info.java
diff --git a/src/main/java/org/alfresco/service/cmr/ml/ContentFilterLanguagesService.java b/repository/src/main/java/org/alfresco/service/cmr/ml/ContentFilterLanguagesService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/ml/ContentFilterLanguagesService.java
rename to repository/src/main/java/org/alfresco/service/cmr/ml/ContentFilterLanguagesService.java
diff --git a/src/main/java/org/alfresco/service/cmr/ml/EditionService.java b/repository/src/main/java/org/alfresco/service/cmr/ml/EditionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/ml/EditionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/ml/EditionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/ml/MultilingualContentService.java b/repository/src/main/java/org/alfresco/service/cmr/ml/MultilingualContentService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/ml/MultilingualContentService.java
rename to repository/src/main/java/org/alfresco/service/cmr/ml/MultilingualContentService.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/FileExistsException.java b/repository/src/main/java/org/alfresco/service/cmr/model/FileExistsException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/FileExistsException.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/FileExistsException.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/FileFolderService.java b/repository/src/main/java/org/alfresco/service/cmr/model/FileFolderService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/FileFolderService.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/FileFolderService.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/FileFolderServiceType.java b/repository/src/main/java/org/alfresco/service/cmr/model/FileFolderServiceType.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/FileFolderServiceType.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/FileFolderServiceType.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/FileFolderUtil.java b/repository/src/main/java/org/alfresco/service/cmr/model/FileFolderUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/FileFolderUtil.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/FileFolderUtil.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/FileInfo.java b/repository/src/main/java/org/alfresco/service/cmr/model/FileInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/FileInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/FileInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/FileNotFoundException.java b/repository/src/main/java/org/alfresco/service/cmr/model/FileNotFoundException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/FileNotFoundException.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/FileNotFoundException.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/SubFolderFilter.java b/repository/src/main/java/org/alfresco/service/cmr/model/SubFolderFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/SubFolderFilter.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/SubFolderFilter.java
diff --git a/src/main/java/org/alfresco/service/cmr/model/package-info.java b/repository/src/main/java/org/alfresco/service/cmr/model/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/model/package-info.java
rename to repository/src/main/java/org/alfresco/service/cmr/model/package-info.java
diff --git a/src/main/java/org/alfresco/service/cmr/module/ModuleDependency.java b/repository/src/main/java/org/alfresco/service/cmr/module/ModuleDependency.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/module/ModuleDependency.java
rename to repository/src/main/java/org/alfresco/service/cmr/module/ModuleDependency.java
diff --git a/src/main/java/org/alfresco/service/cmr/module/ModuleDetails.java b/repository/src/main/java/org/alfresco/service/cmr/module/ModuleDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/module/ModuleDetails.java
rename to repository/src/main/java/org/alfresco/service/cmr/module/ModuleDetails.java
diff --git a/src/main/java/org/alfresco/service/cmr/module/ModuleInstallState.java b/repository/src/main/java/org/alfresco/service/cmr/module/ModuleInstallState.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/module/ModuleInstallState.java
rename to repository/src/main/java/org/alfresco/service/cmr/module/ModuleInstallState.java
diff --git a/src/main/java/org/alfresco/service/cmr/module/ModuleService.java b/repository/src/main/java/org/alfresco/service/cmr/module/ModuleService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/module/ModuleService.java
rename to repository/src/main/java/org/alfresco/service/cmr/module/ModuleService.java
diff --git a/src/main/java/org/alfresco/service/cmr/notification/NotificationContext.java b/repository/src/main/java/org/alfresco/service/cmr/notification/NotificationContext.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/notification/NotificationContext.java
rename to repository/src/main/java/org/alfresco/service/cmr/notification/NotificationContext.java
diff --git a/src/main/java/org/alfresco/service/cmr/notification/NotificationProvider.java b/repository/src/main/java/org/alfresco/service/cmr/notification/NotificationProvider.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/notification/NotificationProvider.java
rename to repository/src/main/java/org/alfresco/service/cmr/notification/NotificationProvider.java
diff --git a/src/main/java/org/alfresco/service/cmr/notification/NotificationService.java b/repository/src/main/java/org/alfresco/service/cmr/notification/NotificationService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/notification/NotificationService.java
rename to repository/src/main/java/org/alfresco/service/cmr/notification/NotificationService.java
diff --git a/src/main/java/org/alfresco/service/cmr/oauth1/OAuth1CredentialsStoreService.java b/repository/src/main/java/org/alfresco/service/cmr/oauth1/OAuth1CredentialsStoreService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/oauth1/OAuth1CredentialsStoreService.java
rename to repository/src/main/java/org/alfresco/service/cmr/oauth1/OAuth1CredentialsStoreService.java
diff --git a/src/main/java/org/alfresco/service/cmr/oauth2/OAuth2CredentialsStoreService.java b/repository/src/main/java/org/alfresco/service/cmr/oauth2/OAuth2CredentialsStoreService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/oauth2/OAuth2CredentialsStoreService.java
rename to repository/src/main/java/org/alfresco/service/cmr/oauth2/OAuth2CredentialsStoreService.java
diff --git a/src/main/java/org/alfresco/service/cmr/preference/PreferenceService.java b/repository/src/main/java/org/alfresco/service/cmr/preference/PreferenceService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/preference/PreferenceService.java
rename to repository/src/main/java/org/alfresco/service/cmr/preference/PreferenceService.java
diff --git a/src/main/java/org/alfresco/service/cmr/quickshare/InvalidSharedIdException.java b/repository/src/main/java/org/alfresco/service/cmr/quickshare/InvalidSharedIdException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/quickshare/InvalidSharedIdException.java
rename to repository/src/main/java/org/alfresco/service/cmr/quickshare/InvalidSharedIdException.java
diff --git a/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDTO.java b/repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDTO.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDTO.java
rename to repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDTO.java
diff --git a/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDisabledException.java b/repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDisabledException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDisabledException.java
rename to repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareDisabledException.java
diff --git a/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryAction.java b/repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryAction.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryAction.java
rename to repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryAction.java
diff --git a/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryActionPersister.java b/repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryActionPersister.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryActionPersister.java
rename to repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareLinkExpiryActionPersister.java
diff --git a/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareService.java b/repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/quickshare/QuickShareService.java
rename to repository/src/main/java/org/alfresco/service/cmr/quickshare/QuickShareService.java
diff --git a/src/main/java/org/alfresco/service/cmr/rating/Rating.java b/repository/src/main/java/org/alfresco/service/cmr/rating/Rating.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rating/Rating.java
rename to repository/src/main/java/org/alfresco/service/cmr/rating/Rating.java
diff --git a/src/main/java/org/alfresco/service/cmr/rating/RatingScheme.java b/repository/src/main/java/org/alfresco/service/cmr/rating/RatingScheme.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rating/RatingScheme.java
rename to repository/src/main/java/org/alfresco/service/cmr/rating/RatingScheme.java
diff --git a/src/main/java/org/alfresco/service/cmr/rating/RatingService.java b/repository/src/main/java/org/alfresco/service/cmr/rating/RatingService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rating/RatingService.java
rename to repository/src/main/java/org/alfresco/service/cmr/rating/RatingService.java
diff --git a/src/main/java/org/alfresco/service/cmr/rating/RatingServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/rating/RatingServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rating/RatingServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/rating/RatingServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/remote/RepoRemote.java b/repository/src/main/java/org/alfresco/service/cmr/remote/RepoRemote.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remote/RepoRemote.java
rename to repository/src/main/java/org/alfresco/service/cmr/remote/RepoRemote.java
diff --git a/src/main/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java b/repository/src/main/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java
rename to repository/src/main/java/org/alfresco/service/cmr/remote/RepoRemoteTransport.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java b/repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorRequest.java b/repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorRequest.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorRequest.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorRequest.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorResponse.java b/repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorResponse.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorResponse.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorResponse.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java b/repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorService.java b/repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorService.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorService.java
diff --git a/src/main/java/org/alfresco/service/cmr/remotecredentials/BaseCredentialsInfo.java b/repository/src/main/java/org/alfresco/service/cmr/remotecredentials/BaseCredentialsInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remotecredentials/BaseCredentialsInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/remotecredentials/BaseCredentialsInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth1CredentialsInfo.java b/repository/src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth1CredentialsInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth1CredentialsInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth1CredentialsInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth2CredentialsInfo.java b/repository/src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth2CredentialsInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth2CredentialsInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/remotecredentials/OAuth2CredentialsInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/remotecredentials/PasswordCredentialsInfo.java b/repository/src/main/java/org/alfresco/service/cmr/remotecredentials/PasswordCredentialsInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remotecredentials/PasswordCredentialsInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/remotecredentials/PasswordCredentialsInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/remotecredentials/RemoteCredentialsService.java b/repository/src/main/java/org/alfresco/service/cmr/remotecredentials/RemoteCredentialsService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remotecredentials/RemoteCredentialsService.java
rename to repository/src/main/java/org/alfresco/service/cmr/remotecredentials/RemoteCredentialsService.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteticket/NoCredentialsFoundException.java b/repository/src/main/java/org/alfresco/service/cmr/remoteticket/NoCredentialsFoundException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteticket/NoCredentialsFoundException.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteticket/NoCredentialsFoundException.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteticket/NoSuchSystemException.java b/repository/src/main/java/org/alfresco/service/cmr/remoteticket/NoSuchSystemException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteticket/NoSuchSystemException.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteticket/NoSuchSystemException.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketInfo.java b/repository/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketService.java b/repository/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketService.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteAlfrescoTicketService.java
diff --git a/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteSystemUnavailableException.java b/repository/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteSystemUnavailableException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/remoteticket/RemoteSystemUnavailableException.java
rename to repository/src/main/java/org/alfresco/service/cmr/remoteticket/RemoteSystemUnavailableException.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/CompositeRenditionDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/CompositeRenditionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/CompositeRenditionDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/CompositeRenditionDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenderCallback.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenderCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenderCallback.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenderCallback.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenderingEngineDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenderingEngineDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenderingEngineDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenderingEngineDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenditionCancelledException.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionCancelledException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenditionCancelledException.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionCancelledException.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenditionDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenditionDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenditionPreventedException.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionPreventedException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenditionPreventedException.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionPreventedException.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenditionService.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenditionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/rendition/RenditionServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rendition/RenditionServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/rendition/RenditionServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/replication/DisabledReplicationJobException.java b/repository/src/main/java/org/alfresco/service/cmr/replication/DisabledReplicationJobException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/replication/DisabledReplicationJobException.java
rename to repository/src/main/java/org/alfresco/service/cmr/replication/DisabledReplicationJobException.java
diff --git a/src/main/java/org/alfresco/service/cmr/replication/ReplicationDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/replication/ReplicationDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/replication/ReplicationDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/replication/ReplicationDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/replication/ReplicationService.java b/repository/src/main/java/org/alfresco/service/cmr/replication/ReplicationService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/replication/ReplicationService.java
rename to repository/src/main/java/org/alfresco/service/cmr/replication/ReplicationService.java
diff --git a/src/main/java/org/alfresco/service/cmr/replication/ReplicationServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/replication/ReplicationServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/replication/ReplicationServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/replication/ReplicationServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java b/repository/src/main/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/AspectMissingException.java b/repository/src/main/java/org/alfresco/service/cmr/repository/AspectMissingException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/AspectMissingException.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/AspectMissingException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/ContentService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/ContentService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/ContentService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentTransformService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/ContentTransformService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/ContentTransformService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/ContentTransformService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/CopyService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/CopyService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/CopyService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/CopyService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/CopyServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/repository/CopyServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/CopyServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/CopyServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/CropSourceOptions.java b/repository/src/main/java/org/alfresco/service/cmr/repository/CropSourceOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/CropSourceOptions.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/CropSourceOptions.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/CrossRepositoryCopyService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/CrossRepositoryCopyService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/CrossRepositoryCopyService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/CrossRepositoryCopyService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/CyclicChildRelationshipException.java b/repository/src/main/java/org/alfresco/service/cmr/repository/CyclicChildRelationshipException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/CyclicChildRelationshipException.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/CyclicChildRelationshipException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/DeleteLinksStatusReport.java b/repository/src/main/java/org/alfresco/service/cmr/repository/DeleteLinksStatusReport.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/DeleteLinksStatusReport.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/DeleteLinksStatusReport.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/DocumentLinkService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/DocumentLinkService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/DocumentLinkService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/DocumentLinkService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java b/repository/src/main/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/DuplicateChildNodeNameException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/FileTypeImageSize.java b/repository/src/main/java/org/alfresco/service/cmr/repository/FileTypeImageSize.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/FileTypeImageSize.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/FileTypeImageSize.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/HBDataCollectorService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/HBDataCollectorService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/HBDataCollectorService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/HBDataCollectorService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/NoTransformerException.java b/repository/src/main/java/org/alfresco/service/cmr/repository/NoTransformerException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/NoTransformerException.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/NoTransformerException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/PagedSourceOptions.java b/repository/src/main/java/org/alfresco/service/cmr/repository/PagedSourceOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/PagedSourceOptions.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/PagedSourceOptions.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/ScriptLocation.java b/repository/src/main/java/org/alfresco/service/cmr/repository/ScriptLocation.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/ScriptLocation.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/ScriptLocation.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/ScriptProcessor.java b/repository/src/main/java/org/alfresco/service/cmr/repository/ScriptProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/ScriptProcessor.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/ScriptProcessor.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/ScriptService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/ScriptService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/ScriptService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/ScriptService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/SerializedTransformationOptionsAccessor.java b/repository/src/main/java/org/alfresco/service/cmr/repository/SerializedTransformationOptionsAccessor.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/SerializedTransformationOptionsAccessor.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/SerializedTransformationOptionsAccessor.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemplateException.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemplateException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemplateException.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemplateException.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemplateProcessor.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemplateProcessor.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemplateProcessor.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemplateProcessor.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemplateService.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemplateService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemplateService.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemplateService.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemplateValueConverter.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemplateValueConverter.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemplateValueConverter.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemplateValueConverter.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsMap.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TransformationOptions.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TransformationOptions.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TransformationOptions.java
diff --git a/src/main/java/org/alfresco/service/cmr/repository/TransformationSourceOptions.java b/repository/src/main/java/org/alfresco/service/cmr/repository/TransformationSourceOptions.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/repository/TransformationSourceOptions.java
rename to repository/src/main/java/org/alfresco/service/cmr/repository/TransformationSourceOptions.java
diff --git a/src/main/java/org/alfresco/service/cmr/rule/Rule.java b/repository/src/main/java/org/alfresco/service/cmr/rule/Rule.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rule/Rule.java
rename to repository/src/main/java/org/alfresco/service/cmr/rule/Rule.java
diff --git a/src/main/java/org/alfresco/service/cmr/rule/RuleService.java b/repository/src/main/java/org/alfresco/service/cmr/rule/RuleService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rule/RuleService.java
rename to repository/src/main/java/org/alfresco/service/cmr/rule/RuleService.java
diff --git a/src/main/java/org/alfresco/service/cmr/rule/RuleServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/rule/RuleServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rule/RuleServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/rule/RuleServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/rule/RuleType.java b/repository/src/main/java/org/alfresco/service/cmr/rule/RuleType.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/rule/RuleType.java
rename to repository/src/main/java/org/alfresco/service/cmr/rule/RuleType.java
diff --git a/src/main/java/org/alfresco/service/cmr/search/CategoryService.java b/repository/src/main/java/org/alfresco/service/cmr/search/CategoryService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/search/CategoryService.java
rename to repository/src/main/java/org/alfresco/service/cmr/search/CategoryService.java
diff --git a/src/main/java/org/alfresco/service/cmr/search/SuggesterParameters.java b/repository/src/main/java/org/alfresco/service/cmr/search/SuggesterParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/search/SuggesterParameters.java
rename to repository/src/main/java/org/alfresco/service/cmr/search/SuggesterParameters.java
diff --git a/src/main/java/org/alfresco/service/cmr/search/SuggesterResult.java b/repository/src/main/java/org/alfresco/service/cmr/search/SuggesterResult.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/search/SuggesterResult.java
rename to repository/src/main/java/org/alfresco/service/cmr/search/SuggesterResult.java
diff --git a/src/main/java/org/alfresco/service/cmr/search/SuggesterService.java b/repository/src/main/java/org/alfresco/service/cmr/search/SuggesterService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/search/SuggesterService.java
rename to repository/src/main/java/org/alfresco/service/cmr/search/SuggesterService.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/AuthenticationService.java b/repository/src/main/java/org/alfresco/service/cmr/security/AuthenticationService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/AuthenticationService.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/AuthenticationService.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/AuthorityService.java b/repository/src/main/java/org/alfresco/service/cmr/security/AuthorityService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/AuthorityService.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/AuthorityService.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/MutableAuthenticationService.java b/repository/src/main/java/org/alfresco/service/cmr/security/MutableAuthenticationService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/MutableAuthenticationService.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/MutableAuthenticationService.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/NoSuchPersonException.java b/repository/src/main/java/org/alfresco/service/cmr/security/NoSuchPersonException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/NoSuchPersonException.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/NoSuchPersonException.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/OwnableService.java b/repository/src/main/java/org/alfresco/service/cmr/security/OwnableService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/OwnableService.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/OwnableService.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/PersonService.java b/repository/src/main/java/org/alfresco/service/cmr/security/PersonService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/PersonService.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/PersonService.java
diff --git a/src/main/java/org/alfresco/service/cmr/security/PublicServiceAccessService.java b/repository/src/main/java/org/alfresco/service/cmr/security/PublicServiceAccessService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/security/PublicServiceAccessService.java
rename to repository/src/main/java/org/alfresco/service/cmr/security/PublicServiceAccessService.java
diff --git a/src/main/java/org/alfresco/service/cmr/site/SiteInfo.java b/repository/src/main/java/org/alfresco/service/cmr/site/SiteInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/site/SiteInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/site/SiteInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/site/SiteMemberInfo.java b/repository/src/main/java/org/alfresco/service/cmr/site/SiteMemberInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/site/SiteMemberInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/site/SiteMemberInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/site/SiteRole.java b/repository/src/main/java/org/alfresco/service/cmr/site/SiteRole.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/site/SiteRole.java
rename to repository/src/main/java/org/alfresco/service/cmr/site/SiteRole.java
diff --git a/src/main/java/org/alfresco/service/cmr/site/SiteService.java b/repository/src/main/java/org/alfresco/service/cmr/site/SiteService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/site/SiteService.java
rename to repository/src/main/java/org/alfresco/service/cmr/site/SiteService.java
diff --git a/src/main/java/org/alfresco/service/cmr/site/SiteVisibility.java b/repository/src/main/java/org/alfresco/service/cmr/site/SiteVisibility.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/site/SiteVisibility.java
rename to repository/src/main/java/org/alfresco/service/cmr/site/SiteVisibility.java
diff --git a/src/main/java/org/alfresco/service/cmr/site/package-info.java b/repository/src/main/java/org/alfresco/service/cmr/site/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/site/package-info.java
rename to repository/src/main/java/org/alfresco/service/cmr/site/package-info.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResults.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResults.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResults.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResults.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResultsImpl.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResultsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResultsImpl.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingFollowingResultsImpl.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResults.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResults.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResults.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResults.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResultsImpl.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResultsImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResultsImpl.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/PagingSubscriptionResultsImpl.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/PrivateSubscriptionListException.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/PrivateSubscriptionListException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/PrivateSubscriptionListException.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/PrivateSubscriptionListException.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionItemTypeEnum.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionItemTypeEnum.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionItemTypeEnum.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionItemTypeEnum.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionService.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionsDisabledException.java b/repository/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionsDisabledException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionsDisabledException.java
rename to repository/src/main/java/org/alfresco/service/cmr/subscriptions/SubscriptionsDisabledException.java
diff --git a/src/main/java/org/alfresco/service/cmr/tagging/TagDetails.java b/repository/src/main/java/org/alfresco/service/cmr/tagging/TagDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/tagging/TagDetails.java
rename to repository/src/main/java/org/alfresco/service/cmr/tagging/TagDetails.java
diff --git a/src/main/java/org/alfresco/service/cmr/tagging/TagScope.java b/repository/src/main/java/org/alfresco/service/cmr/tagging/TagScope.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/tagging/TagScope.java
rename to repository/src/main/java/org/alfresco/service/cmr/tagging/TagScope.java
diff --git a/src/main/java/org/alfresco/service/cmr/tagging/TaggingService.java b/repository/src/main/java/org/alfresco/service/cmr/tagging/TaggingService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/tagging/TaggingService.java
rename to repository/src/main/java/org/alfresco/service/cmr/tagging/TaggingService.java
diff --git a/src/main/java/org/alfresco/service/cmr/thumbnail/FailedThumbnailInfo.java b/repository/src/main/java/org/alfresco/service/cmr/thumbnail/FailedThumbnailInfo.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/thumbnail/FailedThumbnailInfo.java
rename to repository/src/main/java/org/alfresco/service/cmr/thumbnail/FailedThumbnailInfo.java
diff --git a/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailException.java b/repository/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailException.java
rename to repository/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailException.java
diff --git a/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java b/repository/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java
rename to repository/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailParentAssociationDetails.java
diff --git a/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailService.java b/repository/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailService.java
rename to repository/src/main/java/org/alfresco/service/cmr/thumbnail/ThumbnailService.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/NodeCrawler.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/NodeCrawler.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/NodeCrawler.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/NodeCrawler.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/NodeCrawlerFactory.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/NodeCrawlerFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/NodeCrawlerFactory.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/NodeCrawlerFactory.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/NodeFilter.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/NodeFilter.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/NodeFilter.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/NodeFilter.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/NodeFinder.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/NodeFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/NodeFinder.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/NodeFinder.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/RangedTransferEvent.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/RangedTransferEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/RangedTransferEvent.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/RangedTransferEvent.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferCallback.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferCallback.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferCallback.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferCallback.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferCancelledException.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferCancelledException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferCancelledException.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferCancelledException.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEndEvent.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEndEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEndEvent.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEndEvent.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEvent.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEvent.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEvent.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEvent.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventBegin.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventBegin.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventBegin.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventBegin.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventCancelled.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventCancelled.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventCancelled.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventCancelled.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventCommittingStatus.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventCommittingStatus.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventCommittingStatus.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventCommittingStatus.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventEndState.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventEndState.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventEndState.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventEndState.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventEnterState.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventEnterState.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventEnterState.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventEnterState.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventError.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventError.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventError.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventError.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventReport.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventReport.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventReport.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventReport.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingContent.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingContent.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingContent.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingContent.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSendingSnapshot.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSentContent.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSentContent.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventSentContent.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSentContent.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSuccess.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSuccess.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferEventSuccess.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferEventSuccess.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferException.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferException.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferException.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferFailureException.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferFailureException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferFailureException.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferFailureException.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferProgress.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferProgress.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferProgress.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferProgress.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferReceiver.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferReceiver.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferReceiver.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferReceiver.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferService.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferService.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferService.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferService2.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferService2.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferService2.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferService2.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferServicePolicies.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferServicePolicies.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferServicePolicies.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferServicePolicies.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferTarget.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferTarget.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferTarget.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferTarget.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/TransferVersion.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/TransferVersion.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/TransferVersion.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/TransferVersion.java
diff --git a/src/main/java/org/alfresco/service/cmr/transfer/package-info.java b/repository/src/main/java/org/alfresco/service/cmr/transfer/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/transfer/package-info.java
rename to repository/src/main/java/org/alfresco/service/cmr/transfer/package-info.java
diff --git a/src/main/java/org/alfresco/service/cmr/urlshortening/UrlShortener.java b/repository/src/main/java/org/alfresco/service/cmr/urlshortening/UrlShortener.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/urlshortening/UrlShortener.java
rename to repository/src/main/java/org/alfresco/service/cmr/urlshortening/UrlShortener.java
diff --git a/src/main/java/org/alfresco/service/cmr/usage/ContentQuotaException.java b/repository/src/main/java/org/alfresco/service/cmr/usage/ContentQuotaException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/usage/ContentQuotaException.java
rename to repository/src/main/java/org/alfresco/service/cmr/usage/ContentQuotaException.java
diff --git a/src/main/java/org/alfresco/service/cmr/usage/ContentUsageService.java b/repository/src/main/java/org/alfresco/service/cmr/usage/ContentUsageService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/usage/ContentUsageService.java
rename to repository/src/main/java/org/alfresco/service/cmr/usage/ContentUsageService.java
diff --git a/src/main/java/org/alfresco/service/cmr/usage/UsageService.java b/repository/src/main/java/org/alfresco/service/cmr/usage/UsageService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/usage/UsageService.java
rename to repository/src/main/java/org/alfresco/service/cmr/usage/UsageService.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/ReservedVersionNameException.java b/repository/src/main/java/org/alfresco/service/cmr/version/ReservedVersionNameException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/ReservedVersionNameException.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/ReservedVersionNameException.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/Version.java b/repository/src/main/java/org/alfresco/service/cmr/version/Version.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/Version.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/Version.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/VersionDoesNotExistException.java b/repository/src/main/java/org/alfresco/service/cmr/version/VersionDoesNotExistException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/VersionDoesNotExistException.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/VersionDoesNotExistException.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/VersionHistory.java b/repository/src/main/java/org/alfresco/service/cmr/version/VersionHistory.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/VersionHistory.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/VersionHistory.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/VersionService.java b/repository/src/main/java/org/alfresco/service/cmr/version/VersionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/VersionService.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/VersionService.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/VersionServiceException.java b/repository/src/main/java/org/alfresco/service/cmr/version/VersionServiceException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/VersionServiceException.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/VersionServiceException.java
diff --git a/src/main/java/org/alfresco/service/cmr/version/VersionType.java b/repository/src/main/java/org/alfresco/service/cmr/version/VersionType.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/version/VersionType.java
rename to repository/src/main/java/org/alfresco/service/cmr/version/VersionType.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ExportPackageHandler.java b/repository/src/main/java/org/alfresco/service/cmr/view/ExportPackageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ExportPackageHandler.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ExportPackageHandler.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/Exporter.java b/repository/src/main/java/org/alfresco/service/cmr/view/Exporter.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/Exporter.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/Exporter.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ExporterContext.java b/repository/src/main/java/org/alfresco/service/cmr/view/ExporterContext.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ExporterContext.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ExporterContext.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ExporterCrawlerParameters.java b/repository/src/main/java/org/alfresco/service/cmr/view/ExporterCrawlerParameters.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ExporterCrawlerParameters.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ExporterCrawlerParameters.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ExporterException.java b/repository/src/main/java/org/alfresco/service/cmr/view/ExporterException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ExporterException.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ExporterException.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ExporterService.java b/repository/src/main/java/org/alfresco/service/cmr/view/ExporterService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ExporterService.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ExporterService.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ImportPackageHandler.java b/repository/src/main/java/org/alfresco/service/cmr/view/ImportPackageHandler.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ImportPackageHandler.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ImportPackageHandler.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ImporterBinding.java b/repository/src/main/java/org/alfresco/service/cmr/view/ImporterBinding.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ImporterBinding.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ImporterBinding.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ImporterContentCache.java b/repository/src/main/java/org/alfresco/service/cmr/view/ImporterContentCache.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ImporterContentCache.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ImporterContentCache.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ImporterException.java b/repository/src/main/java/org/alfresco/service/cmr/view/ImporterException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ImporterException.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ImporterException.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ImporterProgress.java b/repository/src/main/java/org/alfresco/service/cmr/view/ImporterProgress.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ImporterProgress.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ImporterProgress.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ImporterService.java b/repository/src/main/java/org/alfresco/service/cmr/view/ImporterService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ImporterService.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ImporterService.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/Location.java b/repository/src/main/java/org/alfresco/service/cmr/view/Location.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/Location.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/Location.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/ReferenceType.java b/repository/src/main/java/org/alfresco/service/cmr/view/ReferenceType.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/ReferenceType.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/ReferenceType.java
diff --git a/src/main/java/org/alfresco/service/cmr/view/RepositoryExporterService.java b/repository/src/main/java/org/alfresco/service/cmr/view/RepositoryExporterService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/view/RepositoryExporterService.java
rename to repository/src/main/java/org/alfresco/service/cmr/view/RepositoryExporterService.java
diff --git a/src/main/java/org/alfresco/service/cmr/webdav/WebDavService.java b/repository/src/main/java/org/alfresco/service/cmr/webdav/WebDavService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/webdav/WebDavService.java
rename to repository/src/main/java/org/alfresco/service/cmr/webdav/WebDavService.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/LazyActivitiWorkflowTask.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/LazyActivitiWorkflowTask.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/LazyActivitiWorkflowTask.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/LazyActivitiWorkflowTask.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowAdminService.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowAdminService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowAdminService.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowAdminService.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowException.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowException.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowException.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstanceQuery.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstanceQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstanceQuery.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowInstanceQuery.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowNode.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowNode.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowNode.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowNode.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowPath.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowPath.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowPath.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowPath.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowPermissionInterceptor.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowPermissionInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowPermissionInterceptor.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowPermissionInterceptor.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowService.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowService.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowService.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTask.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTask.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowTask.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTask.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskDefinition.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskDefinition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskDefinition.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskDefinition.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskState.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskState.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskState.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTaskState.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java
diff --git a/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java b/repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java
similarity index 100%
rename from src/main/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java
rename to repository/src/main/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java
diff --git a/src/main/java/org/alfresco/service/descriptor/Descriptor.java b/repository/src/main/java/org/alfresco/service/descriptor/Descriptor.java
similarity index 100%
rename from src/main/java/org/alfresco/service/descriptor/Descriptor.java
rename to repository/src/main/java/org/alfresco/service/descriptor/Descriptor.java
diff --git a/src/main/java/org/alfresco/service/descriptor/DescriptorService.java b/repository/src/main/java/org/alfresco/service/descriptor/DescriptorService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/descriptor/DescriptorService.java
rename to repository/src/main/java/org/alfresco/service/descriptor/DescriptorService.java
diff --git a/src/main/java/org/alfresco/service/license/LicenseDescriptor.java b/repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java
similarity index 100%
rename from src/main/java/org/alfresco/service/license/LicenseDescriptor.java
rename to repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java
diff --git a/src/main/java/org/alfresco/service/license/LicenseException.java b/repository/src/main/java/org/alfresco/service/license/LicenseException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/license/LicenseException.java
rename to repository/src/main/java/org/alfresco/service/license/LicenseException.java
diff --git a/src/main/java/org/alfresco/service/license/LicenseIntegrityException.java b/repository/src/main/java/org/alfresco/service/license/LicenseIntegrityException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/license/LicenseIntegrityException.java
rename to repository/src/main/java/org/alfresco/service/license/LicenseIntegrityException.java
diff --git a/src/main/java/org/alfresco/service/license/LicenseService.java b/repository/src/main/java/org/alfresco/service/license/LicenseService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/license/LicenseService.java
rename to repository/src/main/java/org/alfresco/service/license/LicenseService.java
diff --git a/src/main/java/org/alfresco/service/package-info.java b/repository/src/main/java/org/alfresco/service/package-info.java
similarity index 100%
rename from src/main/java/org/alfresco/service/package-info.java
rename to repository/src/main/java/org/alfresco/service/package-info.java
diff --git a/src/main/java/org/alfresco/service/transaction/ReadOnlyServerException.java b/repository/src/main/java/org/alfresco/service/transaction/ReadOnlyServerException.java
similarity index 100%
rename from src/main/java/org/alfresco/service/transaction/ReadOnlyServerException.java
rename to repository/src/main/java/org/alfresco/service/transaction/ReadOnlyServerException.java
diff --git a/src/main/java/org/alfresco/service/transaction/TransactionService.java b/repository/src/main/java/org/alfresco/service/transaction/TransactionService.java
similarity index 100%
rename from src/main/java/org/alfresco/service/transaction/TransactionService.java
rename to repository/src/main/java/org/alfresco/service/transaction/TransactionService.java
diff --git a/src/main/java/org/alfresco/tools/Export.java b/repository/src/main/java/org/alfresco/tools/Export.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/Export.java
rename to repository/src/main/java/org/alfresco/tools/Export.java
diff --git a/src/main/java/org/alfresco/tools/Import.java b/repository/src/main/java/org/alfresco/tools/Import.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/Import.java
rename to repository/src/main/java/org/alfresco/tools/Import.java
diff --git a/src/main/java/org/alfresco/tools/RenameUser.java b/repository/src/main/java/org/alfresco/tools/RenameUser.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/RenameUser.java
rename to repository/src/main/java/org/alfresco/tools/RenameUser.java
diff --git a/src/main/java/org/alfresco/tools/Repository.java b/repository/src/main/java/org/alfresco/tools/Repository.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/Repository.java
rename to repository/src/main/java/org/alfresco/tools/Repository.java
diff --git a/src/main/java/org/alfresco/tools/Tool.java b/repository/src/main/java/org/alfresco/tools/Tool.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/Tool.java
rename to repository/src/main/java/org/alfresco/tools/Tool.java
diff --git a/src/main/java/org/alfresco/tools/ToolArgumentException.java b/repository/src/main/java/org/alfresco/tools/ToolArgumentException.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/ToolArgumentException.java
rename to repository/src/main/java/org/alfresco/tools/ToolArgumentException.java
diff --git a/src/main/java/org/alfresco/tools/ToolContext.java b/repository/src/main/java/org/alfresco/tools/ToolContext.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/ToolContext.java
rename to repository/src/main/java/org/alfresco/tools/ToolContext.java
diff --git a/src/main/java/org/alfresco/tools/ToolException.java b/repository/src/main/java/org/alfresco/tools/ToolException.java
similarity index 100%
rename from src/main/java/org/alfresco/tools/ToolException.java
rename to repository/src/main/java/org/alfresco/tools/ToolException.java
diff --git a/src/main/java/org/alfresco/traitextender/AJExtender.java b/repository/src/main/java/org/alfresco/traitextender/AJExtender.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/AJExtender.java
rename to repository/src/main/java/org/alfresco/traitextender/AJExtender.java
diff --git a/src/main/java/org/alfresco/traitextender/AJProxyTrait.java b/repository/src/main/java/org/alfresco/traitextender/AJProxyTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/AJProxyTrait.java
rename to repository/src/main/java/org/alfresco/traitextender/AJProxyTrait.java
diff --git a/src/main/java/org/alfresco/traitextender/Extend.java b/repository/src/main/java/org/alfresco/traitextender/Extend.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/Extend.java
rename to repository/src/main/java/org/alfresco/traitextender/Extend.java
diff --git a/src/main/java/org/alfresco/traitextender/ExtendedTrait.java b/repository/src/main/java/org/alfresco/traitextender/ExtendedTrait.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/ExtendedTrait.java
rename to repository/src/main/java/org/alfresco/traitextender/ExtendedTrait.java
diff --git a/src/main/java/org/alfresco/traitextender/Extender.java b/repository/src/main/java/org/alfresco/traitextender/Extender.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/Extender.java
rename to repository/src/main/java/org/alfresco/traitextender/Extender.java
diff --git a/src/main/java/org/alfresco/traitextender/ExtenderImpl.java b/repository/src/main/java/org/alfresco/traitextender/ExtenderImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/ExtenderImpl.java
rename to repository/src/main/java/org/alfresco/traitextender/ExtenderImpl.java
diff --git a/src/main/java/org/alfresco/traitextender/Extensible.java b/repository/src/main/java/org/alfresco/traitextender/Extensible.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/Extensible.java
rename to repository/src/main/java/org/alfresco/traitextender/Extensible.java
diff --git a/src/main/java/org/alfresco/traitextender/ExtensionBundle.java b/repository/src/main/java/org/alfresco/traitextender/ExtensionBundle.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/ExtensionBundle.java
rename to repository/src/main/java/org/alfresco/traitextender/ExtensionBundle.java
diff --git a/src/main/java/org/alfresco/traitextender/ExtensionFactory.java b/repository/src/main/java/org/alfresco/traitextender/ExtensionFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/ExtensionFactory.java
rename to repository/src/main/java/org/alfresco/traitextender/ExtensionFactory.java
diff --git a/src/main/java/org/alfresco/traitextender/ExtensionPoint.java b/repository/src/main/java/org/alfresco/traitextender/ExtensionPoint.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/ExtensionPoint.java
rename to repository/src/main/java/org/alfresco/traitextender/ExtensionPoint.java
diff --git a/src/main/java/org/alfresco/traitextender/ExtensionTargetException.java b/repository/src/main/java/org/alfresco/traitextender/ExtensionTargetException.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/ExtensionTargetException.java
rename to repository/src/main/java/org/alfresco/traitextender/ExtensionTargetException.java
diff --git a/src/main/java/org/alfresco/traitextender/InstanceExtension.java b/repository/src/main/java/org/alfresco/traitextender/InstanceExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/InstanceExtension.java
rename to repository/src/main/java/org/alfresco/traitextender/InstanceExtension.java
diff --git a/src/main/java/org/alfresco/traitextender/InstanceExtensionFactory.java b/repository/src/main/java/org/alfresco/traitextender/InstanceExtensionFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/InstanceExtensionFactory.java
rename to repository/src/main/java/org/alfresco/traitextender/InstanceExtensionFactory.java
diff --git a/src/main/java/org/alfresco/traitextender/InvalidExtension.java b/repository/src/main/java/org/alfresco/traitextender/InvalidExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/InvalidExtension.java
rename to repository/src/main/java/org/alfresco/traitextender/InvalidExtension.java
diff --git a/src/main/java/org/alfresco/traitextender/RegistryExtensionBundle.java b/repository/src/main/java/org/alfresco/traitextender/RegistryExtensionBundle.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/RegistryExtensionBundle.java
rename to repository/src/main/java/org/alfresco/traitextender/RegistryExtensionBundle.java
diff --git a/src/main/java/org/alfresco/traitextender/RouteExtensions.java b/repository/src/main/java/org/alfresco/traitextender/RouteExtensions.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/RouteExtensions.java
rename to repository/src/main/java/org/alfresco/traitextender/RouteExtensions.java
diff --git a/src/main/java/org/alfresco/traitextender/SingletonExtension.java b/repository/src/main/java/org/alfresco/traitextender/SingletonExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/SingletonExtension.java
rename to repository/src/main/java/org/alfresco/traitextender/SingletonExtension.java
diff --git a/src/main/java/org/alfresco/traitextender/SingletonExtensionFactory.java b/repository/src/main/java/org/alfresco/traitextender/SingletonExtensionFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/SingletonExtensionFactory.java
rename to repository/src/main/java/org/alfresco/traitextender/SingletonExtensionFactory.java
diff --git a/src/main/java/org/alfresco/traitextender/SpringBeanExtension.java b/repository/src/main/java/org/alfresco/traitextender/SpringBeanExtension.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/SpringBeanExtension.java
rename to repository/src/main/java/org/alfresco/traitextender/SpringBeanExtension.java
diff --git a/src/main/java/org/alfresco/traitextender/SpringExtensionBundle.java b/repository/src/main/java/org/alfresco/traitextender/SpringExtensionBundle.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/SpringExtensionBundle.java
rename to repository/src/main/java/org/alfresco/traitextender/SpringExtensionBundle.java
diff --git a/src/main/java/org/alfresco/traitextender/SpringExtensionPoint.java b/repository/src/main/java/org/alfresco/traitextender/SpringExtensionPoint.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/SpringExtensionPoint.java
rename to repository/src/main/java/org/alfresco/traitextender/SpringExtensionPoint.java
diff --git a/src/main/java/org/alfresco/traitextender/Trait.java b/repository/src/main/java/org/alfresco/traitextender/Trait.java
similarity index 100%
rename from src/main/java/org/alfresco/traitextender/Trait.java
rename to repository/src/main/java/org/alfresco/traitextender/Trait.java
diff --git a/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java b/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
similarity index 100%
rename from src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
rename to repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
diff --git a/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistryImpl.java b/repository/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistryImpl.java
similarity index 100%
rename from src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistryImpl.java
rename to repository/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistryImpl.java
diff --git a/src/main/java/org/alfresco/util/AlfrescoCollator.java b/repository/src/main/java/org/alfresco/util/AlfrescoCollator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/AlfrescoCollator.java
rename to repository/src/main/java/org/alfresco/util/AlfrescoCollator.java
diff --git a/src/main/java/org/alfresco/util/ApplicationContextHelper.java b/repository/src/main/java/org/alfresco/util/ApplicationContextHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ApplicationContextHelper.java
rename to repository/src/main/java/org/alfresco/util/ApplicationContextHelper.java
diff --git a/src/main/java/org/alfresco/util/AutoCommitInterceptor.java b/repository/src/main/java/org/alfresco/util/AutoCommitInterceptor.java
similarity index 100%
rename from src/main/java/org/alfresco/util/AutoCommitInterceptor.java
rename to repository/src/main/java/org/alfresco/util/AutoCommitInterceptor.java
diff --git a/src/main/java/org/alfresco/util/BeanExtender.java b/repository/src/main/java/org/alfresco/util/BeanExtender.java
similarity index 100%
rename from src/main/java/org/alfresco/util/BeanExtender.java
rename to repository/src/main/java/org/alfresco/util/BeanExtender.java
diff --git a/src/main/java/org/alfresco/util/ContextDependencyLister.java b/repository/src/main/java/org/alfresco/util/ContextDependencyLister.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ContextDependencyLister.java
rename to repository/src/main/java/org/alfresco/util/ContextDependencyLister.java
diff --git a/src/main/java/org/alfresco/util/CustomPropertyEditorRegistrar.java b/repository/src/main/java/org/alfresco/util/CustomPropertyEditorRegistrar.java
similarity index 100%
rename from src/main/java/org/alfresco/util/CustomPropertyEditorRegistrar.java
rename to repository/src/main/java/org/alfresco/util/CustomPropertyEditorRegistrar.java
diff --git a/src/main/java/org/alfresco/util/DBScriptUtil.java b/repository/src/main/java/org/alfresco/util/DBScriptUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/DBScriptUtil.java
rename to repository/src/main/java/org/alfresco/util/DBScriptUtil.java
diff --git a/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java b/repository/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java
rename to repository/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java
diff --git a/src/main/java/org/alfresco/util/DateUtil.java b/repository/src/main/java/org/alfresco/util/DateUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/DateUtil.java
rename to repository/src/main/java/org/alfresco/util/DateUtil.java
diff --git a/src/main/java/org/alfresco/util/DefaultImageResolver.java b/repository/src/main/java/org/alfresco/util/DefaultImageResolver.java
similarity index 100%
rename from src/main/java/org/alfresco/util/DefaultImageResolver.java
rename to repository/src/main/java/org/alfresco/util/DefaultImageResolver.java
diff --git a/src/main/java/org/alfresco/util/DialectUtil.java b/repository/src/main/java/org/alfresco/util/DialectUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/DialectUtil.java
rename to repository/src/main/java/org/alfresco/util/DialectUtil.java
diff --git a/src/main/java/org/alfresco/util/EmailHelper.java b/repository/src/main/java/org/alfresco/util/EmailHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/util/EmailHelper.java
rename to repository/src/main/java/org/alfresco/util/EmailHelper.java
diff --git a/src/main/java/org/alfresco/util/FileNameValidator.java b/repository/src/main/java/org/alfresco/util/FileNameValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/FileNameValidator.java
rename to repository/src/main/java/org/alfresco/util/FileNameValidator.java
diff --git a/src/main/java/org/alfresco/util/HttpClientHelper.java b/repository/src/main/java/org/alfresco/util/HttpClientHelper.java
similarity index 100%
rename from src/main/java/org/alfresco/util/HttpClientHelper.java
rename to repository/src/main/java/org/alfresco/util/HttpClientHelper.java
diff --git a/src/main/java/org/alfresco/util/JSONtoFmModel.java b/repository/src/main/java/org/alfresco/util/JSONtoFmModel.java
similarity index 100%
rename from src/main/java/org/alfresco/util/JSONtoFmModel.java
rename to repository/src/main/java/org/alfresco/util/JSONtoFmModel.java
diff --git a/src/main/java/org/alfresco/util/ModelUtil.java b/repository/src/main/java/org/alfresco/util/ModelUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ModelUtil.java
rename to repository/src/main/java/org/alfresco/util/ModelUtil.java
diff --git a/src/main/java/org/alfresco/util/OpenOfficeCommandLine.java b/repository/src/main/java/org/alfresco/util/OpenOfficeCommandLine.java
similarity index 100%
rename from src/main/java/org/alfresco/util/OpenOfficeCommandLine.java
rename to repository/src/main/java/org/alfresco/util/OpenOfficeCommandLine.java
diff --git a/src/main/java/org/alfresco/util/OpenOfficeURI.java b/repository/src/main/java/org/alfresco/util/OpenOfficeURI.java
similarity index 100%
rename from src/main/java/org/alfresco/util/OpenOfficeURI.java
rename to repository/src/main/java/org/alfresco/util/OpenOfficeURI.java
diff --git a/src/main/java/org/alfresco/util/OpenOfficeVariant.java b/repository/src/main/java/org/alfresco/util/OpenOfficeVariant.java
similarity index 100%
rename from src/main/java/org/alfresco/util/OpenOfficeVariant.java
rename to repository/src/main/java/org/alfresco/util/OpenOfficeVariant.java
diff --git a/src/main/java/org/alfresco/util/PathUtil.java b/repository/src/main/java/org/alfresco/util/PathUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/PathUtil.java
rename to repository/src/main/java/org/alfresco/util/PathUtil.java
diff --git a/src/main/java/org/alfresco/util/PolicyIgnoreUtil.java b/repository/src/main/java/org/alfresco/util/PolicyIgnoreUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/PolicyIgnoreUtil.java
rename to repository/src/main/java/org/alfresco/util/PolicyIgnoreUtil.java
diff --git a/src/main/java/org/alfresco/util/PortUtil.java b/repository/src/main/java/org/alfresco/util/PortUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/PortUtil.java
rename to repository/src/main/java/org/alfresco/util/PortUtil.java
diff --git a/src/main/java/org/alfresco/util/PropertyMap.java b/repository/src/main/java/org/alfresco/util/PropertyMap.java
similarity index 100%
rename from src/main/java/org/alfresco/util/PropertyMap.java
rename to repository/src/main/java/org/alfresco/util/PropertyMap.java
diff --git a/src/main/java/org/alfresco/util/QNameTypeEditor.java b/repository/src/main/java/org/alfresco/util/QNameTypeEditor.java
similarity index 100%
rename from src/main/java/org/alfresco/util/QNameTypeEditor.java
rename to repository/src/main/java/org/alfresco/util/QNameTypeEditor.java
diff --git a/src/main/java/org/alfresco/util/ResourceFinder.java b/repository/src/main/java/org/alfresco/util/ResourceFinder.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ResourceFinder.java
rename to repository/src/main/java/org/alfresco/util/ResourceFinder.java
diff --git a/src/main/java/org/alfresco/util/ResourceFinderConfigSource.java b/repository/src/main/java/org/alfresco/util/ResourceFinderConfigSource.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ResourceFinderConfigSource.java
rename to repository/src/main/java/org/alfresco/util/ResourceFinderConfigSource.java
diff --git a/src/main/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java b/repository/src/main/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
similarity index 100%
rename from src/main/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
rename to repository/src/main/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
diff --git a/src/main/java/org/alfresco/util/ScriptPagingDetails.java b/repository/src/main/java/org/alfresco/util/ScriptPagingDetails.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ScriptPagingDetails.java
rename to repository/src/main/java/org/alfresco/util/ScriptPagingDetails.java
diff --git a/src/main/java/org/alfresco/util/StringAppendingFactoryBean.java b/repository/src/main/java/org/alfresco/util/StringAppendingFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/util/StringAppendingFactoryBean.java
rename to repository/src/main/java/org/alfresco/util/StringAppendingFactoryBean.java
diff --git a/src/main/java/org/alfresco/util/ThreadPoolExecutorFactoryBean.java b/repository/src/main/java/org/alfresco/util/ThreadPoolExecutorFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ThreadPoolExecutorFactoryBean.java
rename to repository/src/main/java/org/alfresco/util/ThreadPoolExecutorFactoryBean.java
diff --git a/src/main/java/org/alfresco/util/TypeConstraint.java b/repository/src/main/java/org/alfresco/util/TypeConstraint.java
similarity index 100%
rename from src/main/java/org/alfresco/util/TypeConstraint.java
rename to repository/src/main/java/org/alfresco/util/TypeConstraint.java
diff --git a/src/main/java/org/alfresco/util/UrlUtil.java b/repository/src/main/java/org/alfresco/util/UrlUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/UrlUtil.java
rename to repository/src/main/java/org/alfresco/util/UrlUtil.java
diff --git a/src/main/java/org/alfresco/util/Utf7.java b/repository/src/main/java/org/alfresco/util/Utf7.java
similarity index 100%
rename from src/main/java/org/alfresco/util/Utf7.java
rename to repository/src/main/java/org/alfresco/util/Utf7.java
diff --git a/src/main/java/org/alfresco/util/ValueDerivingMapFactory.java b/repository/src/main/java/org/alfresco/util/ValueDerivingMapFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ValueDerivingMapFactory.java
rename to repository/src/main/java/org/alfresco/util/ValueDerivingMapFactory.java
diff --git a/src/main/java/org/alfresco/util/ValueProtectingMap.java b/repository/src/main/java/org/alfresco/util/ValueProtectingMap.java
similarity index 100%
rename from src/main/java/org/alfresco/util/ValueProtectingMap.java
rename to repository/src/main/java/org/alfresco/util/ValueProtectingMap.java
diff --git a/src/main/java/org/alfresco/util/XMLUtil.java b/repository/src/main/java/org/alfresco/util/XMLUtil.java
similarity index 100%
rename from src/main/java/org/alfresco/util/XMLUtil.java
rename to repository/src/main/java/org/alfresco/util/XMLUtil.java
diff --git a/src/main/java/org/alfresco/util/config/RepositoryFolderConfigBean.java b/repository/src/main/java/org/alfresco/util/config/RepositoryFolderConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/util/config/RepositoryFolderConfigBean.java
rename to repository/src/main/java/org/alfresco/util/config/RepositoryFolderConfigBean.java
diff --git a/src/main/java/org/alfresco/util/config/RepositoryPathConfigBean.java b/repository/src/main/java/org/alfresco/util/config/RepositoryPathConfigBean.java
similarity index 100%
rename from src/main/java/org/alfresco/util/config/RepositoryPathConfigBean.java
rename to repository/src/main/java/org/alfresco/util/config/RepositoryPathConfigBean.java
diff --git a/src/main/java/org/alfresco/util/debug/NodeStoreInspector.java b/repository/src/main/java/org/alfresco/util/debug/NodeStoreInspector.java
similarity index 100%
rename from src/main/java/org/alfresco/util/debug/NodeStoreInspector.java
rename to repository/src/main/java/org/alfresco/util/debug/NodeStoreInspector.java
diff --git a/src/main/java/org/alfresco/util/json/AbstractJsonSerializerBean.java b/repository/src/main/java/org/alfresco/util/json/AbstractJsonSerializerBean.java
similarity index 100%
rename from src/main/java/org/alfresco/util/json/AbstractJsonSerializerBean.java
rename to repository/src/main/java/org/alfresco/util/json/AbstractJsonSerializerBean.java
diff --git a/src/main/java/org/alfresco/util/json/AlfrescoJsonSerializer.java b/repository/src/main/java/org/alfresco/util/json/AlfrescoJsonSerializer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/json/AlfrescoJsonSerializer.java
rename to repository/src/main/java/org/alfresco/util/json/AlfrescoJsonSerializer.java
diff --git a/src/main/java/org/alfresco/util/json/DefaultJsonSerializer.java b/repository/src/main/java/org/alfresco/util/json/DefaultJsonSerializer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/json/DefaultJsonSerializer.java
rename to repository/src/main/java/org/alfresco/util/json/DefaultJsonSerializer.java
diff --git a/src/main/java/org/alfresco/util/json/ExceptionJsonSerializer.java b/repository/src/main/java/org/alfresco/util/json/ExceptionJsonSerializer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/json/ExceptionJsonSerializer.java
rename to repository/src/main/java/org/alfresco/util/json/ExceptionJsonSerializer.java
diff --git a/src/main/java/org/alfresco/util/json/JsonSerializer.java b/repository/src/main/java/org/alfresco/util/json/JsonSerializer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/json/JsonSerializer.java
rename to repository/src/main/java/org/alfresco/util/json/JsonSerializer.java
diff --git a/src/main/java/org/alfresco/util/remote/RemotableInputStream.java b/repository/src/main/java/org/alfresco/util/remote/RemotableInputStream.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/RemotableInputStream.java
rename to repository/src/main/java/org/alfresco/util/remote/RemotableInputStream.java
diff --git a/src/main/java/org/alfresco/util/remote/server/AbstractRemoteInputStreamServer.java b/repository/src/main/java/org/alfresco/util/remote/server/AbstractRemoteInputStreamServer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/server/AbstractRemoteInputStreamServer.java
rename to repository/src/main/java/org/alfresco/util/remote/server/AbstractRemoteInputStreamServer.java
diff --git a/src/main/java/org/alfresco/util/remote/server/AlfrescoRMIServiceExporter.java b/repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRMIServiceExporter.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/server/AlfrescoRMIServiceExporter.java
rename to repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRMIServiceExporter.java
diff --git a/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java b/repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java
rename to repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java
diff --git a/src/main/java/org/alfresco/util/remote/server/RemoteInputStreamServer.java b/repository/src/main/java/org/alfresco/util/remote/server/RemoteInputStreamServer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/server/RemoteInputStreamServer.java
rename to repository/src/main/java/org/alfresco/util/remote/server/RemoteInputStreamServer.java
diff --git a/src/main/java/org/alfresco/util/remote/server/RmiRemoteInputStreamServer.java b/repository/src/main/java/org/alfresco/util/remote/server/RmiRemoteInputStreamServer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/server/RmiRemoteInputStreamServer.java
rename to repository/src/main/java/org/alfresco/util/remote/server/RmiRemoteInputStreamServer.java
diff --git a/src/main/java/org/alfresco/util/remote/server/socket/HostConfigurableSocketFactory.java b/repository/src/main/java/org/alfresco/util/remote/server/socket/HostConfigurableSocketFactory.java
similarity index 100%
rename from src/main/java/org/alfresco/util/remote/server/socket/HostConfigurableSocketFactory.java
rename to repository/src/main/java/org/alfresco/util/remote/server/socket/HostConfigurableSocketFactory.java
diff --git a/src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java b/repository/src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java
similarity index 100%
rename from src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java
rename to repository/src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java
diff --git a/src/main/java/org/alfresco/util/resource/MethodResourceManager.java b/repository/src/main/java/org/alfresco/util/resource/MethodResourceManager.java
similarity index 100%
rename from src/main/java/org/alfresco/util/resource/MethodResourceManager.java
rename to repository/src/main/java/org/alfresco/util/resource/MethodResourceManager.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/ComparisonUtils.java b/repository/src/main/java/org/alfresco/util/schemacomp/ComparisonUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/ComparisonUtils.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/ComparisonUtils.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/DbObjectVisitor.java b/repository/src/main/java/org/alfresco/util/schemacomp/DbObjectVisitor.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/DbObjectVisitor.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/DbObjectVisitor.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/DbObjectXMLTransformer.java b/repository/src/main/java/org/alfresco/util/schemacomp/DbObjectXMLTransformer.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/DbObjectXMLTransformer.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/DbObjectXMLTransformer.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/DbProperty.java b/repository/src/main/java/org/alfresco/util/schemacomp/DbProperty.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/DbProperty.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/DbProperty.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/DbToXML.java b/repository/src/main/java/org/alfresco/util/schemacomp/DbToXML.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/DbToXML.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/DbToXML.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/DefaultComparisonUtils.java b/repository/src/main/java/org/alfresco/util/schemacomp/DefaultComparisonUtils.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/DefaultComparisonUtils.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/DefaultComparisonUtils.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/DiffContext.java b/repository/src/main/java/org/alfresco/util/schemacomp/DiffContext.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/DiffContext.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/DiffContext.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/Difference.java b/repository/src/main/java/org/alfresco/util/schemacomp/Difference.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/Difference.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/Difference.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/ExportDb.java b/repository/src/main/java/org/alfresco/util/schemacomp/ExportDb.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/ExportDb.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/ExportDb.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/MultiFileDumper.java b/repository/src/main/java/org/alfresco/util/schemacomp/MultiFileDumper.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/MultiFileDumper.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/MultiFileDumper.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/RedundantDbObject.java b/repository/src/main/java/org/alfresco/util/schemacomp/RedundantDbObject.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/RedundantDbObject.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/RedundantDbObject.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/Result.java b/repository/src/main/java/org/alfresco/util/schemacomp/Result.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/Result.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/Result.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/Results.java b/repository/src/main/java/org/alfresco/util/schemacomp/Results.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/Results.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/Results.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java b/repository/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java b/repository/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/SchemaToXML.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/ValidatingVisitor.java b/repository/src/main/java/org/alfresco/util/schemacomp/ValidatingVisitor.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/ValidatingVisitor.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/ValidatingVisitor.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/ValidationResult.java b/repository/src/main/java/org/alfresco/util/schemacomp/ValidationResult.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/ValidationResult.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/ValidationResult.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/XML.java b/repository/src/main/java/org/alfresco/util/schemacomp/XML.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/XML.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/XML.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/XMLToSchema.java b/repository/src/main/java/org/alfresco/util/schemacomp/XMLToSchema.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/XMLToSchema.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/XMLToSchema.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/AbstractDbObject.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/AbstractDbObject.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/AbstractDbObject.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/AbstractDbObject.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/Column.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/Column.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/Column.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/Column.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/DbObject.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/DbObject.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/DbObject.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/DbObject.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/ForeignKey.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/ForeignKey.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/ForeignKey.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/ForeignKey.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/Index.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/Index.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/Index.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/Index.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/PrimaryKey.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/PrimaryKey.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/PrimaryKey.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/PrimaryKey.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/Schema.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/Schema.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/Schema.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/Schema.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/Sequence.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/Sequence.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/Sequence.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/Sequence.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/model/Table.java b/repository/src/main/java/org/alfresco/util/schemacomp/model/Table.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/model/Table.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/model/Table.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/AbstractDbValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/AbstractDbValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/AbstractDbValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/AbstractDbValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/DbValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/DbValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/DbValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/DbValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/IgnoreObjectValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/IgnoreObjectValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/IgnoreObjectValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/IgnoreObjectValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/NullValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/NullValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/NullValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/NullValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidator.java
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidator.java b/repository/src/main/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidator.java
similarity index 100%
rename from src/main/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidator.java
rename to repository/src/main/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidator.java
diff --git a/src/main/java/org/apache/lucene/index/TermInfosReader.java b/repository/src/main/java/org/apache/lucene/index/TermInfosReader.java
similarity index 100%
rename from src/main/java/org/apache/lucene/index/TermInfosReader.java
rename to repository/src/main/java/org/apache/lucene/index/TermInfosReader.java
diff --git a/src/main/java/org/apache/lucene/search/TermQuery.java b/repository/src/main/java/org/apache/lucene/search/TermQuery.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/TermQuery.java
rename to repository/src/main/java/org/apache/lucene/search/TermQuery.java
diff --git a/src/main/java/org/apache/lucene/search/TermScorer.java b/repository/src/main/java/org/apache/lucene/search/TermScorer.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/TermScorer.java
rename to repository/src/main/java/org/apache/lucene/search/TermScorer.java
diff --git a/src/main/java/org/apache/lucene/store/AlfrescoFSDirectory.java b/repository/src/main/java/org/apache/lucene/store/AlfrescoFSDirectory.java
similarity index 100%
rename from src/main/java/org/apache/lucene/store/AlfrescoFSDirectory.java
rename to repository/src/main/java/org/apache/lucene/store/AlfrescoFSDirectory.java
diff --git a/src/main/java/org/apache/lucene/store/FSDirectory.java b/repository/src/main/java/org/apache/lucene/store/FSDirectory.java
similarity index 100%
rename from src/main/java/org/apache/lucene/store/FSDirectory.java
rename to repository/src/main/java/org/apache/lucene/store/FSDirectory.java
diff --git a/src/main/javadoc/org/alfresco/repo/invitation/package.html b/repository/src/main/javadoc/org/alfresco/repo/invitation/package.html
similarity index 100%
rename from src/main/javadoc/org/alfresco/repo/invitation/package.html
rename to repository/src/main/javadoc/org/alfresco/repo/invitation/package.html
diff --git a/src/main/javadoc/org/alfresco/repo/invitation/site/package.html b/repository/src/main/javadoc/org/alfresco/repo/invitation/site/package.html
similarity index 100%
rename from src/main/javadoc/org/alfresco/repo/invitation/site/package.html
rename to repository/src/main/javadoc/org/alfresco/repo/invitation/site/package.html
diff --git a/src/main/javadoc/org/alfresco/repo/model/package.html b/repository/src/main/javadoc/org/alfresco/repo/model/package.html
similarity index 100%
rename from src/main/javadoc/org/alfresco/repo/model/package.html
rename to repository/src/main/javadoc/org/alfresco/repo/model/package.html
diff --git a/src/main/javadoc/org/alfresco/service/cmr/model/package.html b/repository/src/main/javadoc/org/alfresco/service/cmr/model/package.html
similarity index 100%
rename from src/main/javadoc/org/alfresco/service/cmr/model/package.html
rename to repository/src/main/javadoc/org/alfresco/service/cmr/model/package.html
diff --git a/src/main/resources/alfresco-global.properties.sample b/repository/src/main/resources/alfresco-global.properties.sample
similarity index 100%
rename from src/main/resources/alfresco-global.properties.sample
rename to repository/src/main/resources/alfresco-global.properties.sample
diff --git a/src/main/resources/alfresco/action-services-context.xml b/repository/src/main/resources/alfresco/action-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/action-services-context.xml
rename to repository/src/main/resources/alfresco/action-services-context.xml
diff --git a/src/main/resources/alfresco/activiti-context.xml b/repository/src/main/resources/alfresco/activiti-context.xml
similarity index 100%
rename from src/main/resources/alfresco/activiti-context.xml
rename to repository/src/main/resources/alfresco/activiti-context.xml
diff --git a/src/main/resources/alfresco/activities/activities-feed-context.xml b/repository/src/main/resources/alfresco/activities/activities-feed-context.xml
similarity index 100%
rename from src/main/resources/alfresco/activities/activities-feed-context.xml
rename to repository/src/main/resources/alfresco/activities/activities-feed-context.xml
diff --git a/src/main/resources/alfresco/alfresco-shared.properties b/repository/src/main/resources/alfresco/alfresco-shared.properties
similarity index 100%
rename from src/main/resources/alfresco/alfresco-shared.properties
rename to repository/src/main/resources/alfresco/alfresco-shared.properties
diff --git a/src/main/resources/alfresco/application-context-core.xml b/repository/src/main/resources/alfresco/application-context-core.xml
similarity index 100%
rename from src/main/resources/alfresco/application-context-core.xml
rename to repository/src/main/resources/alfresco/application-context-core.xml
diff --git a/src/main/resources/alfresco/application-context-highlevel.xml b/repository/src/main/resources/alfresco/application-context-highlevel.xml
similarity index 100%
rename from src/main/resources/alfresco/application-context-highlevel.xml
rename to repository/src/main/resources/alfresco/application-context-highlevel.xml
diff --git a/src/main/resources/alfresco/application-context.xml b/repository/src/main/resources/alfresco/application-context.xml
similarity index 100%
rename from src/main/resources/alfresco/application-context.xml
rename to repository/src/main/resources/alfresco/application-context.xml
diff --git a/src/main/resources/alfresco/attributes-service-context.xml b/repository/src/main/resources/alfresco/attributes-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/attributes-service-context.xml
rename to repository/src/main/resources/alfresco/attributes-service-context.xml
diff --git a/src/main/resources/alfresco/audit-services-context.xml b/repository/src/main/resources/alfresco/audit-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/audit-services-context.xml
rename to repository/src/main/resources/alfresco/audit-services-context.xml
diff --git a/src/main/resources/alfresco/audit/alfresco-audit-3.2.xsd b/repository/src/main/resources/alfresco/audit/alfresco-audit-3.2.xsd
similarity index 100%
rename from src/main/resources/alfresco/audit/alfresco-audit-3.2.xsd
rename to repository/src/main/resources/alfresco/audit/alfresco-audit-3.2.xsd
diff --git a/src/main/resources/alfresco/audit/alfresco-audit-access.xml b/repository/src/main/resources/alfresco/audit/alfresco-audit-access.xml
similarity index 100%
rename from src/main/resources/alfresco/audit/alfresco-audit-access.xml
rename to repository/src/main/resources/alfresco/audit/alfresco-audit-access.xml
diff --git a/src/main/resources/alfresco/audit/alfresco-audit-cmis.xml b/repository/src/main/resources/alfresco/audit/alfresco-audit-cmis.xml
similarity index 100%
rename from src/main/resources/alfresco/audit/alfresco-audit-cmis.xml
rename to repository/src/main/resources/alfresco/audit/alfresco-audit-cmis.xml
diff --git a/src/main/resources/alfresco/audit/alfresco-audit-tagging.xml b/repository/src/main/resources/alfresco/audit/alfresco-audit-tagging.xml
similarity index 100%
rename from src/main/resources/alfresco/audit/alfresco-audit-tagging.xml
rename to repository/src/main/resources/alfresco/audit/alfresco-audit-tagging.xml
diff --git a/src/main/resources/alfresco/authentication-services-context.xml b/repository/src/main/resources/alfresco/authentication-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/authentication-services-context.xml
rename to repository/src/main/resources/alfresco/authentication-services-context.xml
diff --git a/src/main/resources/alfresco/authority-services-context.xml b/repository/src/main/resources/alfresco/authority-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/authority-services-context.xml
rename to repository/src/main/resources/alfresco/authority-services-context.xml
diff --git a/src/main/resources/alfresco/blog-context.xml b/repository/src/main/resources/alfresco/blog-context.xml
similarity index 100%
rename from src/main/resources/alfresco/blog-context.xml
rename to repository/src/main/resources/alfresco/blog-context.xml
diff --git a/src/main/resources/alfresco/bootstrap-context.xml b/repository/src/main/resources/alfresco/bootstrap-context.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap-context.xml
rename to repository/src/main/resources/alfresco/bootstrap-context.xml
diff --git a/src/main/resources/alfresco/bootstrap/alfrescoAuthorityStore.xml b/repository/src/main/resources/alfresco/bootstrap/alfrescoAuthorityStore.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/alfrescoAuthorityStore.xml
rename to repository/src/main/resources/alfresco/bootstrap/alfrescoAuthorityStore.xml
diff --git a/src/main/resources/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml b/repository/src/main/resources/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml
rename to repository/src/main/resources/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml
diff --git a/src/main/resources/alfresco/bootstrap/alfrescoUserStore.xml b/repository/src/main/resources/alfresco/bootstrap/alfrescoUserStore.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/alfrescoUserStore.xml
rename to repository/src/main/resources/alfresco/bootstrap/alfrescoUserStore.xml
diff --git a/src/main/resources/alfresco/bootstrap/categories.xml b/repository/src/main/resources/alfresco/bootstrap/categories.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/categories.xml
rename to repository/src/main/resources/alfresco/bootstrap/categories.xml
diff --git a/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml b/repository/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/customMessagesSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/customMessagesSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/customModelsSpace.acp b/repository/src/main/resources/alfresco/bootstrap/customModelsSpace.acp
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/customModelsSpace.acp
rename to repository/src/main/resources/alfresco/bootstrap/customModelsSpace.acp
diff --git a/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/customWebClientExtensionSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp b/repository/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp
rename to repository/src/main/resources/alfresco/bootstrap/customWorkflowDefsSpace.acp
diff --git a/src/main/resources/alfresco/bootstrap/descriptor.xml b/repository/src/main/resources/alfresco/bootstrap/descriptor.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/descriptor.xml
rename to repository/src/main/resources/alfresco/bootstrap/descriptor.xml
diff --git a/src/main/resources/alfresco/bootstrap/downloadsSpace.xml b/repository/src/main/resources/alfresco/bootstrap/downloadsSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/downloadsSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/downloadsSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/example_javascripts.acp b/repository/src/main/resources/alfresco/bootstrap/example_javascripts.acp
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/example_javascripts.acp
rename to repository/src/main/resources/alfresco/bootstrap/example_javascripts.acp
diff --git a/src/main/resources/alfresco/bootstrap/example_javascripts2.acp b/repository/src/main/resources/alfresco/bootstrap/example_javascripts2.acp
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/example_javascripts2.acp
rename to repository/src/main/resources/alfresco/bootstrap/example_javascripts2.acp
diff --git a/src/main/resources/alfresco/bootstrap/example_smartfoldertemplates.acp b/repository/src/main/resources/alfresco/bootstrap/example_smartfoldertemplates.acp
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/example_smartfoldertemplates.acp
rename to repository/src/main/resources/alfresco/bootstrap/example_smartfoldertemplates.acp
diff --git a/src/main/resources/alfresco/bootstrap/imapScripts.xml b/repository/src/main/resources/alfresco/bootstrap/imapScripts.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/imapScripts.xml
rename to repository/src/main/resources/alfresco/bootstrap/imapScripts.xml
diff --git a/src/main/resources/alfresco/bootstrap/imapSpaces.acp b/repository/src/main/resources/alfresco/bootstrap/imapSpaces.acp
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/imapSpaces.acp
rename to repository/src/main/resources/alfresco/bootstrap/imapSpaces.acp
diff --git a/src/main/resources/alfresco/bootstrap/imapSpacesTemplates.xml b/repository/src/main/resources/alfresco/bootstrap/imapSpacesTemplates.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/imapSpacesTemplates.xml
rename to repository/src/main/resources/alfresco/bootstrap/imapSpacesTemplates.xml
diff --git a/src/main/resources/alfresco/bootstrap/invite/invite-email.xml b/repository/src/main/resources/alfresco/bootstrap/invite/invite-email.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/invite/invite-email.xml
rename to repository/src/main/resources/alfresco/bootstrap/invite/invite-email.xml
diff --git a/src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.ftl b/repository/src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.ftl
rename to repository/src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.ftl
diff --git a/src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.xml b/repository/src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.xml
rename to repository/src/main/resources/alfresco/bootstrap/invite/moderated-reject-email.xml
diff --git a/src/main/resources/alfresco/bootstrap/lightWeightVersionStore.xml b/repository/src/main/resources/alfresco/bootstrap/lightWeightVersionStore.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/lightWeightVersionStore.xml
rename to repository/src/main/resources/alfresco/bootstrap/lightWeightVersionStore.xml
diff --git a/src/main/resources/alfresco/bootstrap/multilingualRoot.xml b/repository/src/main/resources/alfresco/bootstrap/multilingualRoot.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/multilingualRoot.xml
rename to repository/src/main/resources/alfresco/bootstrap/multilingualRoot.xml
diff --git a/src/main/resources/alfresco/bootstrap/nodeTemplatesSpace.xml b/repository/src/main/resources/alfresco/bootstrap/nodeTemplatesSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/nodeTemplatesSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/nodeTemplatesSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email_de.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email_de.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email_de.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email_de.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email_es.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email_es.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email_es.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email_es.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email_fr.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email_fr.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email_fr.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email_fr.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email_it.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email_it.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email_it.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email_it.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email_ja.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email_ja.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email_ja.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email_ja.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/wf-email_nl.html.ftl b/repository/src/main/resources/alfresco/bootstrap/notification/wf-email_nl.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/wf-email_nl.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/notification/wf-email_nl.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/notification/workflow-email-notification.xml b/repository/src/main/resources/alfresco/bootstrap/notification/workflow-email-notification.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/notification/workflow-email-notification.xml
rename to repository/src/main/resources/alfresco/bootstrap/notification/workflow-email-notification.xml
diff --git a/src/main/resources/alfresco/bootstrap/quickShareLinkExpiryActionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/quickShareLinkExpiryActionSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/quickShareLinkExpiryActionSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/quickShareLinkExpiryActionSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/remoteCredentialsSpace.xml b/repository/src/main/resources/alfresco/bootstrap/remoteCredentialsSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/remoteCredentialsSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/remoteCredentialsSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/renderingActionSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/renderingActionSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml b/repository/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/replicationActionSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/replicationActionSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml b/repository/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml
rename to repository/src/main/resources/alfresco/bootstrap/scheduledActionsFolder.xml
diff --git a/src/main/resources/alfresco/bootstrap/sharedSpace.xml b/repository/src/main/resources/alfresco/bootstrap/sharedSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/sharedSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/sharedSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config.xml b/repository/src/main/resources/alfresco/bootstrap/site/surf-config.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config.xml
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config.xml
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config/content0.bin b/repository/src/main/resources/alfresco/bootstrap/site/surf-config/content0.bin
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config/content0.bin
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config/content0.bin
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config/content1.bin b/repository/src/main/resources/alfresco/bootstrap/site/surf-config/content1.bin
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config/content1.bin
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config/content1.bin
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config/content3.bin b/repository/src/main/resources/alfresco/bootstrap/site/surf-config/content3.bin
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config/content3.bin
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config/content3.bin
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config/content4.bin b/repository/src/main/resources/alfresco/bootstrap/site/surf-config/content4.bin
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config/content4.bin
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config/content4.bin
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config/content5.bin b/repository/src/main/resources/alfresco/bootstrap/site/surf-config/content5.bin
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config/content5.bin
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config/content5.bin
diff --git a/src/main/resources/alfresco/bootstrap/site/surf-config/content6.bin b/repository/src/main/resources/alfresco/bootstrap/site/surf-config/content6.bin
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/site/surf-config/content6.bin
rename to repository/src/main/resources/alfresco/bootstrap/site/surf-config/content6.bin
diff --git a/src/main/resources/alfresco/bootstrap/sitesSpace.xml b/repository/src/main/resources/alfresco/bootstrap/sitesSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/sitesSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/sitesSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml b/repository/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml
rename to repository/src/main/resources/alfresco/bootstrap/solrFacetsRootFolder.xml
diff --git a/src/main/resources/alfresco/bootstrap/spaces.xml b/repository/src/main/resources/alfresco/bootstrap/spaces.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/spaces.xml
rename to repository/src/main/resources/alfresco/bootstrap/spaces.xml
diff --git a/src/main/resources/alfresco/bootstrap/spacesArchive.xml b/repository/src/main/resources/alfresco/bootstrap/spacesArchive.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/spacesArchive.xml
rename to repository/src/main/resources/alfresco/bootstrap/spacesArchive.xml
diff --git a/src/main/resources/alfresco/bootstrap/spacesSmartFolderDownloads.xml b/repository/src/main/resources/alfresco/bootstrap/spacesSmartFolderDownloads.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/spacesSmartFolderDownloads.xml
rename to repository/src/main/resources/alfresco/bootstrap/spacesSmartFolderDownloads.xml
diff --git a/src/main/resources/alfresco/bootstrap/spacesSmartFolderTemplates.xml b/repository/src/main/resources/alfresco/bootstrap/spacesSmartFolderTemplates.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/spacesSmartFolderTemplates.xml
rename to repository/src/main/resources/alfresco/bootstrap/spacesSmartFolderTemplates.xml
diff --git a/src/main/resources/alfresco/bootstrap/syncSetDefinitionsSpace.xml b/repository/src/main/resources/alfresco/bootstrap/syncSetDefinitionsSpace.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/syncSetDefinitionsSpace.xml
rename to repository/src/main/resources/alfresco/bootstrap/syncSetDefinitionsSpace.xml
diff --git a/src/main/resources/alfresco/bootstrap/system.xml b/repository/src/main/resources/alfresco/bootstrap/system.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/system.xml
rename to repository/src/main/resources/alfresco/bootstrap/system.xml
diff --git a/src/main/resources/alfresco/bootstrap/systemRegistry.xml b/repository/src/main/resources/alfresco/bootstrap/systemRegistry.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/systemRegistry.xml
rename to repository/src/main/resources/alfresco/bootstrap/systemRegistry.xml
diff --git a/src/main/resources/alfresco/bootstrap/tagRootCategory.xml b/repository/src/main/resources/alfresco/bootstrap/tagRootCategory.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/tagRootCategory.xml
rename to repository/src/main/resources/alfresco/bootstrap/tagRootCategory.xml
diff --git a/src/main/resources/alfresco/bootstrap/transferSpaces.xml b/repository/src/main/resources/alfresco/bootstrap/transferSpaces.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/transferSpaces.xml
rename to repository/src/main/resources/alfresco/bootstrap/transferSpaces.xml
diff --git a/src/main/resources/alfresco/bootstrap/transferTargetRule.xml b/repository/src/main/resources/alfresco/bootstrap/transferTargetRule.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/transferTargetRule.xml
rename to repository/src/main/resources/alfresco/bootstrap/transferTargetRule.xml
diff --git a/src/main/resources/alfresco/bootstrap/transferTargetRuleFolder.xml b/repository/src/main/resources/alfresco/bootstrap/transferTargetRuleFolder.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/transferTargetRuleFolder.xml
rename to repository/src/main/resources/alfresco/bootstrap/transferTargetRuleFolder.xml
diff --git a/src/main/resources/alfresco/bootstrap/version2Store.xml b/repository/src/main/resources/alfresco/bootstrap/version2Store.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/version2Store.xml
rename to repository/src/main/resources/alfresco/bootstrap/version2Store.xml
diff --git a/src/main/resources/alfresco/bootstrap/webScripts.xml b/repository/src/main/resources/alfresco/bootstrap/webScripts.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webScripts.xml
rename to repository/src/main/resources/alfresco/bootstrap/webScripts.xml
diff --git a/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml b/repository/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml
rename to repository/src/main/resources/alfresco/bootstrap/webScriptsExtensions.xml
diff --git a/src/main/resources/alfresco/bootstrap/webScriptsReadme.xml b/repository/src/main/resources/alfresco/bootstrap/webScriptsReadme.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webScriptsReadme.xml
rename to repository/src/main/resources/alfresco/bootstrap/webScriptsReadme.xml
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.400.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.400.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.400.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.400.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.atom.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.desc.xml b/repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.desc.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.desc.xml
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.desc.xml
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.400.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.400.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.400.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.400.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.js b/repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.js
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.js
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/blogsearch.get.js
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.404.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.404.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.404.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.404.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.atom.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.desc.xml b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.desc.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.desc.xml
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.desc.xml
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.404.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.404.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.404.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.404.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js b/repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/categorysearch.get.js
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/folder.get.atom.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.atom.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/folder.get.atom.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.atom.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/folder.get.desc.xml b/repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.desc.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/folder.get.desc.xml
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.desc.xml
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/folder.get.html.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/folder.get.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/folder.get.js b/repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.js
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/folder.get.js
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/folder.get.js
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/readme.html b/repository/src/main/resources/alfresco/bootstrap/webscripts/readme.html
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/readme.html
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/readme.html
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/readmeExtension.html b/repository/src/main/resources/alfresco/bootstrap/webscripts/readmeExtension.html
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/readmeExtension.html
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/readmeExtension.html
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/readme_de.html b/repository/src/main/resources/alfresco/bootstrap/webscripts/readme_de.html
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/readme_de.html
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/readme_de.html
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/readme_fr.html b/repository/src/main/resources/alfresco/bootstrap/webscripts/readme_fr.html
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/readme_fr.html
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/readme_fr.html
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/readme_ja.html b/repository/src/main/resources/alfresco/bootstrap/webscripts/readme_ja.html
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/readme_ja.html
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/readme_ja.html
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/upload.get.desc.xml b/repository/src/main/resources/alfresco/bootstrap/webscripts/upload.get.desc.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/upload.get.desc.xml
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/upload.get.desc.xml
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/upload.get.html.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/upload.get.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/upload.get.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/upload.get.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/upload.post.desc.xml b/repository/src/main/resources/alfresco/bootstrap/webscripts/upload.post.desc.xml
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/upload.post.desc.xml
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/upload.post.desc.xml
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/upload.post.html.ftl b/repository/src/main/resources/alfresco/bootstrap/webscripts/upload.post.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/upload.post.html.ftl
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/upload.post.html.ftl
diff --git a/src/main/resources/alfresco/bootstrap/webscripts/upload.post.js b/repository/src/main/resources/alfresco/bootstrap/webscripts/upload.post.js
similarity index 100%
rename from src/main/resources/alfresco/bootstrap/webscripts/upload.post.js
rename to repository/src/main/resources/alfresco/bootstrap/webscripts/upload.post.js
diff --git a/src/main/resources/alfresco/bulk-import-context.xml b/repository/src/main/resources/alfresco/bulk-import-context.xml
similarity index 100%
rename from src/main/resources/alfresco/bulk-import-context.xml
rename to repository/src/main/resources/alfresco/bulk-import-context.xml
diff --git a/src/main/resources/alfresco/cache-context.xml b/repository/src/main/resources/alfresco/cache-context.xml
similarity index 100%
rename from src/main/resources/alfresco/cache-context.xml
rename to repository/src/main/resources/alfresco/cache-context.xml
diff --git a/src/main/resources/alfresco/caches.properties b/repository/src/main/resources/alfresco/caches.properties
similarity index 100%
rename from src/main/resources/alfresco/caches.properties
rename to repository/src/main/resources/alfresco/caches.properties
diff --git a/src/main/resources/alfresco/calendar-services-context.xml b/repository/src/main/resources/alfresco/calendar-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/calendar-services-context.xml
rename to repository/src/main/resources/alfresco/calendar-services-context.xml
diff --git a/src/main/resources/alfresco/client/config/repo-clients-apps.properties b/repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties
similarity index 100%
rename from src/main/resources/alfresco/client/config/repo-clients-apps.properties
rename to repository/src/main/resources/alfresco/client/config/repo-clients-apps.properties
diff --git a/src/main/resources/alfresco/comment-services-context.xml b/repository/src/main/resources/alfresco/comment-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/comment-services-context.xml
rename to repository/src/main/resources/alfresco/comment-services-context.xml
diff --git a/src/main/resources/alfresco/content-services-context.xml b/repository/src/main/resources/alfresco/content-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/content-services-context.xml
rename to repository/src/main/resources/alfresco/content-services-context.xml
diff --git a/src/main/resources/alfresco/copy-services-context.xml b/repository/src/main/resources/alfresco/copy-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/copy-services-context.xml
rename to repository/src/main/resources/alfresco/copy-services-context.xml
diff --git a/src/main/resources/alfresco/core-services-context.xml b/repository/src/main/resources/alfresco/core-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/core-services-context.xml
rename to repository/src/main/resources/alfresco/core-services-context.xml
diff --git a/src/main/resources/alfresco/custom-model-management-services-context.xml b/repository/src/main/resources/alfresco/custom-model-management-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/custom-model-management-services-context.xml
rename to repository/src/main/resources/alfresco/custom-model-management-services-context.xml
diff --git a/src/main/resources/alfresco/dao/dao-context.xml b/repository/src/main/resources/alfresco/dao/dao-context.xml
similarity index 100%
rename from src/main/resources/alfresco/dao/dao-context.xml
rename to repository/src/main/resources/alfresco/dao/dao-context.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml b/repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
rename to repository/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
diff --git a/src/main/resources/alfresco/dbscripts/db-schema-context.xml b/repository/src/main/resources/alfresco/dbscripts/db-schema-context.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/db-schema-context.xml
rename to repository/src/main/resources/alfresco/dbscripts/db-schema-context.xml
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/AclChangeSet-Tracking2.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/AclChangeSet-Tracking2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/AclChangeSet-Tracking2.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/AclChangeSet-Tracking2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/Solr-Tracking.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/Solr-Tracking.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/Solr-Tracking.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/Solr-Tracking.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Solr-Tracking.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Solr-Tracking.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Solr-Tracking.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Solr-Tracking.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/drop-activiti-feed-format.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/drop-activiti-feed-format.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/drop-activiti-feed-format.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/drop-activiti-feed-format.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/dropAlfQnameFKIndexes.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/dropAlfQnameFKIndexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/dropAlfQnameFKIndexes.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/dropAlfQnameFKIndexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/fix-Repo-seqs-order.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/fix-Repo-seqs-order.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/fix-Repo-seqs-order.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/fix-Repo-seqs-order.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/update-activiti-nullable-columns.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/update-activiti-nullable-columns.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/update-activiti-nullable-columns.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/update-activiti-nullable-columns.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/NodeDeleted.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/NodeDeleted.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/NodeDeleted.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/NodeDeleted.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/NodeDeleted.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/NodeDeleted.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/NodeDeleted.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/NodeDeleted.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-index-acl_id.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-index-acl_id.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-index-acl_id.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-index-acl_id.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-del-unused-after-5-16-2.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-del-unused-after-5-16-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-del-unused-after-5-16-2.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-del-unused-after-5-16-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5-16-4.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5-16-4.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5-16-4.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5-16-4.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/update-activiti-default-timestamp-column.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/update-activiti-default-timestamp-column.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/update-activiti-default-timestamp-column.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/update-activiti-default-timestamp-column.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5.19.0.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5.19.0.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5.19.0.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5.19.0.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes-2.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes-2.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.Dialect/change-set-indexes.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.Dialect/change-set-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.Dialect/change-set-indexes.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.Dialect/change-set-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/change-set-indexes.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/change-set-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/change-set-indexes.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/change-set-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-alf_server-table.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-alf_server-table.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-alf_server-table.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-alf_server-table.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-alf_server-table.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-alf_server-table.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-alf_server-table.sql
rename to repository/src/main/resources/alfresco/dbscripts/upgrade/6.3/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-alf_server-table.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql
rename to repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesV2.sql b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesV2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesV2.sql
rename to repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesV2.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTables.sql b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTables.sql
rename to repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql
rename to repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesV2.sql b/repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesV2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesV2.sql
rename to repository/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesV2.sql
diff --git a/src/main/resources/alfresco/deprecated-context.xml b/repository/src/main/resources/alfresco/deprecated-context.xml
similarity index 100%
rename from src/main/resources/alfresco/deprecated-context.xml
rename to repository/src/main/resources/alfresco/deprecated-context.xml
diff --git a/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml b/repository/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml
similarity index 100%
rename from src/main/resources/alfresco/deprecated-model-bootstrap-context.xml
rename to repository/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml
diff --git a/src/main/resources/alfresco/desktop/Alfresco.exe b/repository/src/main/resources/alfresco/desktop/Alfresco.exe
similarity index 100%
rename from src/main/resources/alfresco/desktop/Alfresco.exe
rename to repository/src/main/resources/alfresco/desktop/Alfresco.exe
diff --git a/src/main/resources/alfresco/desktop/dumpRequest.js b/repository/src/main/resources/alfresco/desktop/dumpRequest.js
similarity index 100%
rename from src/main/resources/alfresco/desktop/dumpRequest.js
rename to repository/src/main/resources/alfresco/desktop/dumpRequest.js
diff --git a/src/main/resources/alfresco/desktop/showDetails.js b/repository/src/main/resources/alfresco/desktop/showDetails.js
similarity index 100%
rename from src/main/resources/alfresco/desktop/showDetails.js
rename to repository/src/main/resources/alfresco/desktop/showDetails.js
diff --git a/src/main/resources/alfresco/desktop/urlLink.js b/repository/src/main/resources/alfresco/desktop/urlLink.js
similarity index 100%
rename from src/main/resources/alfresco/desktop/urlLink.js
rename to repository/src/main/resources/alfresco/desktop/urlLink.js
diff --git a/src/main/resources/alfresco/discussions-services-context.xml b/repository/src/main/resources/alfresco/discussions-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/discussions-services-context.xml
rename to repository/src/main/resources/alfresco/discussions-services-context.xml
diff --git a/src/main/resources/alfresco/distributionpolicies-context.xml b/repository/src/main/resources/alfresco/distributionpolicies-context.xml
similarity index 100%
rename from src/main/resources/alfresco/distributionpolicies-context.xml
rename to repository/src/main/resources/alfresco/distributionpolicies-context.xml
diff --git a/src/main/resources/alfresco/domain/cache-strategies.properties b/repository/src/main/resources/alfresco/domain/cache-strategies.properties
similarity index 100%
rename from src/main/resources/alfresco/domain/cache-strategies.properties
rename to repository/src/main/resources/alfresco/domain/cache-strategies.properties
diff --git a/src/main/resources/alfresco/domain/quartz.properties b/repository/src/main/resources/alfresco/domain/quartz.properties
similarity index 100%
rename from src/main/resources/alfresco/domain/quartz.properties
rename to repository/src/main/resources/alfresco/domain/quartz.properties
diff --git a/src/main/resources/alfresco/domain/transaction.properties b/repository/src/main/resources/alfresco/domain/transaction.properties
similarity index 100%
rename from src/main/resources/alfresco/domain/transaction.properties
rename to repository/src/main/resources/alfresco/domain/transaction.properties
diff --git a/src/main/resources/alfresco/download-services-context.xml b/repository/src/main/resources/alfresco/download-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/download-services-context.xml
rename to repository/src/main/resources/alfresco/download-services-context.xml
diff --git a/src/main/resources/alfresco/encryption-context.xml b/repository/src/main/resources/alfresco/encryption-context.xml
similarity index 100%
rename from src/main/resources/alfresco/encryption-context.xml
rename to repository/src/main/resources/alfresco/encryption-context.xml
diff --git a/src/main/resources/alfresco/events-context.xml b/repository/src/main/resources/alfresco/events-context.xml
similarity index 100%
rename from src/main/resources/alfresco/events-context.xml
rename to repository/src/main/resources/alfresco/events-context.xml
diff --git a/src/main/resources/alfresco/events2-context.xml b/repository/src/main/resources/alfresco/events2-context.xml
similarity index 100%
rename from src/main/resources/alfresco/events2-context.xml
rename to repository/src/main/resources/alfresco/events2-context.xml
diff --git a/src/main/resources/alfresco/extension/activiti-adhoc-timer-messages.properties.sample b/repository/src/main/resources/alfresco/extension/activiti-adhoc-timer-messages.properties.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/activiti-adhoc-timer-messages.properties.sample
rename to repository/src/main/resources/alfresco/extension/activiti-adhoc-timer-messages.properties.sample
diff --git a/src/main/resources/alfresco/extension/activiti-adhoc-timer-workflow-context.xml.sample b/repository/src/main/resources/alfresco/extension/activiti-adhoc-timer-workflow-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/activiti-adhoc-timer-workflow-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/activiti-adhoc-timer-workflow-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/activiti-adhoc-timer.bpmn20.xml.sample b/repository/src/main/resources/alfresco/extension/activiti-adhoc-timer.bpmn20.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/activiti-adhoc-timer.bpmn20.xml.sample
rename to repository/src/main/resources/alfresco/extension/activiti-adhoc-timer.bpmn20.xml.sample
diff --git a/src/main/resources/alfresco/extension/aggregating-store-context.xml.sample b/repository/src/main/resources/alfresco/extension/aggregating-store-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/aggregating-store-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/aggregating-store-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/audit/alfresco-audit-example-extractors.xml.sample b/repository/src/main/resources/alfresco/extension/audit/alfresco-audit-example-extractors.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/audit/alfresco-audit-example-extractors.xml.sample
rename to repository/src/main/resources/alfresco/extension/audit/alfresco-audit-example-extractors.xml.sample
diff --git a/src/main/resources/alfresco/extension/audit/alfresco-audit-example-login.xml.sample b/repository/src/main/resources/alfresco/extension/audit/alfresco-audit-example-login.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/audit/alfresco-audit-example-login.xml.sample
rename to repository/src/main/resources/alfresco/extension/audit/alfresco-audit-example-login.xml.sample
diff --git a/src/main/resources/alfresco/extension/benchmark-override-context.xml.sample b/repository/src/main/resources/alfresco/extension/benchmark-override-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/benchmark-override-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/benchmark-override-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/bm-remote-loader-context.xml.sample b/repository/src/main/resources/alfresco/extension/bm-remote-loader-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/bm-remote-loader-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/bm-remote-loader-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/bootstrap/split-person-cleanup-context.xml.sample b/repository/src/main/resources/alfresco/extension/bootstrap/split-person-cleanup-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/bootstrap/split-person-cleanup-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/bootstrap/split-person-cleanup-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/caching-content-store-context.xml.sample b/repository/src/main/resources/alfresco/extension/caching-content-store-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/caching-content-store-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/caching-content-store-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/content-expiration-debug-context.xml.sample b/repository/src/main/resources/alfresco/extension/content-expiration-debug-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/content-expiration-debug-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/content-expiration-debug-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/custom-log4j.properties.sample b/repository/src/main/resources/alfresco/extension/custom-log4j.properties.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/custom-log4j.properties.sample
rename to repository/src/main/resources/alfresco/extension/custom-log4j.properties.sample
diff --git a/src/main/resources/alfresco/extension/custom-metadata-extrators-context.xml.sample b/repository/src/main/resources/alfresco/extension/custom-metadata-extrators-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/custom-metadata-extrators-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/custom-metadata-extrators-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/custom-model-context.xml.sample b/repository/src/main/resources/alfresco/extension/custom-model-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/custom-model-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/custom-model-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/customModel.xml.sample b/repository/src/main/resources/alfresco/extension/customModel.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/customModel.xml.sample
rename to repository/src/main/resources/alfresco/extension/customModel.xml.sample
diff --git a/src/main/resources/alfresco/extension/disabled-avm-indexing-context.xml.sample b/repository/src/main/resources/alfresco/extension/disabled-avm-indexing-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/disabled-avm-indexing-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/disabled-avm-indexing-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/example-model-context.xml.sample b/repository/src/main/resources/alfresco/extension/example-model-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/example-model-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/example-model-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/exampleModel.xml.sample b/repository/src/main/resources/alfresco/extension/exampleModel.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/exampleModel.xml.sample
rename to repository/src/main/resources/alfresco/extension/exampleModel.xml.sample
diff --git a/src/main/resources/alfresco/extension/ghostscript-pdf-rendering-context.xml.sample b/repository/src/main/resources/alfresco/extension/ghostscript-pdf-rendering-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/ghostscript-pdf-rendering-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/ghostscript-pdf-rendering-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/index-tracking-context.xml.sample b/repository/src/main/resources/alfresco/extension/index-tracking-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/index-tracking-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/index-tracking-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/language-specific-index-and-search-context.xml.sample b/repository/src/main/resources/alfresco/extension/language-specific-index-and-search-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/language-specific-index-and-search-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/language-specific-index-and-search-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/lifecycle-messages.properties.sample b/repository/src/main/resources/alfresco/extension/lifecycle-messages.properties.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/lifecycle-messages.properties.sample
rename to repository/src/main/resources/alfresco/extension/lifecycle-messages.properties.sample
diff --git a/src/main/resources/alfresco/extension/lifecycle-process.bpmn20.xml.sample b/repository/src/main/resources/alfresco/extension/lifecycle-process.bpmn20.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/lifecycle-process.bpmn20.xml.sample
rename to repository/src/main/resources/alfresco/extension/lifecycle-process.bpmn20.xml.sample
diff --git a/src/main/resources/alfresco/extension/lifecycle-workflow-context.xml.sample b/repository/src/main/resources/alfresco/extension/lifecycle-workflow-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/lifecycle-workflow-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/lifecycle-workflow-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/lifecycleModel.xml.sample b/repository/src/main/resources/alfresco/extension/lifecycleModel.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/lifecycleModel.xml.sample
rename to repository/src/main/resources/alfresco/extension/lifecycleModel.xml.sample
diff --git a/src/main/resources/alfresco/extension/metadata-embedding-context.xml.sample b/repository/src/main/resources/alfresco/extension/metadata-embedding-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/metadata-embedding-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/metadata-embedding-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/mimetype/mimetypes-extension-map.xml.sample b/repository/src/main/resources/alfresco/extension/mimetype/mimetypes-extension-map.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/mimetype/mimetypes-extension-map.xml.sample
rename to repository/src/main/resources/alfresco/extension/mimetype/mimetypes-extension-map.xml.sample
diff --git a/src/main/resources/alfresco/extension/pdfminer-transform-context.xml.sample b/repository/src/main/resources/alfresco/extension/pdfminer-transform-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/pdfminer-transform-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/pdfminer-transform-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/replicating-content-services-context.xml.sample b/repository/src/main/resources/alfresco/extension/replicating-content-services-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/replicating-content-services-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/replicating-content-services-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample b/repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/scheduled-action-services-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/unsecured-public-services-security-context.xml.sample b/repository/src/main/resources/alfresco/extension/unsecured-public-services-security-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/unsecured-public-services-security-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/unsecured-public-services-security-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/video-thumbnail-context.xml.sample b/repository/src/main/resources/alfresco/extension/video-thumbnail-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/video-thumbnail-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/video-thumbnail-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/video-transformation-context.xml.sample b/repository/src/main/resources/alfresco/extension/video-transformation-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/video-transformation-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/video-transformation-context.xml.sample
diff --git a/src/main/resources/alfresco/extension/war-deployers-jboss-beans.xml.fragment.sample b/repository/src/main/resources/alfresco/extension/war-deployers-jboss-beans.xml.fragment.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/war-deployers-jboss-beans.xml.fragment.sample
rename to repository/src/main/resources/alfresco/extension/war-deployers-jboss-beans.xml.fragment.sample
diff --git a/src/main/resources/alfresco/extension/xpdf-transform-context.xml.sample b/repository/src/main/resources/alfresco/extension/xpdf-transform-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/extension/xpdf-transform-context.xml.sample
rename to repository/src/main/resources/alfresco/extension/xpdf-transform-context.xml.sample
diff --git a/src/main/resources/alfresco/favourites-service-context.xml b/repository/src/main/resources/alfresco/favourites-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/favourites-service-context.xml
rename to repository/src/main/resources/alfresco/favourites-service-context.xml
diff --git a/src/main/resources/alfresco/form-services-context.xml b/repository/src/main/resources/alfresco/form-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/form-services-context.xml
rename to repository/src/main/resources/alfresco/form-services-context.xml
diff --git a/src/main/resources/alfresco/heartbeat/heartbeat-context.xml b/repository/src/main/resources/alfresco/heartbeat/heartbeat-context.xml
similarity index 100%
rename from src/main/resources/alfresco/heartbeat/heartbeat-context.xml
rename to repository/src/main/resources/alfresco/heartbeat/heartbeat-context.xml
diff --git a/src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml b/repository/src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml
similarity index 100%
rename from src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml
rename to repository/src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml
diff --git a/src/main/resources/alfresco/ibatis/activities-SqlMapConfig.xml b/repository/src/main/resources/alfresco/ibatis/activities-SqlMapConfig.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/activities-SqlMapConfig.xml
rename to repository/src/main/resources/alfresco/ibatis/activities-SqlMapConfig.xml
diff --git a/src/main/resources/alfresco/ibatis/alfresco-SqlMapConfig.xml b/repository/src/main/resources/alfresco/ibatis/alfresco-SqlMapConfig.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/alfresco-SqlMapConfig.xml
rename to repository/src/main/resources/alfresco/ibatis/alfresco-SqlMapConfig.xml
diff --git a/src/main/resources/alfresco/ibatis/ibatis-context.xml b/repository/src/main/resources/alfresco/ibatis/ibatis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/ibatis-context.xml
rename to repository/src/main/resources/alfresco/ibatis/ibatis-context.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/alfresco-util-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/alfresco-util-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/alfresco-util-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/alfresco-util-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/appliedpatch-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/appliedpatch-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/appliedpatch-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/appliedpatch-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locale-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locale-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locale-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locale-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locks-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locks-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locks-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locks-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-children-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-children-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-children-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-children-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-update-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-update-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-update-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-update-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/patch-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/patch-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/patch-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/patch-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/permissions-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/permissions-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/permissions-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/permissions-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/propval-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/propval-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/propval-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/propval-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/qname-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/qname-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/qname-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/qname-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-archived-nodes-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-auditable-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-auditable-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-auditable-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-auditable-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-authorities-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-authorities-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-authorities-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-authorities-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-blogs-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-blogs-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-blogs-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-blogs-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-calendar-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-calendar-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-calendar-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-calendar-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-copy-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-copy-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-copy-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-copy-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-discussion-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-discussion-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-discussion-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-discussion-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-downloads-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-downloads-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-downloads-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-downloads-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-people-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-people-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-people-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-people-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-usages-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-usages-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-usages-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-usages-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/solr-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/solr-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/solr-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/solr-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/subscriptions-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/subscriptions-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/subscriptions-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/subscriptions-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/usage-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/usage-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/usage-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/usage-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-select-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-select-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/content-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/content-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/content-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/content-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/node-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/node-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/node-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/node-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
rename to repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nb.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nb.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nb.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nb.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_pt_BR.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_pt_BR.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_pt_BR.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_pt_BR.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nb.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nb.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nb.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nb.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_pt_BR.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_pt_BR.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_pt_BR.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_pt_BR.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_de.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_de.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_de.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_es.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_es.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_es.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_fr.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_fr.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_fr.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_it.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_it.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_it.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nb.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nb.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nb.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nb.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_pt_BR.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_pt_BR.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_pt_BR.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_pt_BR.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nb.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nb.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nb.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nb.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_pt_BR.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_pt_BR.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_pt_BR.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_pt_BR.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl
diff --git a/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl b/repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl
similarity index 100%
rename from src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl
rename to repository/src/main/resources/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl
diff --git a/src/main/resources/alfresco/imap/scripts/command-processor.js b/repository/src/main/resources/alfresco/imap/scripts/command-processor.js
similarity index 100%
rename from src/main/resources/alfresco/imap/scripts/command-processor.js
rename to repository/src/main/resources/alfresco/imap/scripts/command-processor.js
diff --git a/src/main/resources/alfresco/imap/scripts/command-search.js b/repository/src/main/resources/alfresco/imap/scripts/command-search.js
similarity index 100%
rename from src/main/resources/alfresco/imap/scripts/command-search.js
rename to repository/src/main/resources/alfresco/imap/scripts/command-search.js
diff --git a/src/main/resources/alfresco/imap/scripts/command-utils.js b/repository/src/main/resources/alfresco/imap/scripts/command-utils.js
similarity index 100%
rename from src/main/resources/alfresco/imap/scripts/command-utils.js
rename to repository/src/main/resources/alfresco/imap/scripts/command-utils.js
diff --git a/src/main/resources/alfresco/import-export-context.xml b/repository/src/main/resources/alfresco/import-export-context.xml
similarity index 100%
rename from src/main/resources/alfresco/import-export-context.xml
rename to repository/src/main/resources/alfresco/import-export-context.xml
diff --git a/src/main/resources/alfresco/invitation-service-context.xml b/repository/src/main/resources/alfresco/invitation-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/invitation-service-context.xml
rename to repository/src/main/resources/alfresco/invitation-service-context.xml
diff --git a/src/main/resources/alfresco/links-services-context.xml b/repository/src/main/resources/alfresco/links-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/links-services-context.xml
rename to repository/src/main/resources/alfresco/links-services-context.xml
diff --git a/src/main/resources/alfresco/logging-context.xml b/repository/src/main/resources/alfresco/logging-context.xml
similarity index 100%
rename from src/main/resources/alfresco/logging-context.xml
rename to repository/src/main/resources/alfresco/logging-context.xml
diff --git a/src/main/resources/alfresco/messages/action-config.properties b/repository/src/main/resources/alfresco/messages/action-config.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config.properties
rename to repository/src/main/resources/alfresco/messages/action-config.properties
diff --git a/src/main/resources/alfresco/messages/action-config_cs.properties b/repository/src/main/resources/alfresco/messages/action-config_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_cs.properties
rename to repository/src/main/resources/alfresco/messages/action-config_cs.properties
diff --git a/src/main/resources/alfresco/messages/action-config_da.properties b/repository/src/main/resources/alfresco/messages/action-config_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_da.properties
rename to repository/src/main/resources/alfresco/messages/action-config_da.properties
diff --git a/src/main/resources/alfresco/messages/action-config_de.properties b/repository/src/main/resources/alfresco/messages/action-config_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_de.properties
rename to repository/src/main/resources/alfresco/messages/action-config_de.properties
diff --git a/src/main/resources/alfresco/messages/action-config_es.properties b/repository/src/main/resources/alfresco/messages/action-config_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_es.properties
rename to repository/src/main/resources/alfresco/messages/action-config_es.properties
diff --git a/src/main/resources/alfresco/messages/action-config_fi.properties b/repository/src/main/resources/alfresco/messages/action-config_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_fi.properties
rename to repository/src/main/resources/alfresco/messages/action-config_fi.properties
diff --git a/src/main/resources/alfresco/messages/action-config_fr.properties b/repository/src/main/resources/alfresco/messages/action-config_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_fr.properties
rename to repository/src/main/resources/alfresco/messages/action-config_fr.properties
diff --git a/src/main/resources/alfresco/messages/action-config_it.properties b/repository/src/main/resources/alfresco/messages/action-config_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_it.properties
rename to repository/src/main/resources/alfresco/messages/action-config_it.properties
diff --git a/src/main/resources/alfresco/messages/action-config_ja.properties b/repository/src/main/resources/alfresco/messages/action-config_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_ja.properties
rename to repository/src/main/resources/alfresco/messages/action-config_ja.properties
diff --git a/src/main/resources/alfresco/messages/action-config_nb.properties b/repository/src/main/resources/alfresco/messages/action-config_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_nb.properties
rename to repository/src/main/resources/alfresco/messages/action-config_nb.properties
diff --git a/src/main/resources/alfresco/messages/action-config_nl.properties b/repository/src/main/resources/alfresco/messages/action-config_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_nl.properties
rename to repository/src/main/resources/alfresco/messages/action-config_nl.properties
diff --git a/src/main/resources/alfresco/messages/action-config_pl.properties b/repository/src/main/resources/alfresco/messages/action-config_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_pl.properties
rename to repository/src/main/resources/alfresco/messages/action-config_pl.properties
diff --git a/src/main/resources/alfresco/messages/action-config_pt_BR.properties b/repository/src/main/resources/alfresco/messages/action-config_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/action-config_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/action-config_ru.properties b/repository/src/main/resources/alfresco/messages/action-config_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_ru.properties
rename to repository/src/main/resources/alfresco/messages/action-config_ru.properties
diff --git a/src/main/resources/alfresco/messages/action-config_sv.properties b/repository/src/main/resources/alfresco/messages/action-config_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_sv.properties
rename to repository/src/main/resources/alfresco/messages/action-config_sv.properties
diff --git a/src/main/resources/alfresco/messages/action-config_zh_CN.properties b/repository/src/main/resources/alfresco/messages/action-config_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-config_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/action-config_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/action-service.properties b/repository/src/main/resources/alfresco/messages/action-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service.properties
rename to repository/src/main/resources/alfresco/messages/action-service.properties
diff --git a/src/main/resources/alfresco/messages/action-service_cs.properties b/repository/src/main/resources/alfresco/messages/action-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/action-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/action-service_da.properties b/repository/src/main/resources/alfresco/messages/action-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_da.properties
rename to repository/src/main/resources/alfresco/messages/action-service_da.properties
diff --git a/src/main/resources/alfresco/messages/action-service_de.properties b/repository/src/main/resources/alfresco/messages/action-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_de.properties
rename to repository/src/main/resources/alfresco/messages/action-service_de.properties
diff --git a/src/main/resources/alfresco/messages/action-service_es.properties b/repository/src/main/resources/alfresco/messages/action-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_es.properties
rename to repository/src/main/resources/alfresco/messages/action-service_es.properties
diff --git a/src/main/resources/alfresco/messages/action-service_fi.properties b/repository/src/main/resources/alfresco/messages/action-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/action-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/action-service_fr.properties b/repository/src/main/resources/alfresco/messages/action-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/action-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/action-service_it.properties b/repository/src/main/resources/alfresco/messages/action-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_it.properties
rename to repository/src/main/resources/alfresco/messages/action-service_it.properties
diff --git a/src/main/resources/alfresco/messages/action-service_ja.properties b/repository/src/main/resources/alfresco/messages/action-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/action-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/action-service_nb.properties b/repository/src/main/resources/alfresco/messages/action-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/action-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/action-service_nl.properties b/repository/src/main/resources/alfresco/messages/action-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/action-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/action-service_pl.properties b/repository/src/main/resources/alfresco/messages/action-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/action-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/action-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/action-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/action-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/action-service_ru.properties b/repository/src/main/resources/alfresco/messages/action-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/action-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/action-service_sv.properties b/repository/src/main/resources/alfresco/messages/action-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/action-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/action-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/action-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/action-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/action-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_cs.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_da.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_de.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_es.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_fi.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_fr.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_it.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_ja.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_nb.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_nl.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_pl.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_ru.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_sv.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/activiti-engine-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/activiti-engine-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activiti-engine-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/activiti-engine-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/activities-service.properties b/repository/src/main/resources/alfresco/messages/activities-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service.properties
rename to repository/src/main/resources/alfresco/messages/activities-service.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_cs.properties b/repository/src/main/resources/alfresco/messages/activities-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_da.properties b/repository/src/main/resources/alfresco/messages/activities-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_da.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_da.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_de.properties b/repository/src/main/resources/alfresco/messages/activities-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_de.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_de.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_es.properties b/repository/src/main/resources/alfresco/messages/activities-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_es.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_es.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_fi.properties b/repository/src/main/resources/alfresco/messages/activities-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_fr.properties b/repository/src/main/resources/alfresco/messages/activities-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_it.properties b/repository/src/main/resources/alfresco/messages/activities-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_it.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_it.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_ja.properties b/repository/src/main/resources/alfresco/messages/activities-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_nb.properties b/repository/src/main/resources/alfresco/messages/activities-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_nl.properties b/repository/src/main/resources/alfresco/messages/activities-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_pl.properties b/repository/src/main/resources/alfresco/messages/activities-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/activities-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_ru.properties b/repository/src/main/resources/alfresco/messages/activities-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_sv.properties b/repository/src/main/resources/alfresco/messages/activities-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/activities-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/activities-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activities-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/activities-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/activity-list.properties b/repository/src/main/resources/alfresco/messages/activity-list.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list.properties
rename to repository/src/main/resources/alfresco/messages/activity-list.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_cs.properties b/repository/src/main/resources/alfresco/messages/activity-list_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_cs.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_cs.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_da.properties b/repository/src/main/resources/alfresco/messages/activity-list_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_da.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_da.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_de.properties b/repository/src/main/resources/alfresco/messages/activity-list_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_de.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_de.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_es.properties b/repository/src/main/resources/alfresco/messages/activity-list_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_es.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_es.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_fi.properties b/repository/src/main/resources/alfresco/messages/activity-list_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_fi.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_fi.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_fr.properties b/repository/src/main/resources/alfresco/messages/activity-list_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_fr.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_fr.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_it.properties b/repository/src/main/resources/alfresco/messages/activity-list_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_it.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_it.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_ja.properties b/repository/src/main/resources/alfresco/messages/activity-list_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_ja.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_ja.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_nb.properties b/repository/src/main/resources/alfresco/messages/activity-list_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_nb.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_nb.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_nl.properties b/repository/src/main/resources/alfresco/messages/activity-list_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_nl.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_nl.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_pl.properties b/repository/src/main/resources/alfresco/messages/activity-list_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_pl.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_pl.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_pt_BR.properties b/repository/src/main/resources/alfresco/messages/activity-list_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_ru.properties b/repository/src/main/resources/alfresco/messages/activity-list_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_ru.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_ru.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_sv.properties b/repository/src/main/resources/alfresco/messages/activity-list_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_sv.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_sv.properties
diff --git a/src/main/resources/alfresco/messages/activity-list_zh_CN.properties b/repository/src/main/resources/alfresco/messages/activity-list_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/activity-list_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/activity-list_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/application-model.properties b/repository/src/main/resources/alfresco/messages/application-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model.properties
rename to repository/src/main/resources/alfresco/messages/application-model.properties
diff --git a/src/main/resources/alfresco/messages/application-model_cs.properties b/repository/src/main/resources/alfresco/messages/application-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/application-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/application-model_da.properties b/repository/src/main/resources/alfresco/messages/application-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_da.properties
rename to repository/src/main/resources/alfresco/messages/application-model_da.properties
diff --git a/src/main/resources/alfresco/messages/application-model_de.properties b/repository/src/main/resources/alfresco/messages/application-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_de.properties
rename to repository/src/main/resources/alfresco/messages/application-model_de.properties
diff --git a/src/main/resources/alfresco/messages/application-model_es.properties b/repository/src/main/resources/alfresco/messages/application-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_es.properties
rename to repository/src/main/resources/alfresco/messages/application-model_es.properties
diff --git a/src/main/resources/alfresco/messages/application-model_fi.properties b/repository/src/main/resources/alfresco/messages/application-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/application-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/application-model_fr.properties b/repository/src/main/resources/alfresco/messages/application-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/application-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/application-model_it.properties b/repository/src/main/resources/alfresco/messages/application-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_it.properties
rename to repository/src/main/resources/alfresco/messages/application-model_it.properties
diff --git a/src/main/resources/alfresco/messages/application-model_ja.properties b/repository/src/main/resources/alfresco/messages/application-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/application-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/application-model_nb.properties b/repository/src/main/resources/alfresco/messages/application-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/application-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/application-model_nl.properties b/repository/src/main/resources/alfresco/messages/application-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/application-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/application-model_pl.properties b/repository/src/main/resources/alfresco/messages/application-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/application-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/application-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/application-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/application-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/application-model_ru.properties b/repository/src/main/resources/alfresco/messages/application-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/application-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/application-model_sv.properties b/repository/src/main/resources/alfresco/messages/application-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/application-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/application-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/application-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/application-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/application-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/authentication.properties b/repository/src/main/resources/alfresco/messages/authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication.properties
rename to repository/src/main/resources/alfresco/messages/authentication.properties
diff --git a/src/main/resources/alfresco/messages/authentication_cs.properties b/repository/src/main/resources/alfresco/messages/authentication_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_cs.properties
rename to repository/src/main/resources/alfresco/messages/authentication_cs.properties
diff --git a/src/main/resources/alfresco/messages/authentication_da.properties b/repository/src/main/resources/alfresco/messages/authentication_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_da.properties
rename to repository/src/main/resources/alfresco/messages/authentication_da.properties
diff --git a/src/main/resources/alfresco/messages/authentication_de.properties b/repository/src/main/resources/alfresco/messages/authentication_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_de.properties
rename to repository/src/main/resources/alfresco/messages/authentication_de.properties
diff --git a/src/main/resources/alfresco/messages/authentication_es.properties b/repository/src/main/resources/alfresco/messages/authentication_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_es.properties
rename to repository/src/main/resources/alfresco/messages/authentication_es.properties
diff --git a/src/main/resources/alfresco/messages/authentication_fi.properties b/repository/src/main/resources/alfresco/messages/authentication_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_fi.properties
rename to repository/src/main/resources/alfresco/messages/authentication_fi.properties
diff --git a/src/main/resources/alfresco/messages/authentication_fr.properties b/repository/src/main/resources/alfresco/messages/authentication_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_fr.properties
rename to repository/src/main/resources/alfresco/messages/authentication_fr.properties
diff --git a/src/main/resources/alfresco/messages/authentication_it.properties b/repository/src/main/resources/alfresco/messages/authentication_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_it.properties
rename to repository/src/main/resources/alfresco/messages/authentication_it.properties
diff --git a/src/main/resources/alfresco/messages/authentication_ja.properties b/repository/src/main/resources/alfresco/messages/authentication_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_ja.properties
rename to repository/src/main/resources/alfresco/messages/authentication_ja.properties
diff --git a/src/main/resources/alfresco/messages/authentication_nb.properties b/repository/src/main/resources/alfresco/messages/authentication_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_nb.properties
rename to repository/src/main/resources/alfresco/messages/authentication_nb.properties
diff --git a/src/main/resources/alfresco/messages/authentication_nl.properties b/repository/src/main/resources/alfresco/messages/authentication_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_nl.properties
rename to repository/src/main/resources/alfresco/messages/authentication_nl.properties
diff --git a/src/main/resources/alfresco/messages/authentication_pl.properties b/repository/src/main/resources/alfresco/messages/authentication_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_pl.properties
rename to repository/src/main/resources/alfresco/messages/authentication_pl.properties
diff --git a/src/main/resources/alfresco/messages/authentication_pt_BR.properties b/repository/src/main/resources/alfresco/messages/authentication_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/authentication_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/authentication_ru.properties b/repository/src/main/resources/alfresco/messages/authentication_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_ru.properties
rename to repository/src/main/resources/alfresco/messages/authentication_ru.properties
diff --git a/src/main/resources/alfresco/messages/authentication_sv.properties b/repository/src/main/resources/alfresco/messages/authentication_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_sv.properties
rename to repository/src/main/resources/alfresco/messages/authentication_sv.properties
diff --git a/src/main/resources/alfresco/messages/authentication_zh_CN.properties b/repository/src/main/resources/alfresco/messages/authentication_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/authentication_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/authentication_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-content-template-examples_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-content-template-examples_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-content-template-examples_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-javascripts_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-javascripts_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-javascripts_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-example-smartfoldertemplates_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-imapScripts_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-imapScripts_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-imapScripts_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-javascripts_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-javascripts_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-javascripts_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-javascripts_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-readme-template_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-readme-template_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-readme-template_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-readme-template_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-spaces_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-spaces_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-spaces_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-spaces_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-templates_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-templates_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-templates_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-templates_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-tutorial_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-tutorial_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-tutorial_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-tutorial_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScriptsExtensions_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_cs.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_cs.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_cs.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_da.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_da.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_da.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_de.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_de.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_de.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_es.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_es.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_es.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_fi.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_fi.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_fi.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_fr.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_fr.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_fr.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_it.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_it.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_it.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_ja.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_ja.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_ja.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_nb.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_nb.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_nb.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_nl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_nl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_nl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_pl.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_pl.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_pl.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_ru.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_ru.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_ru.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_sv.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_sv.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_sv.properties
diff --git a/src/main/resources/alfresco/messages/bootstrap-webScripts_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bootstrap-webScripts_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bootstrap-webScripts_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bootstrap-webScripts_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages.properties b/repository/src/main/resources/alfresco/messages/bpm-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_cs.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_da.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_de.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_es.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_fi.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_fr.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_it.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_ja.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_nb.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_nl.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_pl.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_ru.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_sv.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/bpm-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/bpm-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/bpm-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/bpm-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/categories.properties b/repository/src/main/resources/alfresco/messages/categories.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories.properties
rename to repository/src/main/resources/alfresco/messages/categories.properties
diff --git a/src/main/resources/alfresco/messages/categories_cs.properties b/repository/src/main/resources/alfresco/messages/categories_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_cs.properties
rename to repository/src/main/resources/alfresco/messages/categories_cs.properties
diff --git a/src/main/resources/alfresco/messages/categories_da.properties b/repository/src/main/resources/alfresco/messages/categories_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_da.properties
rename to repository/src/main/resources/alfresco/messages/categories_da.properties
diff --git a/src/main/resources/alfresco/messages/categories_de.properties b/repository/src/main/resources/alfresco/messages/categories_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_de.properties
rename to repository/src/main/resources/alfresco/messages/categories_de.properties
diff --git a/src/main/resources/alfresco/messages/categories_es.properties b/repository/src/main/resources/alfresco/messages/categories_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_es.properties
rename to repository/src/main/resources/alfresco/messages/categories_es.properties
diff --git a/src/main/resources/alfresco/messages/categories_fi.properties b/repository/src/main/resources/alfresco/messages/categories_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_fi.properties
rename to repository/src/main/resources/alfresco/messages/categories_fi.properties
diff --git a/src/main/resources/alfresco/messages/categories_fr.properties b/repository/src/main/resources/alfresco/messages/categories_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_fr.properties
rename to repository/src/main/resources/alfresco/messages/categories_fr.properties
diff --git a/src/main/resources/alfresco/messages/categories_it.properties b/repository/src/main/resources/alfresco/messages/categories_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_it.properties
rename to repository/src/main/resources/alfresco/messages/categories_it.properties
diff --git a/src/main/resources/alfresco/messages/categories_ja.properties b/repository/src/main/resources/alfresco/messages/categories_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_ja.properties
rename to repository/src/main/resources/alfresco/messages/categories_ja.properties
diff --git a/src/main/resources/alfresco/messages/categories_nb.properties b/repository/src/main/resources/alfresco/messages/categories_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_nb.properties
rename to repository/src/main/resources/alfresco/messages/categories_nb.properties
diff --git a/src/main/resources/alfresco/messages/categories_nl.properties b/repository/src/main/resources/alfresco/messages/categories_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_nl.properties
rename to repository/src/main/resources/alfresco/messages/categories_nl.properties
diff --git a/src/main/resources/alfresco/messages/categories_pl.properties b/repository/src/main/resources/alfresco/messages/categories_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_pl.properties
rename to repository/src/main/resources/alfresco/messages/categories_pl.properties
diff --git a/src/main/resources/alfresco/messages/categories_pt_BR.properties b/repository/src/main/resources/alfresco/messages/categories_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/categories_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/categories_ru.properties b/repository/src/main/resources/alfresco/messages/categories_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_ru.properties
rename to repository/src/main/resources/alfresco/messages/categories_ru.properties
diff --git a/src/main/resources/alfresco/messages/categories_sv.properties b/repository/src/main/resources/alfresco/messages/categories_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_sv.properties
rename to repository/src/main/resources/alfresco/messages/categories_sv.properties
diff --git a/src/main/resources/alfresco/messages/categories_zh_CN.properties b/repository/src/main/resources/alfresco/messages/categories_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/categories_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/categories_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/coci-service.properties b/repository/src/main/resources/alfresco/messages/coci-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service.properties
rename to repository/src/main/resources/alfresco/messages/coci-service.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_cs.properties b/repository/src/main/resources/alfresco/messages/coci-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_da.properties b/repository/src/main/resources/alfresco/messages/coci-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_da.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_da.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_de.properties b/repository/src/main/resources/alfresco/messages/coci-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_de.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_de.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_es.properties b/repository/src/main/resources/alfresco/messages/coci-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_es.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_es.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_fi.properties b/repository/src/main/resources/alfresco/messages/coci-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_fr.properties b/repository/src/main/resources/alfresco/messages/coci-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_it.properties b/repository/src/main/resources/alfresco/messages/coci-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_it.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_it.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_ja.properties b/repository/src/main/resources/alfresco/messages/coci-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_nb.properties b/repository/src/main/resources/alfresco/messages/coci-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_nl.properties b/repository/src/main/resources/alfresco/messages/coci-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_pl.properties b/repository/src/main/resources/alfresco/messages/coci-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/coci-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_ru.properties b/repository/src/main/resources/alfresco/messages/coci-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_sv.properties b/repository/src/main/resources/alfresco/messages/coci-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/coci-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/coci-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/coci-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/coci-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_cs.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_cs.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_cs.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_da.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_da.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_da.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_de.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_de.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_de.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_es.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_es.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_es.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_fi.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_fi.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_fi.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_fr.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_fr.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_fr.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_it.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_it.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_it.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_ja.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_ja.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_ja.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_nb.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_nb.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_nb.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_nl.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_nl.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_nl.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_pl.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_pl.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_pl.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_ru.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_ru.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_ru.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_sv.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_sv.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_sv.properties
diff --git a/src/main/resources/alfresco/messages/content-filter-languages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/content-filter-languages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-filter-languages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/content-filter-languages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/content-model.properties b/repository/src/main/resources/alfresco/messages/content-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model.properties
rename to repository/src/main/resources/alfresco/messages/content-model.properties
diff --git a/src/main/resources/alfresco/messages/content-model_cs.properties b/repository/src/main/resources/alfresco/messages/content-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/content-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/content-model_da.properties b/repository/src/main/resources/alfresco/messages/content-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_da.properties
rename to repository/src/main/resources/alfresco/messages/content-model_da.properties
diff --git a/src/main/resources/alfresco/messages/content-model_de.properties b/repository/src/main/resources/alfresco/messages/content-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_de.properties
rename to repository/src/main/resources/alfresco/messages/content-model_de.properties
diff --git a/src/main/resources/alfresco/messages/content-model_es.properties b/repository/src/main/resources/alfresco/messages/content-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_es.properties
rename to repository/src/main/resources/alfresco/messages/content-model_es.properties
diff --git a/src/main/resources/alfresco/messages/content-model_fi.properties b/repository/src/main/resources/alfresco/messages/content-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/content-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/content-model_fr.properties b/repository/src/main/resources/alfresco/messages/content-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/content-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/content-model_it.properties b/repository/src/main/resources/alfresco/messages/content-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_it.properties
rename to repository/src/main/resources/alfresco/messages/content-model_it.properties
diff --git a/src/main/resources/alfresco/messages/content-model_ja.properties b/repository/src/main/resources/alfresco/messages/content-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/content-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/content-model_nb.properties b/repository/src/main/resources/alfresco/messages/content-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/content-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/content-model_nl.properties b/repository/src/main/resources/alfresco/messages/content-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/content-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/content-model_pl.properties b/repository/src/main/resources/alfresco/messages/content-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/content-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/content-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/content-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/content-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/content-model_ru.properties b/repository/src/main/resources/alfresco/messages/content-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/content-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/content-model_sv.properties b/repository/src/main/resources/alfresco/messages/content-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/content-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/content-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/content-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/content-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/content-service.properties b/repository/src/main/resources/alfresco/messages/content-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/content-service.properties
rename to repository/src/main/resources/alfresco/messages/content-service.properties
diff --git a/src/main/resources/alfresco/messages/copy-service.properties b/repository/src/main/resources/alfresco/messages/copy-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service.properties
rename to repository/src/main/resources/alfresco/messages/copy-service.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_cs.properties b/repository/src/main/resources/alfresco/messages/copy-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_da.properties b/repository/src/main/resources/alfresco/messages/copy-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_da.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_da.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_de.properties b/repository/src/main/resources/alfresco/messages/copy-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_de.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_de.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_es.properties b/repository/src/main/resources/alfresco/messages/copy-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_es.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_es.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_fi.properties b/repository/src/main/resources/alfresco/messages/copy-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_fr.properties b/repository/src/main/resources/alfresco/messages/copy-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_it.properties b/repository/src/main/resources/alfresco/messages/copy-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_it.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_it.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_ja.properties b/repository/src/main/resources/alfresco/messages/copy-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_nb.properties b/repository/src/main/resources/alfresco/messages/copy-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_nl.properties b/repository/src/main/resources/alfresco/messages/copy-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_pl.properties b/repository/src/main/resources/alfresco/messages/copy-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/copy-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_ru.properties b/repository/src/main/resources/alfresco/messages/copy-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_sv.properties b/repository/src/main/resources/alfresco/messages/copy-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/copy-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/copy-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/copy-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/copy-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service.properties b/repository/src/main/resources/alfresco/messages/custommodel-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_cs.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_da.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_da.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_da.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_de.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_de.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_de.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_es.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_es.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_es.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_fi.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_fr.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_it.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_it.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_it.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_ja.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_nb.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_nl.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_pl.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_ru.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_sv.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/custommodel-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/custommodel-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/custommodel-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/custommodel-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages.properties b/repository/src/main/resources/alfresco/messages/discussion-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_cs.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_da.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_de.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_es.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_fi.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_fr.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_it.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_ja.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_nb.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_nl.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_pl.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_ru.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_sv.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/discussion-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/discussion-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/discussion-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/discussion-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_cs.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_da.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_da.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_da.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_de.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_de.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_de.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_es.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_es.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_es.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_fi.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_fr.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_it.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_it.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_it.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_ja.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_nb.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_nl.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_pl.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_ru.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_sv.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/distributionpolicies-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/distributionpolicies-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/distributionpolicies-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/distributionpolicies-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service.properties b/repository/src/main/resources/alfresco/messages/doclink-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_cs.properties b/repository/src/main/resources/alfresco/messages/doclink-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_da.properties b/repository/src/main/resources/alfresco/messages/doclink-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_da.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_da.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_de.properties b/repository/src/main/resources/alfresco/messages/doclink-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_de.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_de.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_es.properties b/repository/src/main/resources/alfresco/messages/doclink-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_es.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_es.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_fi.properties b/repository/src/main/resources/alfresco/messages/doclink-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_fr.properties b/repository/src/main/resources/alfresco/messages/doclink-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_it.properties b/repository/src/main/resources/alfresco/messages/doclink-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_it.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_it.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_ja.properties b/repository/src/main/resources/alfresco/messages/doclink-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_nb.properties b/repository/src/main/resources/alfresco/messages/doclink-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_nl.properties b/repository/src/main/resources/alfresco/messages/doclink-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_pl.properties b/repository/src/main/resources/alfresco/messages/doclink-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/doclink-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_ru.properties b/repository/src/main/resources/alfresco/messages/doclink-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_sv.properties b/repository/src/main/resources/alfresco/messages/doclink-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/doclink-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/doclink-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/doclink-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/doclink-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/download-model.properties b/repository/src/main/resources/alfresco/messages/download-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model.properties
rename to repository/src/main/resources/alfresco/messages/download-model.properties
diff --git a/src/main/resources/alfresco/messages/download-model_cs.properties b/repository/src/main/resources/alfresco/messages/download-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/download-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/download-model_da.properties b/repository/src/main/resources/alfresco/messages/download-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_da.properties
rename to repository/src/main/resources/alfresco/messages/download-model_da.properties
diff --git a/src/main/resources/alfresco/messages/download-model_de.properties b/repository/src/main/resources/alfresco/messages/download-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_de.properties
rename to repository/src/main/resources/alfresco/messages/download-model_de.properties
diff --git a/src/main/resources/alfresco/messages/download-model_es.properties b/repository/src/main/resources/alfresco/messages/download-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_es.properties
rename to repository/src/main/resources/alfresco/messages/download-model_es.properties
diff --git a/src/main/resources/alfresco/messages/download-model_fi.properties b/repository/src/main/resources/alfresco/messages/download-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/download-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/download-model_fr.properties b/repository/src/main/resources/alfresco/messages/download-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/download-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/download-model_it.properties b/repository/src/main/resources/alfresco/messages/download-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_it.properties
rename to repository/src/main/resources/alfresco/messages/download-model_it.properties
diff --git a/src/main/resources/alfresco/messages/download-model_ja.properties b/repository/src/main/resources/alfresco/messages/download-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/download-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/download-model_nb.properties b/repository/src/main/resources/alfresco/messages/download-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/download-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/download-model_nl.properties b/repository/src/main/resources/alfresco/messages/download-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/download-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/download-model_pl.properties b/repository/src/main/resources/alfresco/messages/download-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/download-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/download-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/download-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/download-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/download-model_ru.properties b/repository/src/main/resources/alfresco/messages/download-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/download-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/download-model_sv.properties b/repository/src/main/resources/alfresco/messages/download-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/download-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/download-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/download-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/download-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/download-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model.properties b/repository/src/main/resources/alfresco/messages/email-server-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_cs.properties b/repository/src/main/resources/alfresco/messages/email-server-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_da.properties b/repository/src/main/resources/alfresco/messages/email-server-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_da.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_da.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_de.properties b/repository/src/main/resources/alfresco/messages/email-server-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_de.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_de.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_es.properties b/repository/src/main/resources/alfresco/messages/email-server-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_es.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_es.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_fi.properties b/repository/src/main/resources/alfresco/messages/email-server-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_fr.properties b/repository/src/main/resources/alfresco/messages/email-server-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_it.properties b/repository/src/main/resources/alfresco/messages/email-server-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_it.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_it.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_ja.properties b/repository/src/main/resources/alfresco/messages/email-server-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_nb.properties b/repository/src/main/resources/alfresco/messages/email-server-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_nl.properties b/repository/src/main/resources/alfresco/messages/email-server-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_pl.properties b/repository/src/main/resources/alfresco/messages/email-server-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/email-server-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_ru.properties b/repository/src/main/resources/alfresco/messages/email-server-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_sv.properties b/repository/src/main/resources/alfresco/messages/email-server-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/email-server-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/email-server-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-server-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/email-server-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/email-service.properties b/repository/src/main/resources/alfresco/messages/email-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service.properties
rename to repository/src/main/resources/alfresco/messages/email-service.properties
diff --git a/src/main/resources/alfresco/messages/email-service_cs.properties b/repository/src/main/resources/alfresco/messages/email-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/email-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/email-service_da.properties b/repository/src/main/resources/alfresco/messages/email-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_da.properties
rename to repository/src/main/resources/alfresco/messages/email-service_da.properties
diff --git a/src/main/resources/alfresco/messages/email-service_de.properties b/repository/src/main/resources/alfresco/messages/email-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_de.properties
rename to repository/src/main/resources/alfresco/messages/email-service_de.properties
diff --git a/src/main/resources/alfresco/messages/email-service_es.properties b/repository/src/main/resources/alfresco/messages/email-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_es.properties
rename to repository/src/main/resources/alfresco/messages/email-service_es.properties
diff --git a/src/main/resources/alfresco/messages/email-service_fi.properties b/repository/src/main/resources/alfresco/messages/email-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/email-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/email-service_fr.properties b/repository/src/main/resources/alfresco/messages/email-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/email-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/email-service_it.properties b/repository/src/main/resources/alfresco/messages/email-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_it.properties
rename to repository/src/main/resources/alfresco/messages/email-service_it.properties
diff --git a/src/main/resources/alfresco/messages/email-service_ja.properties b/repository/src/main/resources/alfresco/messages/email-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/email-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/email-service_nb.properties b/repository/src/main/resources/alfresco/messages/email-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/email-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/email-service_nl.properties b/repository/src/main/resources/alfresco/messages/email-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/email-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/email-service_pl.properties b/repository/src/main/resources/alfresco/messages/email-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/email-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/email-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/email-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/email-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/email-service_ru.properties b/repository/src/main/resources/alfresco/messages/email-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/email-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/email-service_sv.properties b/repository/src/main/resources/alfresco/messages/email-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/email-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/email-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/email-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/email-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/email-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service.properties b/repository/src/main/resources/alfresco/messages/file-folder-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_cs.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_da.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_da.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_da.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_de.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_de.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_de.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_es.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_es.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_es.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_fi.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_fr.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_it.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_it.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_it.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_ja.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_nb.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_nl.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_pl.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_ru.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_sv.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/file-folder-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/file-folder-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/file-folder-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/file-folder-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/form-service.properties b/repository/src/main/resources/alfresco/messages/form-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service.properties
rename to repository/src/main/resources/alfresco/messages/form-service.properties
diff --git a/src/main/resources/alfresco/messages/form-service_cs.properties b/repository/src/main/resources/alfresco/messages/form-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/form-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/form-service_da.properties b/repository/src/main/resources/alfresco/messages/form-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_da.properties
rename to repository/src/main/resources/alfresco/messages/form-service_da.properties
diff --git a/src/main/resources/alfresco/messages/form-service_de.properties b/repository/src/main/resources/alfresco/messages/form-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_de.properties
rename to repository/src/main/resources/alfresco/messages/form-service_de.properties
diff --git a/src/main/resources/alfresco/messages/form-service_es.properties b/repository/src/main/resources/alfresco/messages/form-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_es.properties
rename to repository/src/main/resources/alfresco/messages/form-service_es.properties
diff --git a/src/main/resources/alfresco/messages/form-service_fi.properties b/repository/src/main/resources/alfresco/messages/form-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/form-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/form-service_fr.properties b/repository/src/main/resources/alfresco/messages/form-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/form-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/form-service_it.properties b/repository/src/main/resources/alfresco/messages/form-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_it.properties
rename to repository/src/main/resources/alfresco/messages/form-service_it.properties
diff --git a/src/main/resources/alfresco/messages/form-service_ja.properties b/repository/src/main/resources/alfresco/messages/form-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/form-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/form-service_nb.properties b/repository/src/main/resources/alfresco/messages/form-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/form-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/form-service_nl.properties b/repository/src/main/resources/alfresco/messages/form-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/form-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/form-service_pl.properties b/repository/src/main/resources/alfresco/messages/form-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/form-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/form-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/form-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/form-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/form-service_ru.properties b/repository/src/main/resources/alfresco/messages/form-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/form-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/form-service_sv.properties b/repository/src/main/resources/alfresco/messages/form-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/form-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/form-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/form-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/form-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/form-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/forum-model.properties b/repository/src/main/resources/alfresco/messages/forum-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model.properties
rename to repository/src/main/resources/alfresco/messages/forum-model.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_cs.properties b/repository/src/main/resources/alfresco/messages/forum-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_da.properties b/repository/src/main/resources/alfresco/messages/forum-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_da.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_da.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_de.properties b/repository/src/main/resources/alfresco/messages/forum-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_de.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_de.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_es.properties b/repository/src/main/resources/alfresco/messages/forum-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_es.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_es.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_fi.properties b/repository/src/main/resources/alfresco/messages/forum-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_fr.properties b/repository/src/main/resources/alfresco/messages/forum-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_it.properties b/repository/src/main/resources/alfresco/messages/forum-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_it.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_it.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_ja.properties b/repository/src/main/resources/alfresco/messages/forum-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_nb.properties b/repository/src/main/resources/alfresco/messages/forum-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_nl.properties b/repository/src/main/resources/alfresco/messages/forum-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_pl.properties b/repository/src/main/resources/alfresco/messages/forum-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/forum-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_ru.properties b/repository/src/main/resources/alfresco/messages/forum-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_sv.properties b/repository/src/main/resources/alfresco/messages/forum-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/forum-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/forum-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/forum-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/forum-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/imap-service.properties b/repository/src/main/resources/alfresco/messages/imap-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service.properties
rename to repository/src/main/resources/alfresco/messages/imap-service.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_cs.properties b/repository/src/main/resources/alfresco/messages/imap-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_da.properties b/repository/src/main/resources/alfresco/messages/imap-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_da.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_da.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_de.properties b/repository/src/main/resources/alfresco/messages/imap-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_de.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_de.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_es.properties b/repository/src/main/resources/alfresco/messages/imap-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_es.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_es.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_fi.properties b/repository/src/main/resources/alfresco/messages/imap-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_fr.properties b/repository/src/main/resources/alfresco/messages/imap-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_it.properties b/repository/src/main/resources/alfresco/messages/imap-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_it.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_it.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_ja.properties b/repository/src/main/resources/alfresco/messages/imap-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_nb.properties b/repository/src/main/resources/alfresco/messages/imap-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_nl.properties b/repository/src/main/resources/alfresco/messages/imap-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_pl.properties b/repository/src/main/resources/alfresco/messages/imap-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/imap-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_ru.properties b/repository/src/main/resources/alfresco/messages/imap-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_sv.properties b/repository/src/main/resources/alfresco/messages/imap-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/imap-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/imap-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/imap-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/imap-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_cs.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_cs.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_cs.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_da.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_da.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_da.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_de.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_de.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_de.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_es.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_es.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_es.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_fi.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_fi.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_fi.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_fr.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_fr.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_fr.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_it.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_it.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_it.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_ja.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_ja.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_ja.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_nb.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_nb.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_nb.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_nl.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_nl.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_nl.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_pl.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_pl.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_pl.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_pt_BR.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_ru.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_ru.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_ru.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_sv.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_sv.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_sv.properties
diff --git a/src/main/resources/alfresco/messages/initiate-inplace_zh_CN.properties b/repository/src/main/resources/alfresco/messages/initiate-inplace_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/initiate-inplace_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/initiate-inplace_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service.properties b/repository/src/main/resources/alfresco/messages/invitation-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_cs.properties b/repository/src/main/resources/alfresco/messages/invitation-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_da.properties b/repository/src/main/resources/alfresco/messages/invitation-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_da.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_da.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_de.properties b/repository/src/main/resources/alfresco/messages/invitation-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_de.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_de.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_es.properties b/repository/src/main/resources/alfresco/messages/invitation-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_es.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_es.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_fi.properties b/repository/src/main/resources/alfresco/messages/invitation-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_fr.properties b/repository/src/main/resources/alfresco/messages/invitation-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_it.properties b/repository/src/main/resources/alfresco/messages/invitation-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_it.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_it.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_ja.properties b/repository/src/main/resources/alfresco/messages/invitation-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_nb.properties b/repository/src/main/resources/alfresco/messages/invitation-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_nl.properties b/repository/src/main/resources/alfresco/messages/invitation-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_pl.properties b/repository/src/main/resources/alfresco/messages/invitation-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/invitation-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_ru.properties b/repository/src/main/resources/alfresco/messages/invitation-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_sv.properties b/repository/src/main/resources/alfresco/messages/invitation-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/invitation-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/invitation-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/invitation-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/invitation-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/lock-service.properties b/repository/src/main/resources/alfresco/messages/lock-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service.properties
rename to repository/src/main/resources/alfresco/messages/lock-service.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_cs.properties b/repository/src/main/resources/alfresco/messages/lock-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_da.properties b/repository/src/main/resources/alfresco/messages/lock-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_da.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_da.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_de.properties b/repository/src/main/resources/alfresco/messages/lock-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_de.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_de.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_es.properties b/repository/src/main/resources/alfresco/messages/lock-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_es.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_es.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_fi.properties b/repository/src/main/resources/alfresco/messages/lock-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_fr.properties b/repository/src/main/resources/alfresco/messages/lock-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_it.properties b/repository/src/main/resources/alfresco/messages/lock-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_it.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_it.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_ja.properties b/repository/src/main/resources/alfresco/messages/lock-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_nb.properties b/repository/src/main/resources/alfresco/messages/lock-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_nl.properties b/repository/src/main/resources/alfresco/messages/lock-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_pl.properties b/repository/src/main/resources/alfresco/messages/lock-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/lock-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_ru.properties b/repository/src/main/resources/alfresco/messages/lock-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_sv.properties b/repository/src/main/resources/alfresco/messages/lock-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/lock-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/lock-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/lock-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/lock-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/module-messages.properties b/repository/src/main/resources/alfresco/messages/module-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/module-messages.properties
rename to repository/src/main/resources/alfresco/messages/module-messages.properties
diff --git a/src/main/resources/alfresco/messages/notification-service.properties b/repository/src/main/resources/alfresco/messages/notification-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service.properties
rename to repository/src/main/resources/alfresco/messages/notification-service.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_cs.properties b/repository/src/main/resources/alfresco/messages/notification-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_da.properties b/repository/src/main/resources/alfresco/messages/notification-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_da.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_da.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_de.properties b/repository/src/main/resources/alfresco/messages/notification-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_de.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_de.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_es.properties b/repository/src/main/resources/alfresco/messages/notification-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_es.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_es.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_fi.properties b/repository/src/main/resources/alfresco/messages/notification-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_fr.properties b/repository/src/main/resources/alfresco/messages/notification-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_it.properties b/repository/src/main/resources/alfresco/messages/notification-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_it.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_it.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_ja.properties b/repository/src/main/resources/alfresco/messages/notification-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_nb.properties b/repository/src/main/resources/alfresco/messages/notification-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_nl.properties b/repository/src/main/resources/alfresco/messages/notification-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_pl.properties b/repository/src/main/resources/alfresco/messages/notification-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/notification-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_ru.properties b/repository/src/main/resources/alfresco/messages/notification-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_sv.properties b/repository/src/main/resources/alfresco/messages/notification-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/notification-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/notification-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/notification-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/notification-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/patch-service.properties b/repository/src/main/resources/alfresco/messages/patch-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/patch-service.properties
rename to repository/src/main/resources/alfresco/messages/patch-service.properties
diff --git a/src/main/resources/alfresco/messages/period-provider.properties b/repository/src/main/resources/alfresco/messages/period-provider.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider.properties
rename to repository/src/main/resources/alfresco/messages/period-provider.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_cs.properties b/repository/src/main/resources/alfresco/messages/period-provider_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_cs.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_cs.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_da.properties b/repository/src/main/resources/alfresco/messages/period-provider_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_da.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_da.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_de.properties b/repository/src/main/resources/alfresco/messages/period-provider_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_de.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_de.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_es.properties b/repository/src/main/resources/alfresco/messages/period-provider_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_es.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_es.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_fi.properties b/repository/src/main/resources/alfresco/messages/period-provider_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_fi.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_fi.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_fr.properties b/repository/src/main/resources/alfresco/messages/period-provider_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_fr.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_fr.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_it.properties b/repository/src/main/resources/alfresco/messages/period-provider_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_it.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_it.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_ja.properties b/repository/src/main/resources/alfresco/messages/period-provider_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_ja.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_ja.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_nb.properties b/repository/src/main/resources/alfresco/messages/period-provider_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_nb.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_nb.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_nl.properties b/repository/src/main/resources/alfresco/messages/period-provider_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_nl.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_nl.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_pl.properties b/repository/src/main/resources/alfresco/messages/period-provider_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_pl.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_pl.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_pt_BR.properties b/repository/src/main/resources/alfresco/messages/period-provider_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_ru.properties b/repository/src/main/resources/alfresco/messages/period-provider_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_ru.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_ru.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_sv.properties b/repository/src/main/resources/alfresco/messages/period-provider_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_sv.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_sv.properties
diff --git a/src/main/resources/alfresco/messages/period-provider_zh_CN.properties b/repository/src/main/resources/alfresco/messages/period-provider_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/period-provider_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/period-provider_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service.properties b/repository/src/main/resources/alfresco/messages/permissions-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_cs.properties b/repository/src/main/resources/alfresco/messages/permissions-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_da.properties b/repository/src/main/resources/alfresco/messages/permissions-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_da.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_da.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_de.properties b/repository/src/main/resources/alfresco/messages/permissions-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_de.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_de.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_es.properties b/repository/src/main/resources/alfresco/messages/permissions-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_es.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_es.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_fi.properties b/repository/src/main/resources/alfresco/messages/permissions-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_fr.properties b/repository/src/main/resources/alfresco/messages/permissions-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_it.properties b/repository/src/main/resources/alfresco/messages/permissions-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_it.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_it.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_ja.properties b/repository/src/main/resources/alfresco/messages/permissions-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_nb.properties b/repository/src/main/resources/alfresco/messages/permissions-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_nl.properties b/repository/src/main/resources/alfresco/messages/permissions-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_pl.properties b/repository/src/main/resources/alfresco/messages/permissions-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/permissions-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_ru.properties b/repository/src/main/resources/alfresco/messages/permissions-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_sv.properties b/repository/src/main/resources/alfresco/messages/permissions-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/permissions-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/permissions-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/permissions-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/permissions-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service.properties b/repository/src/main/resources/alfresco/messages/quickshare-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_cs.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_da.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_da.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_da.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_de.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_de.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_de.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_es.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_es.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_es.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_fi.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_fr.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_it.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_it.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_it.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_ja.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_nb.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_nl.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_pl.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_ru.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_sv.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/quickshare-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/quickshare-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/quickshare-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/quickshare-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config.properties b/repository/src/main/resources/alfresco/messages/rendition-config.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_cs.properties b/repository/src/main/resources/alfresco/messages/rendition-config_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_cs.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_cs.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_da.properties b/repository/src/main/resources/alfresco/messages/rendition-config_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_da.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_da.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_de.properties b/repository/src/main/resources/alfresco/messages/rendition-config_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_de.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_de.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_es.properties b/repository/src/main/resources/alfresco/messages/rendition-config_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_es.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_es.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_fi.properties b/repository/src/main/resources/alfresco/messages/rendition-config_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_fi.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_fi.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_fr.properties b/repository/src/main/resources/alfresco/messages/rendition-config_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_fr.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_fr.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_it.properties b/repository/src/main/resources/alfresco/messages/rendition-config_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_it.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_it.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_ja.properties b/repository/src/main/resources/alfresco/messages/rendition-config_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_ja.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_ja.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_nb.properties b/repository/src/main/resources/alfresco/messages/rendition-config_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_nb.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_nb.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_nl.properties b/repository/src/main/resources/alfresco/messages/rendition-config_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_nl.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_nl.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_pl.properties b/repository/src/main/resources/alfresco/messages/rendition-config_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_pl.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_pl.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_pt_BR.properties b/repository/src/main/resources/alfresco/messages/rendition-config_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_ru.properties b/repository/src/main/resources/alfresco/messages/rendition-config_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_ru.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_ru.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_sv.properties b/repository/src/main/resources/alfresco/messages/rendition-config_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_sv.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_sv.properties
diff --git a/src/main/resources/alfresco/messages/rendition-config_zh_CN.properties b/repository/src/main/resources/alfresco/messages/rendition-config_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rendition-config_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/rendition-config_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/replication.properties b/repository/src/main/resources/alfresco/messages/replication.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication.properties
rename to repository/src/main/resources/alfresco/messages/replication.properties
diff --git a/src/main/resources/alfresco/messages/replication_cs.properties b/repository/src/main/resources/alfresco/messages/replication_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_cs.properties
rename to repository/src/main/resources/alfresco/messages/replication_cs.properties
diff --git a/src/main/resources/alfresco/messages/replication_da.properties b/repository/src/main/resources/alfresco/messages/replication_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_da.properties
rename to repository/src/main/resources/alfresco/messages/replication_da.properties
diff --git a/src/main/resources/alfresco/messages/replication_de.properties b/repository/src/main/resources/alfresco/messages/replication_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_de.properties
rename to repository/src/main/resources/alfresco/messages/replication_de.properties
diff --git a/src/main/resources/alfresco/messages/replication_es.properties b/repository/src/main/resources/alfresco/messages/replication_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_es.properties
rename to repository/src/main/resources/alfresco/messages/replication_es.properties
diff --git a/src/main/resources/alfresco/messages/replication_fi.properties b/repository/src/main/resources/alfresco/messages/replication_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_fi.properties
rename to repository/src/main/resources/alfresco/messages/replication_fi.properties
diff --git a/src/main/resources/alfresco/messages/replication_fr.properties b/repository/src/main/resources/alfresco/messages/replication_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_fr.properties
rename to repository/src/main/resources/alfresco/messages/replication_fr.properties
diff --git a/src/main/resources/alfresco/messages/replication_it.properties b/repository/src/main/resources/alfresco/messages/replication_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_it.properties
rename to repository/src/main/resources/alfresco/messages/replication_it.properties
diff --git a/src/main/resources/alfresco/messages/replication_ja.properties b/repository/src/main/resources/alfresco/messages/replication_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_ja.properties
rename to repository/src/main/resources/alfresco/messages/replication_ja.properties
diff --git a/src/main/resources/alfresco/messages/replication_nb.properties b/repository/src/main/resources/alfresco/messages/replication_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_nb.properties
rename to repository/src/main/resources/alfresco/messages/replication_nb.properties
diff --git a/src/main/resources/alfresco/messages/replication_nl.properties b/repository/src/main/resources/alfresco/messages/replication_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_nl.properties
rename to repository/src/main/resources/alfresco/messages/replication_nl.properties
diff --git a/src/main/resources/alfresco/messages/replication_pl.properties b/repository/src/main/resources/alfresco/messages/replication_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_pl.properties
rename to repository/src/main/resources/alfresco/messages/replication_pl.properties
diff --git a/src/main/resources/alfresco/messages/replication_pt_BR.properties b/repository/src/main/resources/alfresco/messages/replication_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/replication_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/replication_ru.properties b/repository/src/main/resources/alfresco/messages/replication_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_ru.properties
rename to repository/src/main/resources/alfresco/messages/replication_ru.properties
diff --git a/src/main/resources/alfresco/messages/replication_sv.properties b/repository/src/main/resources/alfresco/messages/replication_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_sv.properties
rename to repository/src/main/resources/alfresco/messages/replication_sv.properties
diff --git a/src/main/resources/alfresco/messages/replication_zh_CN.properties b/repository/src/main/resources/alfresco/messages/replication_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/replication_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/replication_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-interpreter-help.properties b/repository/src/main/resources/alfresco/messages/repoadmin-interpreter-help.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-interpreter-help.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-interpreter-help.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-interpreter-help.txt b/repository/src/main/resources/alfresco/messages/repoadmin-interpreter-help.txt
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-interpreter-help.txt
rename to repository/src/main/resources/alfresco/messages/repoadmin-interpreter-help.txt
diff --git a/src/main/resources/alfresco/messages/repoadmin-service.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_cs.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_da.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_da.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_da.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_de.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_de.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_de.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_es.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_es.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_es.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_fi.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_fr.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_it.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_it.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_it.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_ja.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_nb.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_nl.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_pl.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_ru.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_sv.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/repoadmin-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/repoadmin-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/repoadmin-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/repoadmin-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_cs.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_da.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_de.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_es.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_fi.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_fr.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_it.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_ja.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_nb.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_nl.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_pl.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_ru.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_sv.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/reset-password-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/reset-password-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/reset-password-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/reset-password-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/rule-config.properties b/repository/src/main/resources/alfresco/messages/rule-config.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config.properties
rename to repository/src/main/resources/alfresco/messages/rule-config.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_cs.properties b/repository/src/main/resources/alfresco/messages/rule-config_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_cs.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_cs.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_da.properties b/repository/src/main/resources/alfresco/messages/rule-config_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_da.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_da.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_de.properties b/repository/src/main/resources/alfresco/messages/rule-config_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_de.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_de.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_es.properties b/repository/src/main/resources/alfresco/messages/rule-config_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_es.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_es.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_fi.properties b/repository/src/main/resources/alfresco/messages/rule-config_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_fi.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_fi.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_fr.properties b/repository/src/main/resources/alfresco/messages/rule-config_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_fr.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_fr.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_it.properties b/repository/src/main/resources/alfresco/messages/rule-config_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_it.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_it.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_ja.properties b/repository/src/main/resources/alfresco/messages/rule-config_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_ja.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_ja.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_nb.properties b/repository/src/main/resources/alfresco/messages/rule-config_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_nb.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_nb.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_nl.properties b/repository/src/main/resources/alfresco/messages/rule-config_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_nl.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_nl.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_pl.properties b/repository/src/main/resources/alfresco/messages/rule-config_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_pl.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_pl.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_pt_BR.properties b/repository/src/main/resources/alfresco/messages/rule-config_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_ru.properties b/repository/src/main/resources/alfresco/messages/rule-config_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_ru.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_ru.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_sv.properties b/repository/src/main/resources/alfresco/messages/rule-config_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_sv.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_sv.properties
diff --git a/src/main/resources/alfresco/messages/rule-config_zh_CN.properties b/repository/src/main/resources/alfresco/messages/rule-config_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/rule-config_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/rule-config_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/schema-update.properties b/repository/src/main/resources/alfresco/messages/schema-update.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/schema-update.properties
rename to repository/src/main/resources/alfresco/messages/schema-update.properties
diff --git a/src/main/resources/alfresco/messages/site-model.properties b/repository/src/main/resources/alfresco/messages/site-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model.properties
rename to repository/src/main/resources/alfresco/messages/site-model.properties
diff --git a/src/main/resources/alfresco/messages/site-model_cs.properties b/repository/src/main/resources/alfresco/messages/site-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/site-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/site-model_da.properties b/repository/src/main/resources/alfresco/messages/site-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_da.properties
rename to repository/src/main/resources/alfresco/messages/site-model_da.properties
diff --git a/src/main/resources/alfresco/messages/site-model_de.properties b/repository/src/main/resources/alfresco/messages/site-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_de.properties
rename to repository/src/main/resources/alfresco/messages/site-model_de.properties
diff --git a/src/main/resources/alfresco/messages/site-model_es.properties b/repository/src/main/resources/alfresco/messages/site-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_es.properties
rename to repository/src/main/resources/alfresco/messages/site-model_es.properties
diff --git a/src/main/resources/alfresco/messages/site-model_fi.properties b/repository/src/main/resources/alfresco/messages/site-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/site-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/site-model_fr.properties b/repository/src/main/resources/alfresco/messages/site-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/site-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/site-model_it.properties b/repository/src/main/resources/alfresco/messages/site-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_it.properties
rename to repository/src/main/resources/alfresco/messages/site-model_it.properties
diff --git a/src/main/resources/alfresco/messages/site-model_ja.properties b/repository/src/main/resources/alfresco/messages/site-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/site-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/site-model_nb.properties b/repository/src/main/resources/alfresco/messages/site-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/site-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/site-model_nl.properties b/repository/src/main/resources/alfresco/messages/site-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/site-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/site-model_pl.properties b/repository/src/main/resources/alfresco/messages/site-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/site-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/site-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/site-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/site-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/site-model_ru.properties b/repository/src/main/resources/alfresco/messages/site-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/site-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/site-model_sv.properties b/repository/src/main/resources/alfresco/messages/site-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/site-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/site-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/site-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/site-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/site-service.properties b/repository/src/main/resources/alfresco/messages/site-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service.properties
rename to repository/src/main/resources/alfresco/messages/site-service.properties
diff --git a/src/main/resources/alfresco/messages/site-service_cs.properties b/repository/src/main/resources/alfresco/messages/site-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/site-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/site-service_da.properties b/repository/src/main/resources/alfresco/messages/site-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_da.properties
rename to repository/src/main/resources/alfresco/messages/site-service_da.properties
diff --git a/src/main/resources/alfresco/messages/site-service_de.properties b/repository/src/main/resources/alfresco/messages/site-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_de.properties
rename to repository/src/main/resources/alfresco/messages/site-service_de.properties
diff --git a/src/main/resources/alfresco/messages/site-service_es.properties b/repository/src/main/resources/alfresco/messages/site-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_es.properties
rename to repository/src/main/resources/alfresco/messages/site-service_es.properties
diff --git a/src/main/resources/alfresco/messages/site-service_fi.properties b/repository/src/main/resources/alfresco/messages/site-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/site-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/site-service_fr.properties b/repository/src/main/resources/alfresco/messages/site-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/site-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/site-service_it.properties b/repository/src/main/resources/alfresco/messages/site-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_it.properties
rename to repository/src/main/resources/alfresco/messages/site-service_it.properties
diff --git a/src/main/resources/alfresco/messages/site-service_ja.properties b/repository/src/main/resources/alfresco/messages/site-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/site-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/site-service_nb.properties b/repository/src/main/resources/alfresco/messages/site-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/site-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/site-service_nl.properties b/repository/src/main/resources/alfresco/messages/site-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/site-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/site-service_pl.properties b/repository/src/main/resources/alfresco/messages/site-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/site-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/site-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/site-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/site-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/site-service_ru.properties b/repository/src/main/resources/alfresco/messages/site-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/site-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/site-service_sv.properties b/repository/src/main/resources/alfresco/messages/site-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/site-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/site-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/site-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/site-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/site-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/slingshot.properties b/repository/src/main/resources/alfresco/messages/slingshot.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot.properties
rename to repository/src/main/resources/alfresco/messages/slingshot.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_cs.properties b/repository/src/main/resources/alfresco/messages/slingshot_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_cs.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_cs.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_da.properties b/repository/src/main/resources/alfresco/messages/slingshot_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_da.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_da.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_de.properties b/repository/src/main/resources/alfresco/messages/slingshot_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_de.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_de.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_es.properties b/repository/src/main/resources/alfresco/messages/slingshot_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_es.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_es.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_fi.properties b/repository/src/main/resources/alfresco/messages/slingshot_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_fi.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_fi.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_fr.properties b/repository/src/main/resources/alfresco/messages/slingshot_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_fr.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_fr.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_it.properties b/repository/src/main/resources/alfresco/messages/slingshot_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_it.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_it.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_ja.properties b/repository/src/main/resources/alfresco/messages/slingshot_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_ja.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_ja.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_nb.properties b/repository/src/main/resources/alfresco/messages/slingshot_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_nb.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_nb.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_nl.properties b/repository/src/main/resources/alfresco/messages/slingshot_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_nl.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_nl.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_pl.properties b/repository/src/main/resources/alfresco/messages/slingshot_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_pl.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_pl.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_pt_BR.properties b/repository/src/main/resources/alfresco/messages/slingshot_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_ru.properties b/repository/src/main/resources/alfresco/messages/slingshot_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_ru.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_ru.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_sv.properties b/repository/src/main/resources/alfresco/messages/slingshot_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_sv.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_sv.properties
diff --git a/src/main/resources/alfresco/messages/slingshot_zh_CN.properties b/repository/src/main/resources/alfresco/messages/slingshot_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/slingshot_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/slingshot_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_cs.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_da.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_da.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_da.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_de.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_de.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_de.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_es.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_es.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_es.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_fi.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_fr.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_it.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_it.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_it.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_ja.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_nb.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_nl.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_pl.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_ru.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_sv.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/smartfolder-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/smartfolder-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/smartfolder-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/smartfolder-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service.properties b/repository/src/main/resources/alfresco/messages/subscription-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_cs.properties b/repository/src/main/resources/alfresco/messages/subscription-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_da.properties b/repository/src/main/resources/alfresco/messages/subscription-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_da.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_da.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_de.properties b/repository/src/main/resources/alfresco/messages/subscription-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_de.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_de.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_es.properties b/repository/src/main/resources/alfresco/messages/subscription-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_es.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_es.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_fi.properties b/repository/src/main/resources/alfresco/messages/subscription-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_fr.properties b/repository/src/main/resources/alfresco/messages/subscription-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_it.properties b/repository/src/main/resources/alfresco/messages/subscription-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_it.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_it.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_ja.properties b/repository/src/main/resources/alfresco/messages/subscription-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_nb.properties b/repository/src/main/resources/alfresco/messages/subscription-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_nl.properties b/repository/src/main/resources/alfresco/messages/subscription-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_pl.properties b/repository/src/main/resources/alfresco/messages/subscription-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/subscription-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_ru.properties b/repository/src/main/resources/alfresco/messages/subscription-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_sv.properties b/repository/src/main/resources/alfresco/messages/subscription-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/subscription-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/subscription-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/subscription-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/subscription-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/system-messages.properties b/repository/src/main/resources/alfresco/messages/system-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages.properties
rename to repository/src/main/resources/alfresco/messages/system-messages.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_cs.properties b/repository/src/main/resources/alfresco/messages/system-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_da.properties b/repository/src/main/resources/alfresco/messages/system-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_de.properties b/repository/src/main/resources/alfresco/messages/system-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_es.properties b/repository/src/main/resources/alfresco/messages/system-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_fi.properties b/repository/src/main/resources/alfresco/messages/system-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_fr.properties b/repository/src/main/resources/alfresco/messages/system-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_it.properties b/repository/src/main/resources/alfresco/messages/system-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_ja.properties b/repository/src/main/resources/alfresco/messages/system-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_nb.properties b/repository/src/main/resources/alfresco/messages/system-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_nl.properties b/repository/src/main/resources/alfresco/messages/system-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_pl.properties b/repository/src/main/resources/alfresco/messages/system-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/system-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_ru.properties b/repository/src/main/resources/alfresco/messages/system-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_sv.properties b/repository/src/main/resources/alfresco/messages/system-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/system-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/system-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/system-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/system-model.properties b/repository/src/main/resources/alfresco/messages/system-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model.properties
rename to repository/src/main/resources/alfresco/messages/system-model.properties
diff --git a/src/main/resources/alfresco/messages/system-model_cs.properties b/repository/src/main/resources/alfresco/messages/system-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/system-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/system-model_da.properties b/repository/src/main/resources/alfresco/messages/system-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_da.properties
rename to repository/src/main/resources/alfresco/messages/system-model_da.properties
diff --git a/src/main/resources/alfresco/messages/system-model_de.properties b/repository/src/main/resources/alfresco/messages/system-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_de.properties
rename to repository/src/main/resources/alfresco/messages/system-model_de.properties
diff --git a/src/main/resources/alfresco/messages/system-model_es.properties b/repository/src/main/resources/alfresco/messages/system-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_es.properties
rename to repository/src/main/resources/alfresco/messages/system-model_es.properties
diff --git a/src/main/resources/alfresco/messages/system-model_fi.properties b/repository/src/main/resources/alfresco/messages/system-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/system-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/system-model_fr.properties b/repository/src/main/resources/alfresco/messages/system-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/system-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/system-model_it.properties b/repository/src/main/resources/alfresco/messages/system-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_it.properties
rename to repository/src/main/resources/alfresco/messages/system-model_it.properties
diff --git a/src/main/resources/alfresco/messages/system-model_ja.properties b/repository/src/main/resources/alfresco/messages/system-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/system-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/system-model_nb.properties b/repository/src/main/resources/alfresco/messages/system-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/system-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/system-model_nl.properties b/repository/src/main/resources/alfresco/messages/system-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/system-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/system-model_pl.properties b/repository/src/main/resources/alfresco/messages/system-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/system-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/system-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/system-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/system-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/system-model_ru.properties b/repository/src/main/resources/alfresco/messages/system-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/system-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/system-model_sv.properties b/repository/src/main/resources/alfresco/messages/system-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/system-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/system-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/system-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/system-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/system-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/template-service.properties b/repository/src/main/resources/alfresco/messages/template-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service.properties
rename to repository/src/main/resources/alfresco/messages/template-service.properties
diff --git a/src/main/resources/alfresco/messages/template-service_cs.properties b/repository/src/main/resources/alfresco/messages/template-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/template-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/template-service_da.properties b/repository/src/main/resources/alfresco/messages/template-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_da.properties
rename to repository/src/main/resources/alfresco/messages/template-service_da.properties
diff --git a/src/main/resources/alfresco/messages/template-service_de.properties b/repository/src/main/resources/alfresco/messages/template-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_de.properties
rename to repository/src/main/resources/alfresco/messages/template-service_de.properties
diff --git a/src/main/resources/alfresco/messages/template-service_es.properties b/repository/src/main/resources/alfresco/messages/template-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_es.properties
rename to repository/src/main/resources/alfresco/messages/template-service_es.properties
diff --git a/src/main/resources/alfresco/messages/template-service_fi.properties b/repository/src/main/resources/alfresco/messages/template-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/template-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/template-service_fr.properties b/repository/src/main/resources/alfresco/messages/template-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/template-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/template-service_it.properties b/repository/src/main/resources/alfresco/messages/template-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_it.properties
rename to repository/src/main/resources/alfresco/messages/template-service_it.properties
diff --git a/src/main/resources/alfresco/messages/template-service_ja.properties b/repository/src/main/resources/alfresco/messages/template-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/template-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/template-service_nb.properties b/repository/src/main/resources/alfresco/messages/template-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/template-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/template-service_nl.properties b/repository/src/main/resources/alfresco/messages/template-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/template-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/template-service_pl.properties b/repository/src/main/resources/alfresco/messages/template-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/template-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/template-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/template-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/template-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/template-service_ru.properties b/repository/src/main/resources/alfresco/messages/template-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/template-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/template-service_sv.properties b/repository/src/main/resources/alfresco/messages/template-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/template-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/template-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/template-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/template-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/template-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages.properties b/repository/src/main/resources/alfresco/messages/templates-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_cs.properties b/repository/src/main/resources/alfresco/messages/templates-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_da.properties b/repository/src/main/resources/alfresco/messages/templates-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_de.properties b/repository/src/main/resources/alfresco/messages/templates-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_es.properties b/repository/src/main/resources/alfresco/messages/templates-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_fi.properties b/repository/src/main/resources/alfresco/messages/templates-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_fr.properties b/repository/src/main/resources/alfresco/messages/templates-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_it.properties b/repository/src/main/resources/alfresco/messages/templates-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_ja.properties b/repository/src/main/resources/alfresco/messages/templates-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_nb.properties b/repository/src/main/resources/alfresco/messages/templates-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_nl.properties b/repository/src/main/resources/alfresco/messages/templates-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_pl.properties b/repository/src/main/resources/alfresco/messages/templates-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/templates-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_ru.properties b/repository/src/main/resources/alfresco/messages/templates-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_sv.properties b/repository/src/main/resources/alfresco/messages/templates-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/templates-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/templates-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/templates-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/templates-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/tenant-interpreter-help.properties b/repository/src/main/resources/alfresco/messages/tenant-interpreter-help.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/tenant-interpreter-help.properties
rename to repository/src/main/resources/alfresco/messages/tenant-interpreter-help.properties
diff --git a/src/main/resources/alfresco/messages/tenant-interpreter-help.txt b/repository/src/main/resources/alfresco/messages/tenant-interpreter-help.txt
similarity index 100%
rename from src/main/resources/alfresco/messages/tenant-interpreter-help.txt
rename to repository/src/main/resources/alfresco/messages/tenant-interpreter-help.txt
diff --git a/src/main/resources/alfresco/messages/transfer-model.properties b/repository/src/main/resources/alfresco/messages/transfer-model.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_cs.properties b/repository/src/main/resources/alfresco/messages/transfer-model_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_cs.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_cs.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_da.properties b/repository/src/main/resources/alfresco/messages/transfer-model_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_da.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_da.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_de.properties b/repository/src/main/resources/alfresco/messages/transfer-model_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_de.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_de.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_es.properties b/repository/src/main/resources/alfresco/messages/transfer-model_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_es.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_es.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_fi.properties b/repository/src/main/resources/alfresco/messages/transfer-model_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_fi.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_fi.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_fr.properties b/repository/src/main/resources/alfresco/messages/transfer-model_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_fr.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_fr.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_it.properties b/repository/src/main/resources/alfresco/messages/transfer-model_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_it.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_it.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_ja.properties b/repository/src/main/resources/alfresco/messages/transfer-model_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_ja.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_ja.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_nb.properties b/repository/src/main/resources/alfresco/messages/transfer-model_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_nb.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_nb.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_nl.properties b/repository/src/main/resources/alfresco/messages/transfer-model_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_nl.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_nl.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_pl.properties b/repository/src/main/resources/alfresco/messages/transfer-model_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_pl.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_pl.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_pt_BR.properties b/repository/src/main/resources/alfresco/messages/transfer-model_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_ru.properties b/repository/src/main/resources/alfresco/messages/transfer-model_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_ru.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_ru.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_sv.properties b/repository/src/main/resources/alfresco/messages/transfer-model_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_sv.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_sv.properties
diff --git a/src/main/resources/alfresco/messages/transfer-model_zh_CN.properties b/repository/src/main/resources/alfresco/messages/transfer-model_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-model_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/transfer-model_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service.properties b/repository/src/main/resources/alfresco/messages/transfer-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_cs.properties b/repository/src/main/resources/alfresco/messages/transfer-service_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_cs.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_cs.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_da.properties b/repository/src/main/resources/alfresco/messages/transfer-service_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_da.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_da.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_de.properties b/repository/src/main/resources/alfresco/messages/transfer-service_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_de.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_de.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_es.properties b/repository/src/main/resources/alfresco/messages/transfer-service_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_es.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_es.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_fi.properties b/repository/src/main/resources/alfresco/messages/transfer-service_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_fi.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_fi.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_fr.properties b/repository/src/main/resources/alfresco/messages/transfer-service_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_fr.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_fr.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_it.properties b/repository/src/main/resources/alfresco/messages/transfer-service_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_it.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_it.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_ja.properties b/repository/src/main/resources/alfresco/messages/transfer-service_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_ja.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_ja.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_nb.properties b/repository/src/main/resources/alfresco/messages/transfer-service_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_nb.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_nb.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_nl.properties b/repository/src/main/resources/alfresco/messages/transfer-service_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_nl.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_nl.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_pl.properties b/repository/src/main/resources/alfresco/messages/transfer-service_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_pl.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_pl.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_pt_BR.properties b/repository/src/main/resources/alfresco/messages/transfer-service_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_ru.properties b/repository/src/main/resources/alfresco/messages/transfer-service_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_ru.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_ru.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_sv.properties b/repository/src/main/resources/alfresco/messages/transfer-service_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_sv.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_sv.properties
diff --git a/src/main/resources/alfresco/messages/transfer-service_zh_CN.properties b/repository/src/main/resources/alfresco/messages/transfer-service_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/transfer-service_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/transfer-service_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace.properties b/repository/src/main/resources/alfresco/messages/ui-inplace.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_cs.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_cs.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_cs.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_da.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_da.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_da.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_de.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_de.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_de.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_es.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_es.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_es.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_fi.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_fi.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_fi.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_fr.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_fr.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_fr.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_it.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_it.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_it.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_ja.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_ja.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_ja.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_nb.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_nb.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_nb.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_nl.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_nl.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_nl.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_pl.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_pl.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_pl.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_pt_BR.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_ru.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_ru.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_ru.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_sv.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_sv.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_sv.properties
diff --git a/src/main/resources/alfresco/messages/ui-inplace_zh_CN.properties b/repository/src/main/resources/alfresco/messages/ui-inplace_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/ui-inplace_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/ui-inplace_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/version-service.properties b/repository/src/main/resources/alfresco/messages/version-service.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/version-service.properties
rename to repository/src/main/resources/alfresco/messages/version-service.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages.properties b/repository/src/main/resources/alfresco/messages/webdav-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_cs.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_da.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_de.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_es.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_fi.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_fr.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_it.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_ja.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_nb.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_nl.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_pl.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_ru.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_sv.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/webdav-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/webdav-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/webdav-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/webdav-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messages/workflow-interpreter-help.properties b/repository/src/main/resources/alfresco/messages/workflow-interpreter-help.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-interpreter-help.properties
rename to repository/src/main/resources/alfresco/messages/workflow-interpreter-help.properties
diff --git a/src/main/resources/alfresco/messages/workflow-interpreter-help.txt b/repository/src/main/resources/alfresco/messages/workflow-interpreter-help.txt
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-interpreter-help.txt
rename to repository/src/main/resources/alfresco/messages/workflow-interpreter-help.txt
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_cs.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_cs.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_cs.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_da.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_da.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_da.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_de.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_de.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_de.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_es.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_es.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_es.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_fi.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_fi.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_fi.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_fr.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_fr.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_fr.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_it.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_it.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_it.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_ja.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_ja.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_ja.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_nb.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_nb.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_nb.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_nl.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_nl.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_nl.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_pl.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_pl.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_pl.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_pt_BR.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_ru.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_ru.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_ru.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_sv.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_sv.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_sv.properties
diff --git a/src/main/resources/alfresco/messages/workflow-package-messages_zh_CN.properties b/repository/src/main/resources/alfresco/messages/workflow-package-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/messages/workflow-package-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/messages/workflow-package-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/messaging-context.xml b/repository/src/main/resources/alfresco/messaging-context.xml
similarity index 100%
rename from src/main/resources/alfresco/messaging-context.xml
rename to repository/src/main/resources/alfresco/messaging-context.xml
diff --git a/src/main/resources/alfresco/metadata/DWGMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/DWGMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/DWGMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/DWGMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/HtmlMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/HtmlMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/HtmlMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/HtmlMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/MP3MetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/MP3MetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/MP3MetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/MP3MetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/MailMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/MailMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/MailMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/MailMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/OfficeMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/OfficeMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/OfficeMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/OfficeMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/OpenDocumentMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/OpenDocumentMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/OpenDocumentMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/OpenDocumentMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/PdfBoxMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/PdfBoxMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/PdfBoxMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/PdfBoxMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/PoiMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/PoiMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/PoiMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/PoiMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/RFC822MetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/RFC822MetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/RFC822MetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/RFC822MetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/TikaAudioMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/TikaAudioMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/TikaAudioMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/TikaAudioMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/TikaAutoMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/TikaAutoMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/TikaAutoMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/TikaAutoMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/metadata/TikaSpringConfiguredMetadataExtracter.properties b/repository/src/main/resources/alfresco/metadata/TikaSpringConfiguredMetadataExtracter.properties
similarity index 100%
rename from src/main/resources/alfresco/metadata/TikaSpringConfiguredMetadataExtracter.properties
rename to repository/src/main/resources/alfresco/metadata/TikaSpringConfiguredMetadataExtracter.properties
diff --git a/src/main/resources/alfresco/mimetype/jodconverter-document-formats.json b/repository/src/main/resources/alfresco/mimetype/jodconverter-document-formats.json
similarity index 100%
rename from src/main/resources/alfresco/mimetype/jodconverter-document-formats.json
rename to repository/src/main/resources/alfresco/mimetype/jodconverter-document-formats.json
diff --git a/src/main/resources/alfresco/minimal-context.xml b/repository/src/main/resources/alfresco/minimal-context.xml
similarity index 100%
rename from src/main/resources/alfresco/minimal-context.xml
rename to repository/src/main/resources/alfresco/minimal-context.xml
diff --git a/src/main/resources/alfresco/ml/content-filter-lang.xml b/repository/src/main/resources/alfresco/ml/content-filter-lang.xml
similarity index 100%
rename from src/main/resources/alfresco/ml/content-filter-lang.xml
rename to repository/src/main/resources/alfresco/ml/content-filter-lang.xml
diff --git a/src/main/resources/alfresco/model-specific-services-context.xml b/repository/src/main/resources/alfresco/model-specific-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/model-specific-services-context.xml
rename to repository/src/main/resources/alfresco/model-specific-services-context.xml
diff --git a/src/main/resources/alfresco/model/applicationModel.xml b/repository/src/main/resources/alfresco/model/applicationModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/applicationModel.xml
rename to repository/src/main/resources/alfresco/model/applicationModel.xml
diff --git a/src/main/resources/alfresco/model/bpmModel.xml b/repository/src/main/resources/alfresco/model/bpmModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/bpmModel.xml
rename to repository/src/main/resources/alfresco/model/bpmModel.xml
diff --git a/src/main/resources/alfresco/model/calendarModel.xml b/repository/src/main/resources/alfresco/model/calendarModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/calendarModel.xml
rename to repository/src/main/resources/alfresco/model/calendarModel.xml
diff --git a/src/main/resources/alfresco/model/cmisTestModel.xml b/repository/src/main/resources/alfresco/model/cmisTestModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/cmisTestModel.xml
rename to repository/src/main/resources/alfresco/model/cmisTestModel.xml
diff --git a/src/main/resources/alfresco/model/contentModel.xml b/repository/src/main/resources/alfresco/model/contentModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/contentModel.xml
rename to repository/src/main/resources/alfresco/model/contentModel.xml
diff --git a/src/main/resources/alfresco/model/customModelManagementModel.xml b/repository/src/main/resources/alfresco/model/customModelManagementModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/customModelManagementModel.xml
rename to repository/src/main/resources/alfresco/model/customModelManagementModel.xml
diff --git a/src/main/resources/alfresco/model/defaultCustomModel.xml b/repository/src/main/resources/alfresco/model/defaultCustomModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/defaultCustomModel.xml
rename to repository/src/main/resources/alfresco/model/defaultCustomModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/blogIntegrationModel.xml b/repository/src/main/resources/alfresco/model/deprecated/blogIntegrationModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/blogIntegrationModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/blogIntegrationModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/facebookPublishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/facebookPublishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/facebookPublishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/facebookPublishingModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/flickrPublishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/flickrPublishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/flickrPublishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/flickrPublishingModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/linkedInPublishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/linkedInPublishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/linkedInPublishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/linkedInPublishingModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/publishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/publishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/publishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/publishingModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/slidesharePublishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/slidesharePublishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/slidesharePublishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/slidesharePublishingModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/twitterPublishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/twitterPublishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/twitterPublishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/twitterPublishingModel.xml
diff --git a/src/main/resources/alfresco/model/deprecated/youtubePublishingModel.xml b/repository/src/main/resources/alfresco/model/deprecated/youtubePublishingModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/deprecated/youtubePublishingModel.xml
rename to repository/src/main/resources/alfresco/model/deprecated/youtubePublishingModel.xml
diff --git a/src/main/resources/alfresco/model/distributionPoliciesModel.xml b/repository/src/main/resources/alfresco/model/distributionPoliciesModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/distributionPoliciesModel.xml
rename to repository/src/main/resources/alfresco/model/distributionPoliciesModel.xml
diff --git a/src/main/resources/alfresco/model/downloadModel.xml b/repository/src/main/resources/alfresco/model/downloadModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/downloadModel.xml
rename to repository/src/main/resources/alfresco/model/downloadModel.xml
diff --git a/src/main/resources/alfresco/model/emailServerModel.xml b/repository/src/main/resources/alfresco/model/emailServerModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/emailServerModel.xml
rename to repository/src/main/resources/alfresco/model/emailServerModel.xml
diff --git a/src/main/resources/alfresco/model/forumModel.xml b/repository/src/main/resources/alfresco/model/forumModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/forumModel.xml
rename to repository/src/main/resources/alfresco/model/forumModel.xml
diff --git a/src/main/resources/alfresco/model/imapModel.xml b/repository/src/main/resources/alfresco/model/imapModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/imapModel.xml
rename to repository/src/main/resources/alfresco/model/imapModel.xml
diff --git a/src/main/resources/alfresco/model/linksModel.xml b/repository/src/main/resources/alfresco/model/linksModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/linksModel.xml
rename to repository/src/main/resources/alfresco/model/linksModel.xml
diff --git a/src/main/resources/alfresco/model/modelSchema.xsd b/repository/src/main/resources/alfresco/model/modelSchema.xsd
similarity index 100%
rename from src/main/resources/alfresco/model/modelSchema.xsd
rename to repository/src/main/resources/alfresco/model/modelSchema.xsd
diff --git a/src/main/resources/alfresco/model/permissionDefinitions.xml b/repository/src/main/resources/alfresco/model/permissionDefinitions.xml
similarity index 100%
rename from src/main/resources/alfresco/model/permissionDefinitions.xml
rename to repository/src/main/resources/alfresco/model/permissionDefinitions.xml
diff --git a/src/main/resources/alfresco/model/permissionSchema.dtd b/repository/src/main/resources/alfresco/model/permissionSchema.dtd
similarity index 100%
rename from src/main/resources/alfresco/model/permissionSchema.dtd
rename to repository/src/main/resources/alfresco/model/permissionSchema.dtd
diff --git a/src/main/resources/alfresco/model/quickShareModel.xml b/repository/src/main/resources/alfresco/model/quickShareModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/quickShareModel.xml
rename to repository/src/main/resources/alfresco/model/quickShareModel.xml
diff --git a/src/main/resources/alfresco/model/remoteCredentialsModel.xml b/repository/src/main/resources/alfresco/model/remoteCredentialsModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/remoteCredentialsModel.xml
rename to repository/src/main/resources/alfresco/model/remoteCredentialsModel.xml
diff --git a/src/main/resources/alfresco/model/siteModel.xml b/repository/src/main/resources/alfresco/model/siteModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/siteModel.xml
rename to repository/src/main/resources/alfresco/model/siteModel.xml
diff --git a/src/main/resources/alfresco/model/sitePermissionDefinitions.xml b/repository/src/main/resources/alfresco/model/sitePermissionDefinitions.xml
similarity index 100%
rename from src/main/resources/alfresco/model/sitePermissionDefinitions.xml
rename to repository/src/main/resources/alfresco/model/sitePermissionDefinitions.xml
diff --git a/src/main/resources/alfresco/model/smartfolder-model.xml b/repository/src/main/resources/alfresco/model/smartfolder-model.xml
similarity index 100%
rename from src/main/resources/alfresco/model/smartfolder-model.xml
rename to repository/src/main/resources/alfresco/model/smartfolder-model.xml
diff --git a/src/main/resources/alfresco/model/solrFacetModel.xml b/repository/src/main/resources/alfresco/model/solrFacetModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/solrFacetModel.xml
rename to repository/src/main/resources/alfresco/model/solrFacetModel.xml
diff --git a/src/main/resources/alfresco/model/surfModel.xml b/repository/src/main/resources/alfresco/model/surfModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/surfModel.xml
rename to repository/src/main/resources/alfresco/model/surfModel.xml
diff --git a/src/main/resources/alfresco/model/systemModel.xml b/repository/src/main/resources/alfresco/model/systemModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/systemModel.xml
rename to repository/src/main/resources/alfresco/model/systemModel.xml
diff --git a/src/main/resources/alfresco/model/transferModel.xml b/repository/src/main/resources/alfresco/model/transferModel.xml
similarity index 100%
rename from src/main/resources/alfresco/model/transferModel.xml
rename to repository/src/main/resources/alfresco/model/transferModel.xml
diff --git a/src/main/resources/alfresco/module-context.xml b/repository/src/main/resources/alfresco/module-context.xml
similarity index 100%
rename from src/main/resources/alfresco/module-context.xml
rename to repository/src/main/resources/alfresco/module-context.xml
diff --git a/src/main/resources/alfresco/module/projects/script/onAddAspect_emailserver_aliasable.js b/repository/src/main/resources/alfresco/module/projects/script/onAddAspect_emailserver_aliasable.js
similarity index 100%
rename from src/main/resources/alfresco/module/projects/script/onAddAspect_emailserver_aliasable.js
rename to repository/src/main/resources/alfresco/module/projects/script/onAddAspect_emailserver_aliasable.js
diff --git a/src/main/resources/alfresco/module/sample/module-context.xml.sample b/repository/src/main/resources/alfresco/module/sample/module-context.xml.sample
similarity index 100%
rename from src/main/resources/alfresco/module/sample/module-context.xml.sample
rename to repository/src/main/resources/alfresco/module/sample/module-context.xml.sample
diff --git a/src/main/resources/alfresco/module/sample/module.properties.sample b/repository/src/main/resources/alfresco/module/sample/module.properties.sample
similarity index 100%
rename from src/main/resources/alfresco/module/sample/module.properties.sample
rename to repository/src/main/resources/alfresco/module/sample/module.properties.sample
diff --git a/src/main/resources/alfresco/mt/mt-admin-context.xml b/repository/src/main/resources/alfresco/mt/mt-admin-context.xml
similarity index 100%
rename from src/main/resources/alfresco/mt/mt-admin-context.xml
rename to repository/src/main/resources/alfresco/mt/mt-admin-context.xml
diff --git a/src/main/resources/alfresco/mt/mt-base-context.xml b/repository/src/main/resources/alfresco/mt/mt-base-context.xml
similarity index 100%
rename from src/main/resources/alfresco/mt/mt-base-context.xml
rename to repository/src/main/resources/alfresco/mt/mt-base-context.xml
diff --git a/src/main/resources/alfresco/mt/mt-context.xml b/repository/src/main/resources/alfresco/mt/mt-context.xml
similarity index 100%
rename from src/main/resources/alfresco/mt/mt-context.xml
rename to repository/src/main/resources/alfresco/mt/mt-context.xml
diff --git a/src/main/resources/alfresco/mt/st-admin-context.xml b/repository/src/main/resources/alfresco/mt/st-admin-context.xml
similarity index 100%
rename from src/main/resources/alfresco/mt/st-admin-context.xml
rename to repository/src/main/resources/alfresco/mt/st-admin-context.xml
diff --git a/src/main/resources/alfresco/network-authentication-context.xml b/repository/src/main/resources/alfresco/network-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/network-authentication-context.xml
rename to repository/src/main/resources/alfresco/network-authentication-context.xml
diff --git a/src/main/resources/alfresco/node-locator-context.xml b/repository/src/main/resources/alfresco/node-locator-context.xml
similarity index 100%
rename from src/main/resources/alfresco/node-locator-context.xml
rename to repository/src/main/resources/alfresco/node-locator-context.xml
diff --git a/src/main/resources/alfresco/node-services-context.xml b/repository/src/main/resources/alfresco/node-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/node-services-context.xml
rename to repository/src/main/resources/alfresco/node-services-context.xml
diff --git a/src/main/resources/alfresco/notification-services-context.xml b/repository/src/main/resources/alfresco/notification-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/notification-services-context.xml
rename to repository/src/main/resources/alfresco/notification-services-context.xml
diff --git a/src/main/resources/alfresco/oauth1-credentials-store-services-context.xml b/repository/src/main/resources/alfresco/oauth1-credentials-store-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/oauth1-credentials-store-services-context.xml
rename to repository/src/main/resources/alfresco/oauth1-credentials-store-services-context.xml
diff --git a/src/main/resources/alfresco/oauth2-credentials-store-services-context.xml b/repository/src/main/resources/alfresco/oauth2-credentials-store-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/oauth2-credentials-store-services-context.xml
rename to repository/src/main/resources/alfresco/oauth2-credentials-store-services-context.xml
diff --git a/src/main/resources/alfresco/opencmis-context.xml b/repository/src/main/resources/alfresco/opencmis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/opencmis-context.xml
rename to repository/src/main/resources/alfresco/opencmis-context.xml
diff --git a/src/main/resources/alfresco/opencmis-qnamefilter-context.xml b/repository/src/main/resources/alfresco/opencmis-qnamefilter-context.xml
similarity index 100%
rename from src/main/resources/alfresco/opencmis-qnamefilter-context.xml
rename to repository/src/main/resources/alfresco/opencmis-qnamefilter-context.xml
diff --git a/src/main/resources/alfresco/ownable-services-context.xml b/repository/src/main/resources/alfresco/ownable-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/ownable-services-context.xml
rename to repository/src/main/resources/alfresco/ownable-services-context.xml
diff --git a/src/main/resources/alfresco/patch/patch-services-context.xml b/repository/src/main/resources/alfresco/patch/patch-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/patch/patch-services-context.xml
rename to repository/src/main/resources/alfresco/patch/patch-services-context.xml
diff --git a/src/main/resources/alfresco/patch/retired-patches-context.xml b/repository/src/main/resources/alfresco/patch/retired-patches-context.xml
similarity index 100%
rename from src/main/resources/alfresco/patch/retired-patches-context.xml
rename to repository/src/main/resources/alfresco/patch/retired-patches-context.xml
diff --git a/src/main/resources/alfresco/period-type-context.xml b/repository/src/main/resources/alfresco/period-type-context.xml
similarity index 100%
rename from src/main/resources/alfresco/period-type-context.xml
rename to repository/src/main/resources/alfresco/period-type-context.xml
diff --git a/src/main/resources/alfresco/policy-context.xml b/repository/src/main/resources/alfresco/policy-context.xml
similarity index 100%
rename from src/main/resources/alfresco/policy-context.xml
rename to repository/src/main/resources/alfresco/policy-context.xml
diff --git a/src/main/resources/alfresco/preference-service-context.xml b/repository/src/main/resources/alfresco/preference-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/preference-service-context.xml
rename to repository/src/main/resources/alfresco/preference-service-context.xml
diff --git a/src/main/resources/alfresco/public-services-context.xml b/repository/src/main/resources/alfresco/public-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/public-services-context.xml
rename to repository/src/main/resources/alfresco/public-services-context.xml
diff --git a/src/main/resources/alfresco/public-services-security-context.xml b/repository/src/main/resources/alfresco/public-services-security-context.xml
similarity index 100%
rename from src/main/resources/alfresco/public-services-security-context.xml
rename to repository/src/main/resources/alfresco/public-services-security-context.xml
diff --git a/src/main/resources/alfresco/quickshare-services-context.xml b/repository/src/main/resources/alfresco/quickshare-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/quickshare-services-context.xml
rename to repository/src/main/resources/alfresco/quickshare-services-context.xml
diff --git a/src/main/resources/alfresco/rating-services-context.xml b/repository/src/main/resources/alfresco/rating-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/rating-services-context.xml
rename to repository/src/main/resources/alfresco/rating-services-context.xml
diff --git a/src/main/resources/alfresco/remote-credentials-services-context.xml b/repository/src/main/resources/alfresco/remote-credentials-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/remote-credentials-services-context.xml
rename to repository/src/main/resources/alfresco/remote-credentials-services-context.xml
diff --git a/src/main/resources/alfresco/remote-ticket-services-context.xml b/repository/src/main/resources/alfresco/remote-ticket-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/remote-ticket-services-context.xml
rename to repository/src/main/resources/alfresco/remote-ticket-services-context.xml
diff --git a/src/main/resources/alfresco/rendition-services-context.xml b/repository/src/main/resources/alfresco/rendition-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/rendition-services-context.xml
rename to repository/src/main/resources/alfresco/rendition-services-context.xml
diff --git a/src/main/resources/alfresco/rendition-services2-context.xml b/repository/src/main/resources/alfresco/rendition-services2-context.xml
similarity index 100%
rename from src/main/resources/alfresco/rendition-services2-context.xml
rename to repository/src/main/resources/alfresco/rendition-services2-context.xml
diff --git a/src/main/resources/alfresco/renditions/0100-baseRenditions.json b/repository/src/main/resources/alfresco/renditions/0100-baseRenditions.json
similarity index 100%
rename from src/main/resources/alfresco/renditions/0100-baseRenditions.json
rename to repository/src/main/resources/alfresco/renditions/0100-baseRenditions.json
diff --git a/src/main/resources/alfresco/replication-services-context.xml b/repository/src/main/resources/alfresco/replication-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/replication-services-context.xml
rename to repository/src/main/resources/alfresco/replication-services-context.xml
diff --git a/src/main/resources/alfresco/repo-admin-context.xml b/repository/src/main/resources/alfresco/repo-admin-context.xml
similarity index 100%
rename from src/main/resources/alfresco/repo-admin-context.xml
rename to repository/src/main/resources/alfresco/repo-admin-context.xml
diff --git a/src/main/resources/alfresco/repo-clients-apps-context.xml b/repository/src/main/resources/alfresco/repo-clients-apps-context.xml
similarity index 100%
rename from src/main/resources/alfresco/repo-clients-apps-context.xml
rename to repository/src/main/resources/alfresco/repo-clients-apps-context.xml
diff --git a/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties
similarity index 100%
rename from src/main/resources/alfresco/repository.properties
rename to repository/src/main/resources/alfresco/repository.properties
diff --git a/src/main/resources/alfresco/reset-password-context.xml b/repository/src/main/resources/alfresco/reset-password-context.xml
similarity index 100%
rename from src/main/resources/alfresco/reset-password-context.xml
rename to repository/src/main/resources/alfresco/reset-password-context.xml
diff --git a/src/main/resources/alfresco/rule-services-context.xml b/repository/src/main/resources/alfresco/rule-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/rule-services-context.xml
rename to repository/src/main/resources/alfresco/rule-services-context.xml
diff --git a/src/main/resources/alfresco/scheduled-jobs-context.xml b/repository/src/main/resources/alfresco/scheduled-jobs-context.xml
similarity index 100%
rename from src/main/resources/alfresco/scheduled-jobs-context.xml
rename to repository/src/main/resources/alfresco/scheduled-jobs-context.xml
diff --git a/src/main/resources/alfresco/scheduler-core-context.xml b/repository/src/main/resources/alfresco/scheduler-core-context.xml
similarity index 100%
rename from src/main/resources/alfresco/scheduler-core-context.xml
rename to repository/src/main/resources/alfresco/scheduler-core-context.xml
diff --git a/src/main/resources/alfresco/schemacomp/db-schema.xsd b/repository/src/main/resources/alfresco/schemacomp/db-schema.xsd
similarity index 100%
rename from src/main/resources/alfresco/schemacomp/db-schema.xsd
rename to repository/src/main/resources/alfresco/schemacomp/db-schema.xsd
diff --git a/src/main/resources/alfresco/script-services-context.xml b/repository/src/main/resources/alfresco/script-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/script-services-context.xml
rename to repository/src/main/resources/alfresco/script-services-context.xml
diff --git a/src/main/resources/alfresco/site-services-context.xml b/repository/src/main/resources/alfresco/site-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/site-services-context.xml
rename to repository/src/main/resources/alfresco/site-services-context.xml
diff --git a/src/main/resources/alfresco/slingshot-context.xml b/repository/src/main/resources/alfresco/slingshot-context.xml
similarity index 100%
rename from src/main/resources/alfresco/slingshot-context.xml
rename to repository/src/main/resources/alfresco/slingshot-context.xml
diff --git a/src/main/resources/alfresco/smartfolder-context.xml b/repository/src/main/resources/alfresco/smartfolder-context.xml
similarity index 100%
rename from src/main/resources/alfresco/smartfolder-context.xml
rename to repository/src/main/resources/alfresco/smartfolder-context.xml
diff --git a/src/main/resources/alfresco/social-publishing-context.xml b/repository/src/main/resources/alfresco/social-publishing-context.xml
similarity index 100%
rename from src/main/resources/alfresco/social-publishing-context.xml
rename to repository/src/main/resources/alfresco/social-publishing-context.xml
diff --git a/src/main/resources/alfresco/solr-facets-context.xml b/repository/src/main/resources/alfresco/solr-facets-context.xml
similarity index 100%
rename from src/main/resources/alfresco/solr-facets-context.xml
rename to repository/src/main/resources/alfresco/solr-facets-context.xml
diff --git a/src/main/resources/alfresco/spring/encrypted-properties-context.xml b/repository/src/main/resources/alfresco/spring/encrypted-properties-context.xml
similarity index 100%
rename from src/main/resources/alfresco/spring/encrypted-properties-context.xml
rename to repository/src/main/resources/alfresco/spring/encrypted-properties-context.xml
diff --git a/src/main/resources/alfresco/st-context.xml b/repository/src/main/resources/alfresco/st-context.xml
similarity index 100%
rename from src/main/resources/alfresco/st-context.xml
rename to repository/src/main/resources/alfresco/st-context.xml
diff --git a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml b/repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
rename to repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
diff --git a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml b/repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
rename to repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
diff --git a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties b/repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
rename to repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
diff --git a/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication.properties
rename to repository/src/main/resources/alfresco/subsystems/Authentication/alfrescoNtlm/alfresco-authentication.properties
diff --git a/src/main/resources/alfresco/subsystems/Authentication/common-ldap-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/common-ldap-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/common-ldap-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/common-ldap-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/external/external-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/external/external-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/external/external-authentication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/external/external-authentication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/external/external-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/external/external-authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/external/external-authentication.properties
rename to repository/src/main/resources/alfresco/subsystems/Authentication/external/external-authentication.properties
diff --git a/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties
rename to repository/src/main/resources/alfresco/subsystems/Authentication/identity-service/identity-service-authentication.properties
diff --git a/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication.properties
rename to repository/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-authentication.properties
diff --git a/src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication.properties
rename to repository/src/main/resources/alfresco/subsystems/Authentication/ldap-ad/ldap-ad-authentication.properties
diff --git a/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication-context.xml b/repository/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties b/repository/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties
rename to repository/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties
diff --git a/src/main/resources/alfresco/subsystems/ContentStore/unencrypted/unencrypted-store-context.xml b/repository/src/main/resources/alfresco/subsystems/ContentStore/unencrypted/unencrypted-store-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/ContentStore/unencrypted/unencrypted-store-context.xml
rename to repository/src/main/resources/alfresco/subsystems/ContentStore/unencrypted/unencrypted-store-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Events/default/events-context.xml b/repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Events/default/events-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Events/default/events-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Events/default/events.properties b/repository/src/main/resources/alfresco/subsystems/Events/default/events.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Events/default/events.properties
rename to repository/src/main/resources/alfresco/subsystems/Events/default/events.properties
diff --git a/src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml
rename to repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml
diff --git a/src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties
rename to repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties
diff --git a/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml
rename to repository/src/main/resources/alfresco/subsystems/Messaging/default/defaultRoutes.xml
diff --git a/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties
rename to repository/src/main/resources/alfresco/subsystems/Messaging/default/events-messaging.properties
diff --git a/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
rename to repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
diff --git a/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml b/repository/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml
rename to repository/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter-context.xml
diff --git a/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter.properties b/repository/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter.properties
rename to repository/src/main/resources/alfresco/subsystems/OOoJodconverter/default/jodconverter.properties
diff --git a/src/main/resources/alfresco/subsystems/Replication/default/replication-context.xml b/repository/src/main/resources/alfresco/subsystems/Replication/default/replication-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Replication/default/replication-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Replication/default/replication-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Replication/default/replication.properties b/repository/src/main/resources/alfresco/subsystems/Replication/default/replication.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Replication/default/replication.properties
rename to repository/src/main/resources/alfresco/subsystems/Replication/default/replication.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/common-opencmis-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/common-opencmis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/common-opencmis-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/common-opencmis-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/common-search-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/common-search-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/common-search-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/common-search-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/noindex/common-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/noindex/common-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/noindex/common-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/noindex/common-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/noindex/noindex-search-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/noindex/noindex-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/noindex/opencmis-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/noindex/opencmis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/noindex/opencmis-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/noindex/opencmis-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/bootstrap-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr/bootstrap-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/bootstrap-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/bootstrap-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/common-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr/common-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/common-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/common-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/opencmis-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr/opencmis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/opencmis-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/opencmis-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/solr-backup.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr/solr-backup.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/solr-backup.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/solr-backup.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/solr-search-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr/solr-search-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/solr-search-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/solr-search-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/solr-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr/solr-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr/solr-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr/solr-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/bootstrap-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr4/bootstrap-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/bootstrap-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/bootstrap-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/common-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr4/common-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/common-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/common-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/opencmis-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr4/opencmis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/opencmis-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/opencmis-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/solr-backup.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/solr-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr4/solr-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/bootstrap-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr6/bootstrap-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/bootstrap-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/bootstrap-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/common-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr6/common-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/common-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/common-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/opencmis-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr6/opencmis-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/opencmis-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/opencmis-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/solr-backup.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup.properties
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml b/repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-search.properties b/repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-search.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Search/solr6/solr-search.properties
rename to repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-search.properties
diff --git a/src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service-context.xml b/repository/src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service.properties b/repository/src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service.properties
rename to repository/src/main/resources/alfresco/subsystems/Subscriptions/default/subscription-service.properties
diff --git a/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml b/repository/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization.properties b/repository/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization.properties
rename to repository/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization.properties
diff --git a/src/main/resources/alfresco/subsystems/Transformers/default/transformers-context.xml b/repository/src/main/resources/alfresco/subsystems/Transformers/default/transformers-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Transformers/default/transformers-context.xml
rename to repository/src/main/resources/alfresco/subsystems/Transformers/default/transformers-context.xml
diff --git a/src/main/resources/alfresco/subsystems/Transformers/default/transformers.properties b/repository/src/main/resources/alfresco/subsystems/Transformers/default/transformers.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/Transformers/default/transformers.properties
rename to repository/src/main/resources/alfresco/subsystems/Transformers/default/transformers.properties
diff --git a/src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml b/repository/src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
rename to repository/src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
diff --git a/src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties b/repository/src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties
rename to repository/src/main/resources/alfresco/subsystems/email/InboundSMTP/inboundSMTP.properties
diff --git a/src/main/resources/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml b/repository/src/main/resources/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml
rename to repository/src/main/resources/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml
diff --git a/src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP-context.xml b/repository/src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP-context.xml
rename to repository/src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP-context.xml
diff --git a/src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP.properties b/repository/src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP.properties
rename to repository/src/main/resources/alfresco/subsystems/email/OutboundSMTP/outboundSMTP.properties
diff --git a/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml b/repository/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml
rename to repository/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml
diff --git a/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties b/repository/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties
rename to repository/src/main/resources/alfresco/subsystems/fileServers/default/file-servers.properties
diff --git a/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml b/repository/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml
rename to repository/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml
diff --git a/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml b/repository/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml
rename to repository/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml
diff --git a/src/main/resources/alfresco/subsystems/imap/default/imap-server.properties b/repository/src/main/resources/alfresco/subsystems/imap/default/imap-server.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/imap/default/imap-server.properties
rename to repository/src/main/resources/alfresco/subsystems/imap/default/imap-server.properties
diff --git a/src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter-context.xml b/repository/src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter-context.xml
rename to repository/src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter-context.xml
diff --git a/src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter.properties b/repository/src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter.properties
rename to repository/src/main/resources/alfresco/subsystems/sysAdmin/default/sysadmin-parameter.properties
diff --git a/src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform-context.xml b/repository/src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform-context.xml
rename to repository/src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform-context.xml
diff --git a/src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform.properties b/repository/src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform.properties
rename to repository/src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform.properties
diff --git a/src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform-context.xml b/repository/src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform-context.xml
similarity index 100%
rename from src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform-context.xml
rename to repository/src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform-context.xml
diff --git a/src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform.properties b/repository/src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform.properties
similarity index 100%
rename from src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform.properties
rename to repository/src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform.properties
diff --git a/src/main/resources/alfresco/tagging-services-context.xml b/repository/src/main/resources/alfresco/tagging-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/tagging-services-context.xml
rename to repository/src/main/resources/alfresco/tagging-services-context.xml
diff --git a/src/main/resources/alfresco/template-services-context.xml b/repository/src/main/resources/alfresco/template-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/template-services-context.xml
rename to repository/src/main/resources/alfresco/template-services-context.xml
diff --git a/src/main/resources/alfresco/templates/activities-email-templates.xml b/repository/src/main/resources/alfresco/templates/activities-email-templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates.xml
rename to repository/src/main/resources/alfresco/templates/activities-email-templates.xml
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_de.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_es.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_fr.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_it.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ja.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nb.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_nl.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_pt_BR.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_ru.ftl
diff --git a/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl b/repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl
rename to repository/src/main/resources/alfresco/templates/activities-email-templates/activities-email_zh_CN.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/doc_info.ftl b/repository/src/main/resources/alfresco/templates/content/examples/doc_info.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/doc_info.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/doc_info.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/general_example.ftl b/repository/src/main/resources/alfresco/templates/content/examples/general_example.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/general_example.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/general_example.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/localizable.ftl b/repository/src/main/resources/alfresco/templates/content/examples/localizable.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/localizable.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/localizable.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/my_docs.ftl b/repository/src/main/resources/alfresco/templates/content/examples/my_docs.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/my_docs.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/my_docs.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/my_docs_inline.ftl b/repository/src/main/resources/alfresco/templates/content/examples/my_docs_inline.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/my_docs_inline.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/my_docs_inline.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/my_spaces.ftl b/repository/src/main/resources/alfresco/templates/content/examples/my_spaces.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/my_spaces.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/my_spaces.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/my_summary.ftl b/repository/src/main/resources/alfresco/templates/content/examples/my_summary.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/my_summary.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/my_summary.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/recent_docs.ftl b/repository/src/main/resources/alfresco/templates/content/examples/recent_docs.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/recent_docs.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/recent_docs.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/records_report.ftl b/repository/src/main/resources/alfresco/templates/content/examples/records_report.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/records_report.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/records_report.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/show_audit.ftl b/repository/src/main/resources/alfresco/templates/content/examples/show_audit.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/show_audit.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/show_audit.ftl
diff --git a/src/main/resources/alfresco/templates/content/examples/translatable.ftl b/repository/src/main/resources/alfresco/templates/content/examples/translatable.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/content/examples/translatable.ftl
rename to repository/src/main/resources/alfresco/templates/content/examples/translatable.ftl
diff --git a/src/main/resources/alfresco/templates/content_template_examples.xml b/repository/src/main/resources/alfresco/templates/content_template_examples.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/content_template_examples.xml
rename to repository/src/main/resources/alfresco/templates/content_template_examples.xml
diff --git a/src/main/resources/alfresco/templates/email_templates.acp b/repository/src/main/resources/alfresco/templates/email_templates.acp
similarity index 100%
rename from src/main/resources/alfresco/templates/email_templates.acp
rename to repository/src/main/resources/alfresco/templates/email_templates.acp
diff --git a/src/main/resources/alfresco/templates/following-email-templates.xml b/repository/src/main/resources/alfresco/templates/following-email-templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates.xml
rename to repository/src/main/resources/alfresco/templates/following-email-templates.xml
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html.ftl
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html_de.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html_de.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_de.ftl
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html_es.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html_es.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_es.ftl
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html_fr.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html_fr.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_fr.ftl
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html_it.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html_it.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_it.ftl
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html_ja.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html_ja.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_ja.ftl
diff --git a/src/main/resources/alfresco/templates/following-email-templates/following-email.html_nl.ftl b/repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/following-email-templates/following-email.html_nl.ftl
rename to repository/src/main/resources/alfresco/templates/following-email-templates/following-email.html_nl.ftl
diff --git a/src/main/resources/alfresco/templates/imap/command_processor_scripts.acp b/repository/src/main/resources/alfresco/templates/imap/command_processor_scripts.acp
similarity index 100%
rename from src/main/resources/alfresco/templates/imap/command_processor_scripts.acp
rename to repository/src/main/resources/alfresco/templates/imap/command_processor_scripts.acp
diff --git a/src/main/resources/alfresco/templates/imap/email_actions_space.acp b/repository/src/main/resources/alfresco/templates/imap/email_actions_space.acp
similarity index 100%
rename from src/main/resources/alfresco/templates/imap/email_actions_space.acp
rename to repository/src/main/resources/alfresco/templates/imap/email_actions_space.acp
diff --git a/src/main/resources/alfresco/templates/imap/imap_config_space.acp b/repository/src/main/resources/alfresco/templates/imap/imap_config_space.acp
similarity index 100%
rename from src/main/resources/alfresco/templates/imap/imap_config_space.acp
rename to repository/src/main/resources/alfresco/templates/imap/imap_config_space.acp
diff --git a/src/main/resources/alfresco/templates/imap/share_messages.xml b/repository/src/main/resources/alfresco/templates/imap/share_messages.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/imap/share_messages.xml
rename to repository/src/main/resources/alfresco/templates/imap/share_messages.xml
diff --git a/src/main/resources/alfresco/templates/imap/template_test.html b/repository/src/main/resources/alfresco/templates/imap/template_test.html
similarity index 100%
rename from src/main/resources/alfresco/templates/imap/template_test.html
rename to repository/src/main/resources/alfresco/templates/imap/template_test.html
diff --git a/src/main/resources/alfresco/templates/invite-add-direct-email-templates.xml b/repository/src/main/resources/alfresco/templates/invite-add-direct-email-templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-add-direct-email-templates.xml
rename to repository/src/main/resources/alfresco/templates/invite-add-direct-email-templates.xml
diff --git a/src/main/resources/alfresco/templates/invite-email-templates.xml b/repository/src/main/resources/alfresco/templates/invite-email-templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates.xml
rename to repository/src/main/resources/alfresco/templates/invite-email-templates.xml
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_de.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_de.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_de.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_es.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_es.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_es.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_fr.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_fr.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_fr.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_it.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_it.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_it.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_ja.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_ja.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_ja.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_nl.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_nl.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-add-direct.html_nl.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email-moderated.html.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-moderated.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email-moderated.html.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email-moderated.html.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_de.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_de.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_de.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_de.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_es.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_es.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_es.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_es.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_fr.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_fr.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_fr.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_fr.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_it.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_it.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_it.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_it.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_ja.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_ja.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_ja.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_ja.ftl
diff --git a/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl b/repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl
rename to repository/src/main/resources/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl
diff --git a/src/main/resources/alfresco/templates/invite-moderated-email-templates.xml b/repository/src/main/resources/alfresco/templates/invite-moderated-email-templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/invite-moderated-email-templates.xml
rename to repository/src/main/resources/alfresco/templates/invite-moderated-email-templates.xml
diff --git a/src/main/resources/alfresco/templates/new-user-templates.xml b/repository/src/main/resources/alfresco/templates/new-user-templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates.xml
rename to repository/src/main/resources/alfresco/templates/new-user-templates.xml
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email.html
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email_de.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_de.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email_de.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_de.html
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email_es.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_es.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email_es.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_es.html
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email_fr.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_fr.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email_fr.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_fr.html
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email_it.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_it.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email_it.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_it.html
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email_ja.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_ja.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email_ja.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_ja.html
diff --git a/src/main/resources/alfresco/templates/new-user-templates/new-user-email_nl.html b/repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_nl.html
similarity index 100%
rename from src/main/resources/alfresco/templates/new-user-templates/new-user-email_nl.html
rename to repository/src/main/resources/alfresco/templates/new-user-templates/new-user-email_nl.html
diff --git a/src/main/resources/alfresco/templates/notify_email_templates.xml b/repository/src/main/resources/alfresco/templates/notify_email_templates.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates.xml
rename to repository/src/main/resources/alfresco/templates/notify_email_templates.xml
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify.htm
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify_de.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify_de.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify_de.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify_de.htm
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify_es.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify_es.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify_es.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify_es.htm
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify_fr.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify_fr.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify_fr.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify_fr.htm
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify_it.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify_it.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify_it.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify_it.htm
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify_ja.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify_ja.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify_ja.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify_ja.htm
diff --git a/src/main/resources/alfresco/templates/notify_email_templates/notify_nl.htm b/repository/src/main/resources/alfresco/templates/notify_email_templates/notify_nl.htm
similarity index 100%
rename from src/main/resources/alfresco/templates/notify_email_templates/notify_nl.htm
rename to repository/src/main/resources/alfresco/templates/notify_email_templates/notify_nl.htm
diff --git a/src/main/resources/alfresco/templates/quickshare-email-templates/quickshare-email.default.template.ftl b/repository/src/main/resources/alfresco/templates/quickshare-email-templates/quickshare-email.default.template.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/quickshare-email-templates/quickshare-email.default.template.ftl
rename to repository/src/main/resources/alfresco/templates/quickshare-email-templates/quickshare-email.default.template.ftl
diff --git a/src/main/resources/alfresco/templates/readme.ftl b/repository/src/main/resources/alfresco/templates/readme.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/readme.ftl
rename to repository/src/main/resources/alfresco/templates/readme.ftl
diff --git a/src/main/resources/alfresco/templates/readme_template.xml b/repository/src/main/resources/alfresco/templates/readme_template.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/readme_template.xml
rename to repository/src/main/resources/alfresco/templates/readme_template.xml
diff --git a/src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-confirmation-email-template.ftl b/repository/src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-confirmation-email-template.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-confirmation-email-template.ftl
rename to repository/src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-confirmation-email-template.ftl
diff --git a/src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-email-template.ftl b/repository/src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-email-template.ftl
similarity index 100%
rename from src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-email-template.ftl
rename to repository/src/main/resources/alfresco/templates/reset-password-email-templates/reset-password-email-template.ftl
diff --git a/src/main/resources/alfresco/templates/rss_templates.acp b/repository/src/main/resources/alfresco/templates/rss_templates.acp
similarity index 100%
rename from src/main/resources/alfresco/templates/rss_templates.acp
rename to repository/src/main/resources/alfresco/templates/rss_templates.acp
diff --git a/src/main/resources/alfresco/templates/software_engineering_project.xml b/repository/src/main/resources/alfresco/templates/software_engineering_project.xml
similarity index 100%
rename from src/main/resources/alfresco/templates/software_engineering_project.xml
rename to repository/src/main/resources/alfresco/templates/software_engineering_project.xml
diff --git a/src/main/resources/alfresco/templates/system-overview.html b/repository/src/main/resources/alfresco/templates/system-overview.html
similarity index 100%
rename from src/main/resources/alfresco/templates/system-overview.html
rename to repository/src/main/resources/alfresco/templates/system-overview.html
diff --git a/src/main/resources/alfresco/thumbnail-service-context.xml b/repository/src/main/resources/alfresco/thumbnail-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/thumbnail-service-context.xml
rename to repository/src/main/resources/alfresco/thumbnail-service-context.xml
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aep.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aep.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aep.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aep.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ai.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ai.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ai.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ai.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aiff.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aiff.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aiff.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_aiff.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asnd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asnd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asnd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asnd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_asx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_au.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_au.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_au.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_au.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avi.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avi.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avi.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avi.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_avx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_bmp.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_bmp.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_bmp.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_bmp.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_css.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_css.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_css.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_css.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_doc.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_doc.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_doc.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_doc.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_docx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_dotm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_dotm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_dotm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_dotm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eml.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eml.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eml.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eml.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eps.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eps.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eps.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_eps.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fla.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fla.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fla.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fla.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flac.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flac.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flac.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flac.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flv.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flv.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flv.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_flv.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fxp.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fxp.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fxp.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_fxp.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_gif.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_gif.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_gif.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_gif.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_html.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_html.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_html.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_html.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_indd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_indd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_indd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_indd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpeg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpeg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpeg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpeg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_jpg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_key.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_key.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_key.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_key.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_m4v.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_m4v.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_m4v.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_m4v.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mov.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mov.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mov.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mov.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_movie.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_movie.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_movie.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_movie.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp2.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp2.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp2.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp2.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp3.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp3.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp3.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp3.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp4.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp4.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp4.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mp4.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg2.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg2.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg2.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpeg2.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpv2.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpv2.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpv2.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_mpv2.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_numbers.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_numbers.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_numbers.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_numbers.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odp.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odp.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odp.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odp.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ods.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ods.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ods.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ods.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_odt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_oga.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_oga.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_oga.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_oga.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogv.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogv.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogv.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ogv.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pages.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pages.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pages.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pages.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pdf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pdf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pdf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pdf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_png.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_png.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_png.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_png.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_potx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppam.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppam.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppam.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppam.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppj.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppj.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppj.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppj.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppsx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_ppt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_pptx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_psd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_psd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_psd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_psd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_qt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_qt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_qt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_qt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_rtf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_rtf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_rtf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_rtf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_sldx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_snd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_snd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_snd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_snd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_spx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_spx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_spx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_spx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_svg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_svg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_svg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_svg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_swf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_swf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_swf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_swf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_tiff.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_tiff.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_tiff.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_tiff.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_txt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_txt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_txt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_txt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wav.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wav.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wav.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wav.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_webm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_webm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_webm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_webm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wma.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wma.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wma.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wma.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wmv.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wmv.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wmv.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_wmv.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xbm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xbm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xbm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xbm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlam.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlam.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlam.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlam.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xls.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xls.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xls.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xls.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsb.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsb.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsb.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsb.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xlsx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xltx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xml.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xml.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xml.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_xml.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_zip.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_zip.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_zip.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_256_zip.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar32.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar32.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar32.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_avatar32.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aep.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aep.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aep.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aep.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ai.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ai.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ai.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ai.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aiff.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aiff.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aiff.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_aiff.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asnd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asnd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asnd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asnd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_asx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_au.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_au.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_au.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_au.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avi.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avi.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avi.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avi.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_avx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_bmp.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_bmp.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_bmp.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_bmp.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_css.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_css.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_css.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_css.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_doc.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_doc.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_doc.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_doc.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_docx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_dotx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eml.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eml.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eml.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eml.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eps.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eps.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eps.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_eps.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fla.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fla.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fla.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fla.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flac.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flac.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flac.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flac.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flv.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flv.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flv.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_flv.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fxp.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fxp.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fxp.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_fxp.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_gif.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_gif.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_gif.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_gif.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_html.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_html.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_html.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_html.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_indd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_indd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_indd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_indd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpeg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpeg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpeg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpeg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_jpg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_key.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_key.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_key.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_key.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_m4v.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_m4v.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_m4v.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_m4v.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mov.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mov.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mov.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mov.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_movie.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_movie.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_movie.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_movie.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp2.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp2.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp2.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp2.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp3.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp3.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp3.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp3.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp4.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp4.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp4.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mp4.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg2.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg2.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg2.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpeg2.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpv2.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpv2.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpv2.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_mpv2.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_numbers.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_numbers.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_numbers.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_numbers.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odp.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odp.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odp.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odp.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ods.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ods.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ods.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ods.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_odt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_oga.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_oga.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_oga.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_oga.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogv.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogv.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogv.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ogv.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pages.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pages.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pages.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pages.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pdf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pdf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pdf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pdf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_png.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_png.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_png.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_png.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_potx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppam.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppj.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppj.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppj.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppj.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppsx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_ppt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_pptx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_psd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_psd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_psd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_psd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_qt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_qt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_qt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_qt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_rtf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_rtf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_rtf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_rtf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_sldx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_snd.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_snd.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_snd.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_snd.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_spx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_spx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_spx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_spx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_svg.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_svg.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_svg.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_svg.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_swf.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_swf.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_swf.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_swf.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_tiff.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_tiff.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_tiff.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_tiff.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_txt.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_txt.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_txt.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_txt.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wav.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wav.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wav.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wav.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_webm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_webm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_webm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_webm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wma.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wma.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wma.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wma.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wmv.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wmv.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wmv.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_wmv.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xbm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xbm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xbm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xbm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlam.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xls.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xls.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xls.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xls.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsb.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xlsx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltm.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xltx.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xml.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xml.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xml.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_xml.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_zip.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_zip.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_zip.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_doclib_zip.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_imgpreview.png b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_imgpreview.png
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_imgpreview.png
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_imgpreview.png
diff --git a/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_medium.jpg b/repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_medium.jpg
similarity index 100%
rename from src/main/resources/alfresco/thumbnail/thumbnail_placeholder_medium.jpg
rename to repository/src/main/resources/alfresco/thumbnail/thumbnail_placeholder_medium.jpg
diff --git a/src/main/resources/alfresco/tika/tika-config.xml b/repository/src/main/resources/alfresco/tika/tika-config.xml
similarity index 100%
rename from src/main/resources/alfresco/tika/tika-config.xml
rename to repository/src/main/resources/alfresco/tika/tika-config.xml
diff --git a/src/main/resources/alfresco/transfer-service-context.xml b/repository/src/main/resources/alfresco/transfer-service-context.xml
similarity index 100%
rename from src/main/resources/alfresco/transfer-service-context.xml
rename to repository/src/main/resources/alfresco/transfer-service-context.xml
diff --git a/src/main/resources/alfresco/transforms/0100-basePipelines.json b/repository/src/main/resources/alfresco/transforms/0100-basePipelines.json
similarity index 100%
rename from src/main/resources/alfresco/transforms/0100-basePipelines.json
rename to repository/src/main/resources/alfresco/transforms/0100-basePipelines.json
diff --git a/src/main/resources/alfresco/tx-cache-context.xml b/repository/src/main/resources/alfresco/tx-cache-context.xml
similarity index 100%
rename from src/main/resources/alfresco/tx-cache-context.xml
rename to repository/src/main/resources/alfresco/tx-cache-context.xml
diff --git a/src/main/resources/alfresco/usage-services-context.xml b/repository/src/main/resources/alfresco/usage-services-context.xml
similarity index 100%
rename from src/main/resources/alfresco/usage-services-context.xml
rename to repository/src/main/resources/alfresco/usage-services-context.xml
diff --git a/src/main/resources/alfresco/webdav-context.xml b/repository/src/main/resources/alfresco/webdav-context.xml
similarity index 100%
rename from src/main/resources/alfresco/webdav-context.xml
rename to repository/src/main/resources/alfresco/webdav-context.xml
diff --git a/src/main/resources/alfresco/workflow-context.xml b/repository/src/main/resources/alfresco/workflow-context.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow-context.xml
rename to repository/src/main/resources/alfresco/workflow-context.xml
diff --git a/src/main/resources/alfresco/workflow/adhoc.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/adhoc.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/adhoc.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/adhoc.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/hybrid-adhoc.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/hybrid-adhoc.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/hybrid-adhoc.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/hybrid-adhoc.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/hybrid-review.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/hybrid-review.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/hybrid-review.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/hybrid-review.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/invitation-add-direct.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/invitation-add-direct.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-add-direct.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/invitation-add-direct.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_cs.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_cs.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_cs.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_da.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_da.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_da.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_de.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_de.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_de.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_es.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_es.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_es.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fi.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fi.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fi.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fr.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fr.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_fr.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_it.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_it.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_it.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ja.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ja.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ja.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nb.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nb.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nb.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nl.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nl.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_nl.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pl.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pl.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pl.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pt_BR.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ru.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ru.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_ru.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_sv.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_sv.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_sv.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_zh_CN.properties b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated-workflow-model.xml b/repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-model.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated-workflow-model.xml
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated-workflow-model.xml
diff --git a/src/main/resources/alfresco/workflow/invitation-moderated.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/invitation-moderated.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-moderated.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/invitation-moderated.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_cs.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_cs.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_cs.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_da.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_da.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_da.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_de.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_de.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_de.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_es.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_es.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_es.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fi.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fi.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fi.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fr.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fr.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_fr.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_it.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_it.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_it.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ja.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nb.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nb.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nb.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nl.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nl.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_nl.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pl.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pl.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pl.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pt_BR.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ru.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ru.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_ru.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_sv.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_sv.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_sv.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_zh_CN.properties b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated-workflow-model.xml b/repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-model.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated-workflow-model.xml
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated-workflow-model.xml
diff --git a/src/main/resources/alfresco/workflow/invitation-nominated.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/invitation-nominated.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/invitation-nominated.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/invitation-nominated.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/parallel-review-group.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/parallel-review-group.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/parallel-review-group.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/parallel-review-group.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/parallel-review.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/parallel-review.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/parallel-review.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/parallel-review.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/reset-password-workflow-model.xml b/repository/src/main/resources/alfresco/workflow/reset-password-workflow-model.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/reset-password-workflow-model.xml
rename to repository/src/main/resources/alfresco/workflow/reset-password-workflow-model.xml
diff --git a/src/main/resources/alfresco/workflow/reset-password_processdefinition.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/reset-password_processdefinition.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/reset-password_processdefinition.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/reset-password_processdefinition.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/review-pooled.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/review-pooled.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/review-pooled.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/review-pooled.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/review.bpmn20.xml b/repository/src/main/resources/alfresco/workflow/review.bpmn20.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/review.bpmn20.xml
rename to repository/src/main/resources/alfresco/workflow/review.bpmn20.xml
diff --git a/src/main/resources/alfresco/workflow/workflow-messages.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_cs.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_cs.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_cs.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_cs.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_da.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_da.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_da.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_da.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_de.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_de.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_de.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_de.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_es.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_es.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_es.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_es.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_fi.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_fi.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_fi.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_fi.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_fr.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_fr.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_fr.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_fr.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_it.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_it.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_it.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_it.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_ja.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_ja.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_ja.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_ja.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_nb.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_nb.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_nb.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_nb.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_nl.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_nl.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_nl.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_nl.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_pl.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_pl.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_pl.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_pl.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_pt_BR.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_pt_BR.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_pt_BR.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_pt_BR.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_ru.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_ru.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_ru.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_ru.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_sv.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_sv.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_sv.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_sv.properties
diff --git a/src/main/resources/alfresco/workflow/workflow-messages_zh_CN.properties b/repository/src/main/resources/alfresco/workflow/workflow-messages_zh_CN.properties
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflow-messages_zh_CN.properties
rename to repository/src/main/resources/alfresco/workflow/workflow-messages_zh_CN.properties
diff --git a/src/main/resources/alfresco/workflow/workflowModel.xml b/repository/src/main/resources/alfresco/workflow/workflowModel.xml
similarity index 100%
rename from src/main/resources/alfresco/workflow/workflowModel.xml
rename to repository/src/main/resources/alfresco/workflow/workflowModel.xml
diff --git a/src/main/resources/org/alfresco/encryption/keystore-parameters.properties b/repository/src/main/resources/org/alfresco/encryption/keystore-parameters.properties
similarity index 100%
rename from src/main/resources/org/alfresco/encryption/keystore-parameters.properties
rename to repository/src/main/resources/org/alfresco/encryption/keystore-parameters.properties
diff --git a/src/main/resources/org/alfresco/encryption/reencryption_model.xml b/repository/src/main/resources/org/alfresco/encryption/reencryption_model.xml
similarity index 100%
rename from src/main/resources/org/alfresco/encryption/reencryption_model.xml
rename to repository/src/main/resources/org/alfresco/encryption/reencryption_model.xml
diff --git a/src/main/resources/org/alfresco/repo/action/actionModel.xml b/repository/src/main/resources/org/alfresco/repo/action/actionModel.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/action/actionModel.xml
rename to repository/src/main/resources/org/alfresco/repo/action/actionModel.xml
diff --git a/src/main/resources/org/alfresco/repo/content/transform/magick/alfresco.gif b/repository/src/main/resources/org/alfresco/repo/content/transform/magick/alfresco.gif
similarity index 100%
rename from src/main/resources/org/alfresco/repo/content/transform/magick/alfresco.gif
rename to repository/src/main/resources/org/alfresco/repo/content/transform/magick/alfresco.gif
diff --git a/src/main/resources/org/alfresco/repo/i18n/testMessages.properties b/repository/src/main/resources/org/alfresco/repo/i18n/testMessages.properties
similarity index 100%
rename from src/main/resources/org/alfresco/repo/i18n/testMessages.properties
rename to repository/src/main/resources/org/alfresco/repo/i18n/testMessages.properties
diff --git a/src/main/resources/org/alfresco/repo/i18n/testMessages_fr_FR.properties b/repository/src/main/resources/org/alfresco/repo/i18n/testMessages_fr_FR.properties
similarity index 100%
rename from src/main/resources/org/alfresco/repo/i18n/testMessages_fr_FR.properties
rename to repository/src/main/resources/org/alfresco/repo/i18n/testMessages_fr_FR.properties
diff --git a/src/main/resources/org/alfresco/repo/importer/system/systeminfo.xml b/repository/src/main/resources/org/alfresco/repo/importer/system/systeminfo.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/importer/system/systeminfo.xml
rename to repository/src/main/resources/org/alfresco/repo/importer/system/systeminfo.xml
diff --git a/src/main/resources/org/alfresco/repo/module/tool/default-file-mapping.properties b/repository/src/main/resources/org/alfresco/repo/module/tool/default-file-mapping.properties
similarity index 100%
rename from src/main/resources/org/alfresco/repo/module/tool/default-file-mapping.properties
rename to repository/src/main/resources/org/alfresco/repo/module/tool/default-file-mapping.properties
diff --git a/src/main/resources/org/alfresco/repo/node/encrypted_prop_model.xml b/repository/src/main/resources/org/alfresco/repo/node/encrypted_prop_model.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/node/encrypted_prop_model.xml
rename to repository/src/main/resources/org/alfresco/repo/node/encrypted_prop_model.xml
diff --git a/src/main/resources/org/alfresco/repo/rule/ruleModel.xml b/repository/src/main/resources/org/alfresco/repo/rule/ruleModel.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/rule/ruleModel.xml
rename to repository/src/main/resources/org/alfresco/repo/rule/ruleModel.xml
diff --git a/src/main/resources/org/alfresco/repo/security/authentication/userModel.xml b/repository/src/main/resources/org/alfresco/repo/security/authentication/userModel.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/security/authentication/userModel.xml
rename to repository/src/main/resources/org/alfresco/repo/security/authentication/userModel.xml
diff --git a/src/main/resources/org/alfresco/repo/transfer/report/TransferReport.xsd b/repository/src/main/resources/org/alfresco/repo/transfer/report/TransferReport.xsd
similarity index 100%
rename from src/main/resources/org/alfresco/repo/transfer/report/TransferReport.xsd
rename to repository/src/main/resources/org/alfresco/repo/transfer/report/TransferReport.xsd
diff --git a/src/main/resources/org/alfresco/repo/transfer/report/TransferReport2.xsd b/repository/src/main/resources/org/alfresco/repo/transfer/report/TransferReport2.xsd
similarity index 100%
rename from src/main/resources/org/alfresco/repo/transfer/report/TransferReport2.xsd
rename to repository/src/main/resources/org/alfresco/repo/transfer/report/TransferReport2.xsd
diff --git a/src/main/resources/org/alfresco/repo/transfer/reportd/TransferDestinationReport.xsd b/repository/src/main/resources/org/alfresco/repo/transfer/reportd/TransferDestinationReport.xsd
similarity index 100%
rename from src/main/resources/org/alfresco/repo/transfer/reportd/TransferDestinationReport.xsd
rename to repository/src/main/resources/org/alfresco/repo/transfer/reportd/TransferDestinationReport.xsd
diff --git a/src/main/resources/org/alfresco/repo/version/version2_model.xml b/repository/src/main/resources/org/alfresco/repo/version/version2_model.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/version/version2_model.xml
rename to repository/src/main/resources/org/alfresco/repo/version/version2_model.xml
diff --git a/src/main/resources/org/alfresco/repo/version/version_model.xml b/repository/src/main/resources/org/alfresco/repo/version/version_model.xml
similarity index 100%
rename from src/main/resources/org/alfresco/repo/version/version_model.xml
rename to repository/src/main/resources/org/alfresco/repo/version/version_model.xml
diff --git a/src/main/resources/org/alfresco/repo/virtual/node/vanilla.js b/repository/src/main/resources/org/alfresco/repo/virtual/node/vanilla.js
similarity index 100%
rename from src/main/resources/org/alfresco/repo/virtual/node/vanilla.js
rename to repository/src/main/resources/org/alfresco/repo/virtual/node/vanilla.js
diff --git a/src/main/resources/queryRegister.dtd b/repository/src/main/resources/queryRegister.dtd
similarity index 100%
rename from src/main/resources/queryRegister.dtd
rename to repository/src/main/resources/queryRegister.dtd
diff --git a/src/main/web/WEB-INF/web.xml b/repository/src/main/web/WEB-INF/web.xml
similarity index 100%
rename from src/main/web/WEB-INF/web.xml
rename to repository/src/main/web/WEB-INF/web.xml
diff --git a/src/test/java/org/alfresco/AllDBTestsTestSuite.java b/repository/src/test/java/org/alfresco/AllDBTestsTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AllDBTestsTestSuite.java
rename to repository/src/test/java/org/alfresco/AllDBTestsTestSuite.java
diff --git a/src/test/java/org/alfresco/AllUnitTestsSuite.java b/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AllUnitTestsSuite.java
rename to repository/src/test/java/org/alfresco/AllUnitTestsSuite.java
diff --git a/src/test/java/org/alfresco/AppContext01TestSuite.java b/repository/src/test/java/org/alfresco/AppContext01TestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContext01TestSuite.java
rename to repository/src/test/java/org/alfresco/AppContext01TestSuite.java
diff --git a/src/test/java/org/alfresco/AppContext02TestSuite.java b/repository/src/test/java/org/alfresco/AppContext02TestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContext02TestSuite.java
rename to repository/src/test/java/org/alfresco/AppContext02TestSuite.java
diff --git a/src/test/java/org/alfresco/AppContext03TestSuite.java b/repository/src/test/java/org/alfresco/AppContext03TestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContext03TestSuite.java
rename to repository/src/test/java/org/alfresco/AppContext03TestSuite.java
diff --git a/src/test/java/org/alfresco/AppContext04TestSuite.java b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContext04TestSuite.java
rename to repository/src/test/java/org/alfresco/AppContext04TestSuite.java
diff --git a/src/test/java/org/alfresco/AppContext05TestSuite.java b/repository/src/test/java/org/alfresco/AppContext05TestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContext05TestSuite.java
rename to repository/src/test/java/org/alfresco/AppContext05TestSuite.java
diff --git a/src/test/java/org/alfresco/AppContext06TestSuite.java b/repository/src/test/java/org/alfresco/AppContext06TestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContext06TestSuite.java
rename to repository/src/test/java/org/alfresco/AppContext06TestSuite.java
diff --git a/src/test/java/org/alfresco/AppContextExtraTestSuite.java b/repository/src/test/java/org/alfresco/AppContextExtraTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/AppContextExtraTestSuite.java
rename to repository/src/test/java/org/alfresco/AppContextExtraTestSuite.java
diff --git a/src/test/java/org/alfresco/MiscContextTestSuite.java b/repository/src/test/java/org/alfresco/MiscContextTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/MiscContextTestSuite.java
rename to repository/src/test/java/org/alfresco/MiscContextTestSuite.java
diff --git a/src/test/java/org/alfresco/RepositoryStartStopTest.java b/repository/src/test/java/org/alfresco/RepositoryStartStopTest.java
similarity index 100%
rename from src/test/java/org/alfresco/RepositoryStartStopTest.java
rename to repository/src/test/java/org/alfresco/RepositoryStartStopTest.java
diff --git a/src/test/java/org/alfresco/RepositoryStartupTest.java b/repository/src/test/java/org/alfresco/RepositoryStartupTest.java
similarity index 100%
rename from src/test/java/org/alfresco/RepositoryStartupTest.java
rename to repository/src/test/java/org/alfresco/RepositoryStartupTest.java
diff --git a/src/test/java/org/alfresco/email/server/EmailServerTest.java b/repository/src/test/java/org/alfresco/email/server/EmailServerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/email/server/EmailServerTest.java
rename to repository/src/test/java/org/alfresco/email/server/EmailServerTest.java
diff --git a/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java b/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
rename to repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
diff --git a/src/test/java/org/alfresco/encryption/EncryptionTests.java b/repository/src/test/java/org/alfresco/encryption/EncryptionTests.java
similarity index 100%
rename from src/test/java/org/alfresco/encryption/EncryptionTests.java
rename to repository/src/test/java/org/alfresco/encryption/EncryptionTests.java
diff --git a/src/test/java/org/alfresco/encryption/EncryptorTest.java b/repository/src/test/java/org/alfresco/encryption/EncryptorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/encryption/EncryptorTest.java
rename to repository/src/test/java/org/alfresco/encryption/EncryptorTest.java
diff --git a/src/test/java/org/alfresco/encryption/KeyStoreKeyProviderTest.java b/repository/src/test/java/org/alfresco/encryption/KeyStoreKeyProviderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/encryption/KeyStoreKeyProviderTest.java
rename to repository/src/test/java/org/alfresco/encryption/KeyStoreKeyProviderTest.java
diff --git a/src/test/java/org/alfresco/encryption/KeyStoreTests.java b/repository/src/test/java/org/alfresco/encryption/KeyStoreTests.java
similarity index 100%
rename from src/test/java/org/alfresco/encryption/KeyStoreTests.java
rename to repository/src/test/java/org/alfresco/encryption/KeyStoreTests.java
diff --git a/src/test/java/org/alfresco/filesys/FTPServerTest.java b/repository/src/test/java/org/alfresco/filesys/FTPServerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/filesys/FTPServerTest.java
rename to repository/src/test/java/org/alfresco/filesys/FTPServerTest.java
diff --git a/src/test/java/org/alfresco/filesys/auth/ftp/TestFtpAuthenticator.java b/repository/src/test/java/org/alfresco/filesys/auth/ftp/TestFtpAuthenticator.java
similarity index 100%
rename from src/test/java/org/alfresco/filesys/auth/ftp/TestFtpAuthenticator.java
rename to repository/src/test/java/org/alfresco/filesys/auth/ftp/TestFtpAuthenticator.java
diff --git a/src/test/java/org/alfresco/filesys/config/ServerConfigurationBeanTest.java b/repository/src/test/java/org/alfresco/filesys/config/ServerConfigurationBeanTest.java
similarity index 100%
rename from src/test/java/org/alfresco/filesys/config/ServerConfigurationBeanTest.java
rename to repository/src/test/java/org/alfresco/filesys/config/ServerConfigurationBeanTest.java
diff --git a/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
similarity index 100%
rename from src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
rename to repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
diff --git a/src/test/java/org/alfresco/filesys/repo/LockKeeperImplTest.java b/repository/src/test/java/org/alfresco/filesys/repo/LockKeeperImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/filesys/repo/LockKeeperImplTest.java
rename to repository/src/test/java/org/alfresco/filesys/repo/LockKeeperImplTest.java
diff --git a/src/test/java/org/alfresco/filesys/repo/rules/ShuffleTest.java b/repository/src/test/java/org/alfresco/filesys/repo/rules/ShuffleTest.java
similarity index 100%
rename from src/test/java/org/alfresco/filesys/repo/rules/ShuffleTest.java
rename to repository/src/test/java/org/alfresco/filesys/repo/rules/ShuffleTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/AuthoritiesDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/AuthoritiesDataCollectorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/AuthoritiesDataCollectorTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/AuthoritiesDataCollectorTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/ConfigurationDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/ConfigurationDataCollectorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/ConfigurationDataCollectorTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/ConfigurationDataCollectorTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java b/repository/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/InfoDataCollectorTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/ModelUsageDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/ModelUsageDataCollectorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/ModelUsageDataCollectorTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/ModelUsageDataCollectorTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/SessionsUsageDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/SessionsUsageDataCollectorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/SessionsUsageDataCollectorTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/SessionsUsageDataCollectorTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/SystemUsageDataCollectorTest.java b/repository/src/test/java/org/alfresco/heartbeat/SystemUsageDataCollectorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/SystemUsageDataCollectorTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/SystemUsageDataCollectorTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/jobs/LockingJobTest.java b/repository/src/test/java/org/alfresco/heartbeat/jobs/LockingJobTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/jobs/LockingJobTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/jobs/LockingJobTest.java
diff --git a/src/test/java/org/alfresco/heartbeat/jobs/QuartzJobSchedulerTest.java b/repository/src/test/java/org/alfresco/heartbeat/jobs/QuartzJobSchedulerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/heartbeat/jobs/QuartzJobSchedulerTest.java
rename to repository/src/test/java/org/alfresco/heartbeat/jobs/QuartzJobSchedulerTest.java
diff --git a/src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java b/repository/src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java
similarity index 100%
rename from src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java
rename to repository/src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java
diff --git a/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java b/repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java
rename to repository/src/test/java/org/alfresco/messaging/camel/CamelRoutesTest.java
diff --git a/src/test/java/org/alfresco/messaging/camel/MockConsumer.java b/repository/src/test/java/org/alfresco/messaging/camel/MockConsumer.java
similarity index 100%
rename from src/test/java/org/alfresco/messaging/camel/MockConsumer.java
rename to repository/src/test/java/org/alfresco/messaging/camel/MockConsumer.java
diff --git a/src/test/java/org/alfresco/messaging/camel/MockExceptionProcessor.java b/repository/src/test/java/org/alfresco/messaging/camel/MockExceptionProcessor.java
similarity index 100%
rename from src/test/java/org/alfresco/messaging/camel/MockExceptionProcessor.java
rename to repository/src/test/java/org/alfresco/messaging/camel/MockExceptionProcessor.java
diff --git a/src/test/java/org/alfresco/messaging/camel/MockExceptionThrowingConsumer.java b/repository/src/test/java/org/alfresco/messaging/camel/MockExceptionThrowingConsumer.java
similarity index 100%
rename from src/test/java/org/alfresco/messaging/camel/MockExceptionThrowingConsumer.java
rename to repository/src/test/java/org/alfresco/messaging/camel/MockExceptionThrowingConsumer.java
diff --git a/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java b/repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java
similarity index 100%
rename from src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java
rename to repository/src/test/java/org/alfresco/messaging/camel/routes/TestingRouteBuilder.java
diff --git a/src/test/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptorTest.java b/repository/src/test/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptorTest.java
rename to repository/src/test/java/org/alfresco/opencmis/AlfrescoCmisExceptionInterceptorTest.java
diff --git a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java b/repository/src/test/java/org/alfresco/opencmis/BaseCMISTest.java
similarity index 100%
rename from src/test/java/org/alfresco/opencmis/BaseCMISTest.java
rename to repository/src/test/java/org/alfresco/opencmis/BaseCMISTest.java
diff --git a/src/test/java/org/alfresco/opencmis/CMISTest.java b/repository/src/test/java/org/alfresco/opencmis/CMISTest.java
similarity index 100%
rename from src/test/java/org/alfresco/opencmis/CMISTest.java
rename to repository/src/test/java/org/alfresco/opencmis/CMISTest.java
diff --git a/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java b/repository/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java
similarity index 100%
rename from src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java
rename to repository/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java
diff --git a/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java b/repository/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java
rename to repository/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionConditionDefinitionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ActionConditionDefinitionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionConditionDefinitionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionConditionDefinitionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionConditionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ActionConditionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionConditionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionConditionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionDefinitionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ActionDefinitionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionDefinitionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionDefinitionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ActionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java b/repository/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionServiceImpl2Test.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionTestSuite.java b/repository/src/test/java/org/alfresco/repo/action/ActionTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ActionTrackingServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/BaseParameterizedItemDefinitionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/BaseParameterizedItemDefinitionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/BaseParameterizedItemDefinitionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/BaseParameterizedItemDefinitionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/BaseParameterizedItemImplTest.java b/repository/src/test/java/org/alfresco/repo/action/BaseParameterizedItemImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/BaseParameterizedItemImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/BaseParameterizedItemImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/CompositeActionConditionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/CompositeActionConditionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/CompositeActionConditionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/CompositeActionConditionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/CompositeActionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/CompositeActionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/CompositeActionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/CompositeActionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/ParameterDefinitionImplTest.java b/repository/src/test/java/org/alfresco/repo/action/ParameterDefinitionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/ParameterDefinitionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/action/ParameterDefinitionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java b/repository/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java
rename to repository/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTagMappingTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/EmptyActionExecutor.java b/repository/src/test/java/org/alfresco/repo/action/executer/EmptyActionExecutor.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/EmptyActionExecutor.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/EmptyActionExecutor.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/ImporterActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/ImporterActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/ImporterActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/ImporterActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/MailActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/MailActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/MailActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/MailActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/TakeOwnershipActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java b/repository/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java
rename to repository/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java
diff --git a/src/test/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java b/repository/src/test/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
rename to repository/src/test/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
diff --git a/src/test/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java b/repository/src/test/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/activities/AbstractSiteActivityTest.java b/repository/src/test/java/org/alfresco/repo/activities/AbstractSiteActivityTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/AbstractSiteActivityTest.java
rename to repository/src/test/java/org/alfresco/repo/activities/AbstractSiteActivityTest.java
diff --git a/src/test/java/org/alfresco/repo/activities/ActivityServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/activities/ActivityServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/ActivityServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/activities/ActivityServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseInsensitivity.java b/repository/src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseInsensitivity.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseInsensitivity.java
rename to repository/src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseInsensitivity.java
diff --git a/src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseSensitivity.java b/repository/src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseSensitivity.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseSensitivity.java
rename to repository/src/test/java/org/alfresco/repo/activities/SiteActivityTestCaseSensitivity.java
diff --git a/src/test/java/org/alfresco/repo/activities/feed/FeedNotifierJobTest.java b/repository/src/test/java/org/alfresco/repo/activities/feed/FeedNotifierJobTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/feed/FeedNotifierJobTest.java
rename to repository/src/test/java/org/alfresco/repo/activities/feed/FeedNotifierJobTest.java
diff --git a/src/test/java/org/alfresco/repo/activities/feed/FeedNotifierTest.java b/repository/src/test/java/org/alfresco/repo/activities/feed/FeedNotifierTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/feed/FeedNotifierTest.java
rename to repository/src/test/java/org/alfresco/repo/activities/feed/FeedNotifierTest.java
diff --git a/src/test/java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java b/repository/src/test/java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java
rename to repository/src/test/java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java
diff --git a/src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseInsensitivity.java b/repository/src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseInsensitivity.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseInsensitivity.java
rename to repository/src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseInsensitivity.java
diff --git a/src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseSensitivity.java b/repository/src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseSensitivity.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseSensitivity.java
rename to repository/src/test/java/org/alfresco/repo/activities/feed/cleanup/FeedCleanerTestCaseSensitivity.java
diff --git a/src/test/java/org/alfresco/repo/admin/Log4JHierarchyInitTest.java b/repository/src/test/java/org/alfresco/repo/admin/Log4JHierarchyInitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/admin/Log4JHierarchyInitTest.java
rename to repository/src/test/java/org/alfresco/repo/admin/Log4JHierarchyInitTest.java
diff --git a/src/test/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/admin/patch/PatchTest.java b/repository/src/test/java/org/alfresco/repo/admin/patch/PatchTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/admin/patch/PatchTest.java
rename to repository/src/test/java/org/alfresco/repo/admin/patch/PatchTest.java
diff --git a/src/test/java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/admin/registry/RegistryServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/attributes/AttributeServiceTest.java b/repository/src/test/java/org/alfresco/repo/attributes/AttributeServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/attributes/AttributeServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/attributes/AttributeServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobTest.java b/repository/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobTest.java
rename to repository/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobTest.java
diff --git a/src/test/java/org/alfresco/repo/attributes/TestIdentifier.java b/repository/src/test/java/org/alfresco/repo/attributes/TestIdentifier.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/attributes/TestIdentifier.java
rename to repository/src/test/java/org/alfresco/repo/attributes/TestIdentifier.java
diff --git a/src/test/java/org/alfresco/repo/audit/AnnotationTestInterface.java b/repository/src/test/java/org/alfresco/repo/audit/AnnotationTestInterface.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AnnotationTestInterface.java
rename to repository/src/test/java/org/alfresco/repo/audit/AnnotationTestInterface.java
diff --git a/src/test/java/org/alfresco/repo/audit/AuditBootstrapTest.java b/repository/src/test/java/org/alfresco/repo/audit/AuditBootstrapTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AuditBootstrapTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/AuditBootstrapTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/AuditComponentTest.java b/repository/src/test/java/org/alfresco/repo/audit/AuditComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AuditComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/AuditComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/AuditMethodInterceptorTest.java b/repository/src/test/java/org/alfresco/repo/audit/AuditMethodInterceptorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AuditMethodInterceptorTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/AuditMethodInterceptorTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/AuditTestSuite.java b/repository/src/test/java/org/alfresco/repo/audit/AuditTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AuditTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/audit/AuditTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/audit/AuditableAnnotationTest.java b/repository/src/test/java/org/alfresco/repo/audit/AuditableAnnotationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AuditableAnnotationTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/AuditableAnnotationTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/AuditableAspectTest.java b/repository/src/test/java/org/alfresco/repo/audit/AuditableAspectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/AuditableAspectTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/AuditableAspectTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/PropertyAuditFilterTest.java b/repository/src/test/java/org/alfresco/repo/audit/PropertyAuditFilterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/PropertyAuditFilterTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/PropertyAuditFilterTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/UserAuditFilterTest.java b/repository/src/test/java/org/alfresco/repo/audit/UserAuditFilterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/UserAuditFilterTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/UserAuditFilterTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/access/AccessAuditorTest.java b/repository/src/test/java/org/alfresco/repo/audit/access/AccessAuditorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/access/AccessAuditorTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/access/AccessAuditorTest.java
diff --git a/src/test/java/org/alfresco/repo/audit/access/NodeChangeTest.java b/repository/src/test/java/org/alfresco/repo/audit/access/NodeChangeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/audit/access/NodeChangeTest.java
rename to repository/src/test/java/org/alfresco/repo/audit/access/NodeChangeTest.java
diff --git a/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/blog/BlogServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/bulkimport/CreateInPlaceTestData.java b/repository/src/test/java/org/alfresco/repo/bulkimport/CreateInPlaceTestData.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/bulkimport/CreateInPlaceTestData.java
rename to repository/src/test/java/org/alfresco/repo/bulkimport/CreateInPlaceTestData.java
diff --git a/src/test/java/org/alfresco/repo/bulkimport/CreateTestData.java b/repository/src/test/java/org/alfresco/repo/bulkimport/CreateTestData.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/bulkimport/CreateTestData.java
rename to repository/src/test/java/org/alfresco/repo/bulkimport/CreateTestData.java
diff --git a/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java b/repository/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java
rename to repository/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java
diff --git a/src/test/java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java b/repository/src/test/java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java
rename to repository/src/test/java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java
diff --git a/src/test/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTrackerTest.java b/repository/src/test/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTrackerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTrackerTest.java
rename to repository/src/test/java/org/alfresco/repo/bulkimport/impl/StripingFilesystemTrackerTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/AbstractCacheFactoryTest.java b/repository/src/test/java/org/alfresco/repo/cache/AbstractCacheFactoryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/AbstractCacheFactoryTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/AbstractCacheFactoryTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/CacheTest.java b/repository/src/test/java/org/alfresco/repo/cache/CacheTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/CacheTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/CacheTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/DefaultCacheFactoryTest.java b/repository/src/test/java/org/alfresco/repo/cache/DefaultCacheFactoryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/DefaultCacheFactoryTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/DefaultCacheFactoryTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java b/repository/src/test/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/DefaultSimpleCacheTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/InMemoryCacheStatisticsTest.java b/repository/src/test/java/org/alfresco/repo/cache/InMemoryCacheStatisticsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/InMemoryCacheStatisticsTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/InMemoryCacheStatisticsTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/SerializingSimpleCache.java b/repository/src/test/java/org/alfresco/repo/cache/SerializingSimpleCache.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/SerializingSimpleCache.java
rename to repository/src/test/java/org/alfresco/repo/cache/SerializingSimpleCache.java
diff --git a/src/test/java/org/alfresco/repo/cache/TransactionStatsTest.java b/repository/src/test/java/org/alfresco/repo/cache/TransactionStatsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/TransactionStatsTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/TransactionStatsTest.java
diff --git a/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java b/repository/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java
rename to repository/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java
diff --git a/src/test/java/org/alfresco/repo/calendar/CalendarHelpersTest.java b/repository/src/test/java/org/alfresco/repo/calendar/CalendarHelpersTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/calendar/CalendarHelpersTest.java
rename to repository/src/test/java/org/alfresco/repo/calendar/CalendarHelpersTest.java
diff --git a/src/test/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java b/repository/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java
rename to repository/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java
diff --git a/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/content/AbstractJodConverterBasedTest.java b/repository/src/test/java/org/alfresco/repo/content/AbstractJodConverterBasedTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/AbstractJodConverterBasedTest.java
rename to repository/src/test/java/org/alfresco/repo/content/AbstractJodConverterBasedTest.java
diff --git a/src/test/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/AbstractWritableContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/ContentDataTest.java b/repository/src/test/java/org/alfresco/repo/content/ContentDataTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/ContentDataTest.java
rename to repository/src/test/java/org/alfresco/repo/content/ContentDataTest.java
diff --git a/src/test/java/org/alfresco/repo/content/ContentFullContextTestSuite.java b/repository/src/test/java/org/alfresco/repo/content/ContentFullContextTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/ContentFullContextTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/content/ContentFullContextTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/content/GuessMimetypeTest.java b/repository/src/test/java/org/alfresco/repo/content/GuessMimetypeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/GuessMimetypeTest.java
rename to repository/src/test/java/org/alfresco/repo/content/GuessMimetypeTest.java
diff --git a/src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java b/repository/src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java
rename to repository/src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java
diff --git a/src/test/java/org/alfresco/repo/content/LimitedStreamCopierTest.java b/repository/src/test/java/org/alfresco/repo/content/LimitedStreamCopierTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/LimitedStreamCopierTest.java
rename to repository/src/test/java/org/alfresco/repo/content/LimitedStreamCopierTest.java
diff --git a/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java b/repository/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java
rename to repository/src/test/java/org/alfresco/repo/content/MimetypeMapContentTest.java
diff --git a/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java b/repository/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/content/RoutingContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/RoutingContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/RoutingContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/RoutingContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreSpringTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTestSuite.java b/repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/ContentCacheImplTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/ContentCacheImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/ContentCacheImplTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/ContentCacheImplTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/FullTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/FullTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/FullTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/FullTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentStore.java b/repository/src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentStore.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentStore.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentStore.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentWriter.java b/repository/src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentWriter.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentWriter.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/TestCenteraLikeContentWriter.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJobTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJobTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJobTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/cleanup/CachedContentCleanupJobTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyMockTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyMockTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyMockTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyMockTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/quota/StandardQuotaStrategyTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategyTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategyTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/quota/UnlimitedQuotaStrategyTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/test/ConcurrentCachingStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/test/ConcurrentCachingStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/test/ConcurrentCachingStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/test/ConcurrentCachingStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.java b/repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStore.java
diff --git a/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/caching/test/SlowContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/caching/test/SlowContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java b/repository/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/BucketAwareFileContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/BucketAwareFileContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/BucketAwareFileContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/BucketAwareFileContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/FileIOTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/FileIOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/FileIOTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/FileIOTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/SpoofedTextContentReaderTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/SpoofedTextContentReaderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/SpoofedTextContentReaderTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/SpoofedTextContentReaderTest.java
diff --git a/src/test/java/org/alfresco/repo/content/filestore/VolumeAwareFileContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/filestore/VolumeAwareFileContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/filestore/VolumeAwareFileContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/filestore/VolumeAwareFileContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/ConcurrencyOfficeMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/ConcurrencyOfficeMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/ConcurrencyOfficeMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/ConcurrencyOfficeMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/ConcurrencyPdfBoxMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/ConcurrencyPdfBoxMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/ConcurrencyPdfBoxMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/ConcurrencyPdfBoxMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/DWGMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/DWGMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/DWGMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/DWGMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/MP3MetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/MP3MetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/MP3MetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/MP3MetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/MailMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/MetadataExtracterLimitsTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/MetadataExtracterLimitsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/MetadataExtracterLimitsTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/MetadataExtracterLimitsTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/TikaAudioMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/TikaAutoMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java b/repository/src/test/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/replication/AggregatingContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/content/replication/AggregatingContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/replication/AggregatingContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/content/replication/AggregatingContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimitsTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimitsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimitsTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimitsTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/AppleIWorksContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/ArchiveContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/ArchiveContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/ArchiveContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/ArchiveContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/BinaryPassThroughContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/ContentTransformerRegistryTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/ContentTransformerRegistryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/ContentTransformerRegistryTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/ContentTransformerRegistryTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/DifferrentMimeTypeTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/DifferrentMimeTypeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/DifferrentMimeTypeTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/DifferrentMimeTypeTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/EMLTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/EMLTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/EMLTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/EMLTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/FailoverContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/FailoverContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/FailoverContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/FailoverContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/FailoverUnsupportedSubtransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/FailoverUnsupportedSubtransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/FailoverUnsupportedSubtransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/FailoverUnsupportedSubtransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/HtmlParserContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/LegacyTransformerDebugTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/LegacyTransformerDebugTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/LegacyTransformerDebugTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/LegacyTransformerDebugTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/MailContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/MailContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/MailContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/MailContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/MediaWikiContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/MediaWikiContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/MediaWikiContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/MediaWikiContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/PdfBoxContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/PdfBoxContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/PdfBoxContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/PdfBoxContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/PoiContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/PoiContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/PoiContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/PoiContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/PoiHssfContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/PoiHssfContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/PoiHssfContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/PoiHssfContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/RemoteTransformerClientTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/RemoteTransformerClientTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/RemoteTransformerClientTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/RemoteTransformerClientTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/StringExtractingContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/StringExtractingContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/StringExtractingContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/StringExtractingContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TextMiningContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TextMiningContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TextMiningContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TextMiningContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TextToPdfContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TextToPdfContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TextToPdfContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TextToPdfContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformersTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformersTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformersTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigDynamicTransformersTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigImplTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigImplTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigImplTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigLimitsTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigLimitsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigLimitsTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigLimitsTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImplTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImplTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigMBeanImplTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigPropertyTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigPropertyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigPropertyTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigPropertyTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigStatisticsTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigStatisticsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigStatisticsTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigStatisticsTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerConfigTestSuite.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerConfigTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerConfigTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerDebugLogTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerDebugLogTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerDebugLogTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerDebugLogTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerLogTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerLogTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerLogTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerLogTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerLoggerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerLoggerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerLoggerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerLoggerTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertyGetterTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertyGetterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerPropertyGetterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertyGetterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractorTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractorTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertyNameExtractorTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerSelectorImplTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/TransformerSelectorImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/TransformerSelectorImplTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/TransformerSelectorImplTest.java
diff --git a/src/test/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java b/repository/src/test/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java
rename to repository/src/test/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java
diff --git a/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/copy/CopyServiceImplUnitTest.java b/repository/src/test/java/org/alfresco/repo/copy/CopyServiceImplUnitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/copy/CopyServiceImplUnitTest.java
rename to repository/src/test/java/org/alfresco/repo/copy/CopyServiceImplUnitTest.java
diff --git a/src/test/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java b/repository/src/test/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/CMMDownloadTestUtil.java b/repository/src/test/java/org/alfresco/repo/dictionary/CMMDownloadTestUtil.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/CMMDownloadTestUtil.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/CMMDownloadTestUtil.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/CustomModelRepoRestartTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/CustomModelRepoRestartTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/CustomModelRepoRestartTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/CustomModelRepoRestartTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryLoadDAOTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/DictionaryLoadDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/DictionaryLoadDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/DictionaryLoadDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImplTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImplTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/ValueDataTypeValidatorImplTest.java
diff --git a/src/test/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java b/repository/src/test/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
rename to repository/src/test/java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
diff --git a/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/audit/AuditDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/audit/AuditDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/audit/AuditDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/audit/AuditDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/encoding/EncodingDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/locale/LocaleDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/locale/LocaleDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/locale/LocaleDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/locale/LocaleDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/locks/LockDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/locks/LockDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/locks/LockDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/locks/LockDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/node/NodeDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/node/NodeDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/node/NodeDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/node/NodeDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/node/NodePropertyHelperTest.java b/repository/src/test/java/org/alfresco/repo/domain/node/NodePropertyHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/node/NodePropertyHelperTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/node/NodePropertyHelperTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/patch/AppliedPatchDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/permissions/AclCrudDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java b/repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/propval/PropValGenerator.java b/repository/src/test/java/org/alfresco/repo/domain/propval/PropValGenerator.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/propval/PropValGenerator.java
rename to repository/src/test/java/org/alfresco/repo/domain/propval/PropValGenerator.java
diff --git a/src/test/java/org/alfresco/repo/domain/propval/PropertyTypeConverterTest.java b/repository/src/test/java/org/alfresco/repo/domain/propval/PropertyTypeConverterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/propval/PropertyTypeConverterTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/propval/PropertyTypeConverterTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/propval/PropertyValueCleanupTest.java b/repository/src/test/java/org/alfresco/repo/domain/propval/PropertyValueCleanupTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/propval/PropertyValueCleanupTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/propval/PropertyValueCleanupTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/qname/QNameDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/qname/QNameDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/qname/QNameDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/qname/QNameDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutorTest.java b/repository/src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutorTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutorTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplTest.java b/repository/src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/schema/script/ScriptBundleExecutorImplTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImplIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImplIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImplIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImplIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/subscriptions/SubscriptionDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/tenant/TenantAdminDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/domain/usage/UsageDAOTest.java b/repository/src/test/java/org/alfresco/repo/domain/usage/UsageDAOTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/domain/usage/UsageDAOTest.java
rename to repository/src/test/java/org/alfresco/repo/domain/usage/UsageDAOTest.java
diff --git a/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
rename to repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
diff --git a/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
rename to repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
diff --git a/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java
rename to repository/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java
diff --git a/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java
rename to repository/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java
diff --git a/src/test/java/org/alfresco/repo/event2/EventConsolidatorUnitTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventConsolidatorUnitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/EventConsolidatorUnitTest.java
rename to repository/src/test/java/org/alfresco/repo/event2/EventConsolidatorUnitTest.java
diff --git a/src/test/java/org/alfresco/repo/event2/EventFilterUnitTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventFilterUnitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/EventFilterUnitTest.java
rename to repository/src/test/java/org/alfresco/repo/event2/EventFilterUnitTest.java
diff --git a/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java
rename to repository/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java
diff --git a/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java
rename to repository/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java
diff --git a/src/test/java/org/alfresco/repo/event2/RepoEvent2ITSuite.java b/repository/src/test/java/org/alfresco/repo/event2/RepoEvent2ITSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/RepoEvent2ITSuite.java
rename to repository/src/test/java/org/alfresco/repo/event2/RepoEvent2ITSuite.java
diff --git a/src/test/java/org/alfresco/repo/event2/RepoEvent2UnitSuite.java b/repository/src/test/java/org/alfresco/repo/event2/RepoEvent2UnitSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/RepoEvent2UnitSuite.java
rename to repository/src/test/java/org/alfresco/repo/event2/RepoEvent2UnitSuite.java
diff --git a/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
rename to repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
diff --git a/src/test/java/org/alfresco/repo/events/ClientUtilTest.java b/repository/src/test/java/org/alfresco/repo/events/ClientUtilTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/events/ClientUtilTest.java
rename to repository/src/test/java/org/alfresco/repo/events/ClientUtilTest.java
diff --git a/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java b/repository/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java
rename to repository/src/test/java/org/alfresco/repo/events/EventPublisherForTestingOnly.java
diff --git a/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java b/repository/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/exporter/RepositoryExporterComponentTest.java b/repository/src/test/java/org/alfresco/repo/exporter/RepositoryExporterComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/exporter/RepositoryExporterComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/exporter/RepositoryExporterComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/forms/FormServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/forms/FormServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/FormServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/forms/FormServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java b/repository/src/test/java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/forms/processor/node/FieldProcessorTest.java b/repository/src/test/java/org/alfresco/repo/forms/processor/node/FieldProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/processor/node/FieldProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/forms/processor/node/FieldProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/forms/processor/node/MockClassAttributeDefinition.java b/repository/src/test/java/org/alfresco/repo/forms/processor/node/MockClassAttributeDefinition.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/processor/node/MockClassAttributeDefinition.java
rename to repository/src/test/java/org/alfresco/repo/forms/processor/node/MockClassAttributeDefinition.java
diff --git a/src/test/java/org/alfresco/repo/forms/processor/workflow/FormProcessorTest.java b/repository/src/test/java/org/alfresco/repo/forms/processor/workflow/FormProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/processor/workflow/FormProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/forms/processor/workflow/FormProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java b/repository/src/test/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java b/repository/src/test/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/forum/CommentsTest.java b/repository/src/test/java/org/alfresco/repo/forum/CommentsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/forum/CommentsTest.java
rename to repository/src/test/java/org/alfresco/repo/forum/CommentsTest.java
diff --git a/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java b/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
rename to repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
diff --git a/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java b/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java
rename to repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java
diff --git a/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/imap/LoadTester.java b/repository/src/test/java/org/alfresco/repo/imap/LoadTester.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/imap/LoadTester.java
rename to repository/src/test/java/org/alfresco/repo/imap/LoadTester.java
diff --git a/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java b/repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java
rename to repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java
diff --git a/src/test/java/org/alfresco/repo/importer/FileImporterTest.java b/repository/src/test/java/org/alfresco/repo/importer/FileImporterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/importer/FileImporterTest.java
rename to repository/src/test/java/org/alfresco/repo/importer/FileImporterTest.java
diff --git a/src/test/java/org/alfresco/repo/importer/ImporterComponentTest.java b/repository/src/test/java/org/alfresco/repo/importer/ImporterComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/importer/ImporterComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/importer/ImporterComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/invitation/ActivitiInvitationServiceImplTests.java b/repository/src/test/java/org/alfresco/repo/invitation/ActivitiInvitationServiceImplTests.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/invitation/ActivitiInvitationServiceImplTests.java
rename to repository/src/test/java/org/alfresco/repo/invitation/ActivitiInvitationServiceImplTests.java
diff --git a/src/test/java/org/alfresco/repo/invitation/FullInvitationServiceImplTests.java b/repository/src/test/java/org/alfresco/repo/invitation/FullInvitationServiceImplTests.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/invitation/FullInvitationServiceImplTests.java
rename to repository/src/test/java/org/alfresco/repo/invitation/FullInvitationServiceImplTests.java
diff --git a/src/test/java/org/alfresco/repo/invitation/InvitationCleanupTest.java b/repository/src/test/java/org/alfresco/repo/invitation/InvitationCleanupTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/invitation/InvitationCleanupTest.java
rename to repository/src/test/java/org/alfresco/repo/invitation/InvitationCleanupTest.java
diff --git a/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java b/repository/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
rename to repository/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
diff --git a/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java b/repository/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java
rename to repository/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java
diff --git a/src/test/java/org/alfresco/repo/jscript/PeopleTest.java b/repository/src/test/java/org/alfresco/repo/jscript/PeopleTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/jscript/PeopleTest.java
rename to repository/src/test/java/org/alfresco/repo/jscript/PeopleTest.java
diff --git a/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java b/repository/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java
rename to repository/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java
diff --git a/src/test/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java b/repository/src/test/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
rename to repository/src/test/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
diff --git a/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java b/repository/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java
rename to repository/src/test/java/org/alfresco/repo/jscript/ScriptNodeTest.java
diff --git a/src/test/java/org/alfresco/repo/jscript/ScriptSearchTest.java b/repository/src/test/java/org/alfresco/repo/jscript/ScriptSearchTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/jscript/ScriptSearchTest.java
rename to repository/src/test/java/org/alfresco/repo/jscript/ScriptSearchTest.java
diff --git a/src/test/java/org/alfresco/repo/links/LinksServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/links/LinksServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/links/LinksServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/links/LinksServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java b/repository/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java b/repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/LockTestSuite.java b/repository/src/test/java/org/alfresco/repo/lock/LockTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/LockTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/lock/LockTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/lock/LockUtilsTest.java b/repository/src/test/java/org/alfresco/repo/lock/LockUtilsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/LockUtilsTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/LockUtilsTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTestBase.java b/repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTestBase.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTestBase.java
rename to repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTestBase.java
diff --git a/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java b/repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTest.java b/repository/src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTxTest.java b/repository/src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTxTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTxTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/mem/LockStoreImplTxTest.java
diff --git a/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java b/repository/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java
rename to repository/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java
diff --git a/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java b/repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java
rename to repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/AbstractChainedSubsystemTest.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/AbstractChainedSubsystemTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/AbstractChainedSubsystemTest.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/AbstractChainedSubsystemTest.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactoryTest.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactoryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactoryTest.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/CryptodocSwitchableApplicationContextFactoryTest.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/test/SampleService.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/test/SampleService.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/test/SampleService.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/test/SampleService.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/test/SubsystemsTest.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/test/SubsystemsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/test/SubsystemsTest.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/test/SubsystemsTest.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/test/TestBean.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/test/TestBean.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/test/TestBean.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/test/TestBean.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/test/TestPortEarlyPropertyChecker.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/test/TestPortEarlyPropertyChecker.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/test/TestPortEarlyPropertyChecker.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/test/TestPortEarlyPropertyChecker.java
diff --git a/src/test/java/org/alfresco/repo/management/subsystems/test/TestService.java b/repository/src/test/java/org/alfresco/repo/management/subsystems/test/TestService.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/management/subsystems/test/TestService.java
rename to repository/src/test/java/org/alfresco/repo/management/subsystems/test/TestService.java
diff --git a/src/test/java/org/alfresco/repo/model/ModelTestSuite.java b/repository/src/test/java/org/alfresco/repo/model/ModelTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ModelTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/model/ModelTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderDuplicateChildTest.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServicePropagationTest.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServicePropagationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/FileFolderServicePropagationTest.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServicePropagationTest.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectCmisConfigTest.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectCmisConfigTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectCmisConfigTest.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectCmisConfigTest.java
diff --git a/src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java b/repository/src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java
rename to repository/src/test/java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/ContentFilterLanguagesMapTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/EditionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/LanguagesTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/LanguagesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/LanguagesTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/LanguagesTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/MLContainerTypeTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/MultilingualContentServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java b/repository/src/test/java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java
rename to repository/src/test/java/org/alfresco/repo/model/ml/tools/MultilingualDocumentAspectTest.java
diff --git a/src/test/java/org/alfresco/repo/module/ComponentsTest.java b/repository/src/test/java/org/alfresco/repo/module/ComponentsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/ComponentsTest.java
rename to repository/src/test/java/org/alfresco/repo/module/ComponentsTest.java
diff --git a/src/test/java/org/alfresco/repo/module/ModuleComponentHelperTest.java b/repository/src/test/java/org/alfresco/repo/module/ModuleComponentHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/ModuleComponentHelperTest.java
rename to repository/src/test/java/org/alfresco/repo/module/ModuleComponentHelperTest.java
diff --git a/src/test/java/org/alfresco/repo/module/ModuleDetailsImplTest.java b/repository/src/test/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
rename to repository/src/test/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
diff --git a/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java b/repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
rename to repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
diff --git a/src/test/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java b/repository/src/test/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java
rename to repository/src/test/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java
diff --git a/src/test/java/org/alfresco/repo/module/tool/ModuleServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/module/tool/ModuleServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/tool/ModuleServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/module/tool/ModuleServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/module/tool/WarHelperImplTest.java b/repository/src/test/java/org/alfresco/repo/module/tool/WarHelperImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/module/tool/WarHelperImplTest.java
rename to repository/src/test/java/org/alfresco/repo/module/tool/WarHelperImplTest.java
diff --git a/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/repository/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java b/repository/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java
rename to repository/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java
diff --git a/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java b/repository/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java b/repository/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/node/MetadataEncryptorTests.java b/repository/src/test/java/org/alfresco/repo/node/MetadataEncryptorTests.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/MetadataEncryptorTests.java
rename to repository/src/test/java/org/alfresco/repo/node/MetadataEncryptorTests.java
diff --git a/src/test/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java b/repository/src/test/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java
rename to repository/src/test/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java
diff --git a/src/test/java/org/alfresco/repo/node/NodeServiceTest.java b/repository/src/test/java/org/alfresco/repo/node/NodeServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/NodeServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/node/NodeServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java b/repository/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java b/repository/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
rename to repository/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
diff --git a/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java b/repository/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java
rename to repository/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java
diff --git a/src/test/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java b/repository/src/test/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
rename to repository/src/test/java/org/alfresco/repo/node/cleanup/TransactionCleanupTest.java
diff --git a/src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplPropagationTest.java b/repository/src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplPropagationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplPropagationTest.java
rename to repository/src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplPropagationTest.java
diff --git a/src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java b/repository/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java
rename to repository/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java
diff --git a/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java b/repository/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java
rename to repository/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java
diff --git a/src/test/java/org/alfresco/repo/node/integrity/IntegrityEventTest.java b/repository/src/test/java/org/alfresco/repo/node/integrity/IntegrityEventTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/integrity/IntegrityEventTest.java
rename to repository/src/test/java/org/alfresco/repo/node/integrity/IntegrityEventTest.java
diff --git a/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java b/repository/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java
rename to repository/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java
diff --git a/src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java b/repository/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java
rename to repository/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java
diff --git a/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java b/repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java b/repository/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java b/repository/src/test/java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/policy/MTPolicyComponentTest.java b/repository/src/test/java/org/alfresco/repo/policy/MTPolicyComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/policy/MTPolicyComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/policy/MTPolicyComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/policy/PolicyComponentTest.java b/repository/src/test/java/org/alfresco/repo/policy/PolicyComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/policy/PolicyComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/policy/PolicyComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java b/repository/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java
rename to repository/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java
diff --git a/src/test/java/org/alfresco/repo/policy/annotation/QNameTypeEditorTest.java b/repository/src/test/java/org/alfresco/repo/policy/annotation/QNameTypeEditorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/policy/annotation/QNameTypeEditorTest.java
rename to repository/src/test/java/org/alfresco/repo/policy/annotation/QNameTypeEditorTest.java
diff --git a/src/test/java/org/alfresco/repo/preference/PreferenceServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/preference/PreferenceServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/preference/PreferenceServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/preference/PreferenceServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rating/RatingServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rating/RatingServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rating/RatingServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rating/RatingServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java b/repository/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java
rename to repository/src/test/java/org/alfresco/repo/rawevents/EventBehaviourTest.java
diff --git a/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java b/repository/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java
rename to repository/src/test/java/org/alfresco/repo/rawevents/TransactionAwareEventProducerTest.java
diff --git a/src/test/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java b/repository/src/test/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java
rename to repository/src/test/java/org/alfresco/repo/remotecredentials/RemoteCredentialsServicesTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/AllRenditionTests.java b/repository/src/test/java/org/alfresco/repo/rendition/AllRenditionTests.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/AllRenditionTests.java
rename to repository/src/test/java/org/alfresco/repo/rendition/AllRenditionTests.java
diff --git a/src/test/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java b/repository/src/test/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
rename to repository/src/test/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
diff --git a/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java b/repository/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/RenditionNodeManagerTest.java b/repository/src/test/java/org/alfresco/repo/rendition/RenditionNodeManagerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/RenditionNodeManagerTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/RenditionNodeManagerTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/RenditionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/rendition/RenditionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/RenditionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/RenditionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java b/repository/src/test/java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java b/repository/src/test/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngineTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngineTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngineTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngineTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/AbstractRenditionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LegacyLocalRenditionTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LegacyLocalRenditionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LegacyLocalRenditionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LegacyLocalRenditionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LegacyRenditionTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LegacyRenditionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LegacyRenditionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LegacyRenditionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClientIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClientIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClientIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LegacySynchronousTransformClientIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LegacyTransformClientIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LegacyTransformClientIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LegacyTransformClientIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LegacyTransformClientIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistryIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistryIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistryIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LegacyTransformServiceRegistryIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LocalRenditionTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LocalRenditionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LocalRenditionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LocalRenditionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClientIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClientIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClientIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClientIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LocalTransformClientIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LocalTransformClientIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LocalTransformClientIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LocalTransformClientIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/LocalTransformServiceRegistryIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/LocalTransformServiceRegistryIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/LocalTransformServiceRegistryIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/LocalTransformServiceRegistryIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/NoneRenditionTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/NoneRenditionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/NoneRenditionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/NoneRenditionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/RenditionDefinitionTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/RenditionEventProcessorTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionEventProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/RenditionEventProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/RenditionEventProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2IntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/RenditionService2Test.java b/repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2Test.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/RenditionService2Test.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/RenditionService2Test.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/TestSynchronousTransformClient.java b/repository/src/test/java/org/alfresco/repo/rendition2/TestSynchronousTransformClient.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/TestSynchronousTransformClient.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/TestSynchronousTransformClient.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/TestTransformServiceRegistry.java b/repository/src/test/java/org/alfresco/repo/rendition2/TestTransformServiceRegistry.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/TestTransformServiceRegistry.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/TestTransformServiceRegistry.java
diff --git a/src/test/java/org/alfresco/repo/rendition2/TransformationOptionsConverterTest.java b/repository/src/test/java/org/alfresco/repo/rendition2/TransformationOptionsConverterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rendition2/TransformationOptionsConverterTest.java
rename to repository/src/test/java/org/alfresco/repo/rendition2/TransformationOptionsConverterTest.java
diff --git a/src/test/java/org/alfresco/repo/replication/ReplicationServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/replication/ReplicationServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/BaseRuleTest.java b/repository/src/test/java/org/alfresco/repo/rule/BaseRuleTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/BaseRuleTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/BaseRuleTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/MiscellaneousRulesTest.java b/repository/src/test/java/org/alfresco/repo/rule/MiscellaneousRulesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/MiscellaneousRulesTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/MiscellaneousRulesTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/RuleLinkTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleLinkTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/RuleLinkTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/RuleLinkTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/RuleServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/RuleServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/RuleServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/RuleTestSuite.java b/repository/src/test/java/org/alfresco/repo/rule/RuleTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/RuleTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/rule/RuleTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/rule/RuleTypeImplTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleTypeImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/RuleTypeImplTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/RuleTypeImplTest.java
diff --git a/src/test/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java b/repository/src/test/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java
rename to repository/src/test/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java
diff --git a/src/test/java/org/alfresco/repo/search/DocumentNavigatorTest.java b/repository/src/test/java/org/alfresco/repo/search/DocumentNavigatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/DocumentNavigatorTest.java
rename to repository/src/test/java/org/alfresco/repo/search/DocumentNavigatorTest.java
diff --git a/src/test/java/org/alfresco/repo/search/MLAnaysisModeExpansionTest.java b/repository/src/test/java/org/alfresco/repo/search/MLAnaysisModeExpansionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/MLAnaysisModeExpansionTest.java
rename to repository/src/test/java/org/alfresco/repo/search/MLAnaysisModeExpansionTest.java
diff --git a/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java b/repository/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/search/SearchServiceTest.java b/repository/src/test/java/org/alfresco/repo/search/SearchServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/SearchServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/search/SearchServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/search/SearchTestSuite.java b/repository/src/test/java/org/alfresco/repo/search/SearchTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/SearchTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/search/SearchTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java b/repository/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/SearcherComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/search/SearcherComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/search/SolrSearchContextTest.java b/repository/src/test/java/org/alfresco/repo/search/SolrSearchContextTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/SolrSearchContextTest.java
rename to repository/src/test/java/org/alfresco/repo/search/SolrSearchContextTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClientTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClientTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClientTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClientTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSetTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSetTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSetTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrSQLJSONResultSetTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/SolrStatsResultTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrStatsResultTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/SolrStatsResultTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrStatsResultTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapperTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapperTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/SolrStoreMappingWrapperTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManagerTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManagerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManagerTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/SpellCheckDecisionManagerTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/TestNode.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/TestNode.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/TestNode.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/TestNode.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtilsTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtilsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtilsTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/FacetQNameUtilsTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparatorTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparatorTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetComparatorTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetQueriesDisplayHandlersTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetQueriesDisplayHandlersTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetQueriesDisplayHandlersTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetQueriesDisplayHandlersTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetTestSuite.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/security/SecurityTestSuite.java b/repository/src/test/java/org/alfresco/repo/security/SecurityTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/SecurityTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/security/SecurityTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactoryTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactoryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactoryTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/AlfrescoSSLSocketFactoryTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/AuthenticationBootstrapTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationBootstrapTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/AuthenticationBootstrapTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationBootstrapTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/ChainingAuthenticationServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/NameBasedUserNameGeneratorTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/NameBasedUserNameGeneratorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/NameBasedUserNameGeneratorTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/NameBasedUserNameGeneratorTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/PasswordHashingTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/PasswordHashingTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/PasswordHashingTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/PasswordHashingTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/TestAuthenticationServiceImpl.java b/repository/src/test/java/org/alfresco/repo/security/authentication/TestAuthenticationServiceImpl.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/TestAuthenticationServiceImpl.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/TestAuthenticationServiceImpl.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/UpgradePasswordHashTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/UpgradePasswordHashTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/UpgradePasswordHashTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/UpgradePasswordHashTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/external/DefaultRemoteUserMapperTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/external/LocalAuthenticationServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/external/LocalAuthenticationServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/external/LocalAuthenticationServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/external/LocalAuthenticationServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponentTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceAuthenticationComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticatorTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticatorTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticatorTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authority/DuplicateAuthorityTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authority/ExtendedPermissionServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService_RegExTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService_RegExTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService_RegExTest.java
rename to repository/src/test/java/org/alfresco/repo/security/authority/script/ScriptAuthorityService_RegExTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/PermissionCheckCollectionTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/PermissionCheckCollectionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/PermissionCheckCollectionTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/PermissionCheckCollectionTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/PermissionCheckedCollectionTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/PermissionCheckedCollectionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/PermissionCheckedCollectionTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/PermissionCheckedCollectionTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/AbstractReadPermissionTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/AbstractReadPermissionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/AbstractReadPermissionTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/AbstractReadPermissionTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/ReadPermissionTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoterTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSetTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSetTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSetTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSetTest.java
diff --git a/src/test/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java
rename to repository/src/test/java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java
diff --git a/src/test/java/org/alfresco/repo/security/person/GetPeopleCannedQueryTest.java b/repository/src/test/java/org/alfresco/repo/security/person/GetPeopleCannedQueryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/person/GetPeopleCannedQueryTest.java
rename to repository/src/test/java/org/alfresco/repo/security/person/GetPeopleCannedQueryTest.java
diff --git a/src/test/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java b/repository/src/test/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
rename to repository/src/test/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
diff --git a/src/test/java/org/alfresco/repo/security/person/PersonTest.java b/repository/src/test/java/org/alfresco/repo/security/person/PersonTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/person/PersonTest.java
rename to repository/src/test/java/org/alfresco/repo/security/person/PersonTest.java
diff --git a/src/test/java/org/alfresco/repo/security/person/TestGroupManager.java b/repository/src/test/java/org/alfresco/repo/security/person/TestGroupManager.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/person/TestGroupManager.java
rename to repository/src/test/java/org/alfresco/repo/security/person/TestGroupManager.java
diff --git a/src/test/java/org/alfresco/repo/security/person/TestPersonManager.java b/repository/src/test/java/org/alfresco/repo/security/person/TestPersonManager.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/person/TestPersonManager.java
rename to repository/src/test/java/org/alfresco/repo/security/person/TestPersonManager.java
diff --git a/src/test/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerTest.java b/repository/src/test/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerTest.java
rename to repository/src/test/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerTest.java
diff --git a/src/test/java/org/alfresco/repo/security/sync/LDAPUserRegistryTest.java b/repository/src/test/java/org/alfresco/repo/security/sync/LDAPUserRegistryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/security/sync/LDAPUserRegistryTest.java
rename to repository/src/test/java/org/alfresco/repo/security/sync/LDAPUserRegistryTest.java
diff --git a/src/test/java/org/alfresco/repo/service/StoreRedirectorProxyFactoryTest.java b/repository/src/test/java/org/alfresco/repo/service/StoreRedirectorProxyFactoryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/service/StoreRedirectorProxyFactoryTest.java
rename to repository/src/test/java/org/alfresco/repo/service/StoreRedirectorProxyFactoryTest.java
diff --git a/src/test/java/org/alfresco/repo/site/CustomRoleTest.java b/repository/src/test/java/org/alfresco/repo/site/CustomRoleTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/site/CustomRoleTest.java
rename to repository/src/test/java/org/alfresco/repo/site/CustomRoleTest.java
diff --git a/src/test/java/org/alfresco/repo/site/RoleComparatorImplTest.java b/repository/src/test/java/org/alfresco/repo/site/RoleComparatorImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/site/RoleComparatorImplTest.java
rename to repository/src/test/java/org/alfresco/repo/site/RoleComparatorImplTest.java
diff --git a/src/test/java/org/alfresco/repo/site/SiteMembershipTest.java b/repository/src/test/java/org/alfresco/repo/site/SiteMembershipTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/site/SiteMembershipTest.java
rename to repository/src/test/java/org/alfresco/repo/site/SiteMembershipTest.java
diff --git a/src/test/java/org/alfresco/repo/site/SiteServiceImplMoreTest.java b/repository/src/test/java/org/alfresco/repo/site/SiteServiceImplMoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/site/SiteServiceImplMoreTest.java
rename to repository/src/test/java/org/alfresco/repo/site/SiteServiceImplMoreTest.java
diff --git a/src/test/java/org/alfresco/repo/site/SiteServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/site/SiteServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/site/SiteServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/site/SiteServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/site/SiteServiceTestHuge.java b/repository/src/test/java/org/alfresco/repo/site/SiteServiceTestHuge.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/site/SiteServiceTestHuge.java
rename to repository/src/test/java/org/alfresco/repo/site/SiteServiceTestHuge.java
diff --git a/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java b/repository/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java b/repository/src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
rename to repository/src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
diff --git a/src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/tagging/TaggingServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/template/TemplateServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/template/XSLTProcessorTest.java b/repository/src/test/java/org/alfresco/repo/template/XSLTProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/template/XSLTProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/template/XSLTProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStoreTest.java b/repository/src/test/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/tenant/MultiTAdminServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/tenant/MultiTAdminServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tenant/MultiTAdminServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/tenant/MultiTAdminServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java b/repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java
rename to repository/src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java
diff --git a/src/test/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java b/repository/src/test/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java
rename to repository/src/test/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java
diff --git a/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplParameterTest.java b/repository/src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplParameterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplParameterTest.java
rename to repository/src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplParameterTest.java
diff --git a/src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java b/repository/src/test/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java
rename to repository/src/test/java/org/alfresco/repo/thumbnail/conditions/NodeEligibleForRethumbnailingEvaluatorTest.java
diff --git a/src/test/java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java b/repository/src/test/java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
rename to repository/src/test/java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
diff --git a/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java b/repository/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java
rename to repository/src/test/java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java
diff --git a/src/test/java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java b/repository/src/test/java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java
rename to repository/src/test/java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java
diff --git a/src/test/java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java b/repository/src/test/java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java
rename to repository/src/test/java/org/alfresco/repo/transaction/TransactionAwareSingletonTest.java
diff --git a/src/test/java/org/alfresco/repo/transaction/TransactionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/transaction/TransactionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transaction/TransactionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/transaction/TransactionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/ContentChunkerImplTest.java b/repository/src/test/java/org/alfresco/repo/transfer/ContentChunkerImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/ContentChunkerImplTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/ContentChunkerImplTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java b/repository/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/NodeCrawlerTest.java b/repository/src/test/java/org/alfresco/repo/transfer/NodeCrawlerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/NodeCrawlerTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/NodeCrawlerTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java b/repository/src/test/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/TestTransferCallback.java b/repository/src/test/java/org/alfresco/repo/transfer/TestTransferCallback.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/TestTransferCallback.java
rename to repository/src/test/java/org/alfresco/repo/transfer/TestTransferCallback.java
diff --git a/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java b/repository/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java b/repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java b/repository/src/test/java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/UnitTestInProcessTransmitterImpl.java b/repository/src/test/java/org/alfresco/repo/transfer/UnitTestInProcessTransmitterImpl.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/UnitTestInProcessTransmitterImpl.java
rename to repository/src/test/java/org/alfresco/repo/transfer/UnitTestInProcessTransmitterImpl.java
diff --git a/src/test/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java b/repository/src/test/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java
rename to repository/src/test/java/org/alfresco/repo/transfer/UnitTestTransferManifestNodeFactory.java
diff --git a/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/manifest/TestTransferManifestProcessor.java b/repository/src/test/java/org/alfresco/repo/transfer/manifest/TestTransferManifestProcessor.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/manifest/TestTransferManifestProcessor.java
rename to repository/src/test/java/org/alfresco/repo/transfer/manifest/TestTransferManifestProcessor.java
diff --git a/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java b/repository/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java
diff --git a/src/test/java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java b/repository/src/test/java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java
rename to repository/src/test/java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java
diff --git a/src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java b/repository/src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java
rename to repository/src/test/java/org/alfresco/repo/urlshortening/BitlyUrlShortenerTest.java
diff --git a/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java b/repository/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java b/repository/src/test/java/org/alfresco/repo/usage/UserUsageTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/usage/UserUsageTest.java
rename to repository/src/test/java/org/alfresco/repo/usage/UserUsageTest.java
diff --git a/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java b/repository/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java b/repository/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java
rename to repository/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java
diff --git a/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/version/NodeServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/version/NodeServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/NodeServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/version/NodeServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java
rename to repository/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java
diff --git a/src/test/java/org/alfresco/repo/version/VersionTestSuite.java b/repository/src/test/java/org/alfresco/repo/version/VersionTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/VersionTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/version/VersionTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/version/VersionableAspectTest.java b/repository/src/test/java/org/alfresco/repo/version/VersionableAspectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/VersionableAspectTest.java
rename to repository/src/test/java/org/alfresco/repo/version/VersionableAspectTest.java
diff --git a/src/test/java/org/alfresco/repo/version/common/VersionHistoryImplTest.java b/repository/src/test/java/org/alfresco/repo/version/common/VersionHistoryImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/common/VersionHistoryImplTest.java
rename to repository/src/test/java/org/alfresco/repo/version/common/VersionHistoryImplTest.java
diff --git a/src/test/java/org/alfresco/repo/version/common/VersionImplTest.java b/repository/src/test/java/org/alfresco/repo/version/common/VersionImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/common/VersionImplTest.java
rename to repository/src/test/java/org/alfresco/repo/version/common/VersionImplTest.java
diff --git a/src/test/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicyTest.java b/repository/src/test/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicyTest.java
rename to repository/src/test/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicyTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/TypeAndAspectsFormProcessor.java b/repository/src/test/java/org/alfresco/repo/virtual/TypeAndAspectsFormProcessor.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/TypeAndAspectsFormProcessor.java
rename to repository/src/test/java/org/alfresco/repo/virtual/TypeAndAspectsFormProcessor.java
diff --git a/src/test/java/org/alfresco/repo/virtual/VirtualizationConfigTestBootstrap.java b/repository/src/test/java/org/alfresco/repo/virtual/VirtualizationConfigTestBootstrap.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/VirtualizationConfigTestBootstrap.java
rename to repository/src/test/java/org/alfresco/repo/virtual/VirtualizationConfigTestBootstrap.java
diff --git a/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/VirtualizationTest.java b/repository/src/test/java/org/alfresco/repo/virtual/VirtualizationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/VirtualizationTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/VirtualizationTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparatorTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparatorTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/FileInfoPropsComparatorTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualBehaviourFilterExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualLockableAspectInterceptorExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPreferenceServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java b/repository/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraintTest.java b/repository/src/test/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraintTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraintTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraintTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/page/PageCollatorTest.java b/repository/src/test/java/org/alfresco/repo/virtual/page/PageCollatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/page/PageCollatorTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/page/PageCollatorTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/AbstractReferenceParserTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/AbstractReferenceParserTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/AbstractReferenceParserTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/AbstractReferenceParserTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/GetChildByIdMethodTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/GetChildByIdMethodTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/GetChildByIdMethodTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/GetChildByIdMethodTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethodTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethodTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethodTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/GetParentReferenceMethodTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/HashStringifierTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/HashStringifierTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/HashStringifierTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/HashStringifierTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethodTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethodTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethodTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/NewVirtualReferenceMethodTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasherTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasherTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasherTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/NodeRefRadixHasherTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/NumericPathHasherTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/NumericPathHasherTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/NumericPathHasherTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/NumericPathHasherTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/PlainReferenceParserTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/PlainStringifierTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/PlainStringifierTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/PlainStringifierTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/PlainStringifierTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/ProtocolTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/ProtocolTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/ProtocolTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/ProtocolTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/ReferenceTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/ReferenceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/ReferenceTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/ReferenceTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/ResourceParameterTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/ResourceParameterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/ResourceParameterTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/ResourceParameterTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/StoredPathHasherTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/StoredPathHasherTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/StoredPathHasherTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/StoredPathHasherTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/StringParameterTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/StringParameterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/StringParameterTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/StringParameterTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/VirtualProtocolTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/VirtualProtocolTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/VirtualProtocolTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/VirtualProtocolTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/ZeroReferenceParserTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/ref/ZeroStringifierTest.java b/repository/src/test/java/org/alfresco/repo/virtual/ref/ZeroStringifierTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/ref/ZeroStringifierTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/ref/ZeroStringifierTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/store/ReferenceComparatorTest.java b/repository/src/test/java/org/alfresco/repo/virtual/store/ReferenceComparatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/store/ReferenceComparatorTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/store/ReferenceComparatorTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethodTest.java b/repository/src/test/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethodTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethodTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/store/SystemVirtualizationMethodTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodUnitTest.java b/repository/src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodUnitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodUnitTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/store/TypeVirtualizationMethodUnitTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java b/repository/src/test/java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/template/ApplyTemplateMethodTest.java b/repository/src/test/java/org/alfresco/repo/virtual/template/ApplyTemplateMethodTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/template/ApplyTemplateMethodTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/template/ApplyTemplateMethodTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/template/TemplateFilingRuleTest.java b/repository/src/test/java/org/alfresco/repo/virtual/template/TemplateFilingRuleTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/template/TemplateFilingRuleTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/template/TemplateFilingRuleTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/template/TemplateResourceProcessorTest.java b/repository/src/test/java/org/alfresco/repo/virtual/template/TemplateResourceProcessorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/template/TemplateResourceProcessorTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/template/TemplateResourceProcessorTest.java
diff --git a/src/test/java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java b/repository/src/test/java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
rename to repository/src/test/java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
diff --git a/src/test/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java b/repository/src/test/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
rename to repository/src/test/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
diff --git a/src/test/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java b/repository/src/test/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java
rename to repository/src/test/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java
diff --git a/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java b/repository/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java
rename to repository/src/test/java/org/alfresco/repo/web/scripts/servlet/LocalTestRunAsAuthenticatorFactory.java
diff --git a/src/test/java/org/alfresco/repo/workflow/AbstractMultitenantWorkflowTest.java b/repository/src/test/java/org/alfresco/repo/workflow/AbstractMultitenantWorkflowTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/AbstractMultitenantWorkflowTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/AbstractMultitenantWorkflowTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/AbstractWorkflowServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/WorkflowSuiteContextShutdownTest.java b/repository/src/test/java/org/alfresco/repo/workflow/WorkflowSuiteContextShutdownTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/WorkflowSuiteContextShutdownTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/WorkflowSuiteContextShutdownTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/WorkflowTestHelper.java b/repository/src/test/java/org/alfresco/repo/workflow/WorkflowTestHelper.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/WorkflowTestHelper.java
rename to repository/src/test/java/org/alfresco/repo/workflow/WorkflowTestHelper.java
diff --git a/src/test/java/org/alfresco/repo/workflow/WorkflowTestSuite.java b/repository/src/test/java/org/alfresco/repo/workflow/WorkflowTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/WorkflowTestSuite.java
rename to repository/src/test/java/org/alfresco/repo/workflow/WorkflowTestSuite.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiMultitenantWorkflowTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiMultitenantWorkflowTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiMultitenantWorkflowTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiMultitenantWorkflowTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiSpringTransactionTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java
diff --git a/src/test/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java b/repository/src/test/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java
rename to repository/src/test/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java
diff --git a/src/test/java/org/alfresco/service/ServiceRegistryTest.java b/repository/src/test/java/org/alfresco/service/ServiceRegistryTest.java
similarity index 100%
rename from src/test/java/org/alfresco/service/ServiceRegistryTest.java
rename to repository/src/test/java/org/alfresco/service/ServiceRegistryTest.java
diff --git a/src/test/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java b/repository/src/test/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java
rename to repository/src/test/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java
diff --git a/src/test/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelperTest.java b/repository/src/test/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelperTest.java
rename to repository/src/test/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelperTest.java
diff --git a/src/test/java/org/alfresco/service/cmr/repository/TemporalSourceOptionsTest.java b/repository/src/test/java/org/alfresco/service/cmr/repository/TemporalSourceOptionsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/service/cmr/repository/TemporalSourceOptionsTest.java
rename to repository/src/test/java/org/alfresco/service/cmr/repository/TemporalSourceOptionsTest.java
diff --git a/src/test/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsTest.java b/repository/src/test/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsTest.java
rename to repository/src/test/java/org/alfresco/service/cmr/repository/TransformationOptionLimitsTest.java
diff --git a/src/test/java/org/alfresco/service/cmr/repository/TransformationOptionPairTest.java b/repository/src/test/java/org/alfresco/service/cmr/repository/TransformationOptionPairTest.java
similarity index 100%
rename from src/test/java/org/alfresco/service/cmr/repository/TransformationOptionPairTest.java
rename to repository/src/test/java/org/alfresco/service/cmr/repository/TransformationOptionPairTest.java
diff --git a/src/test/java/org/alfresco/test_category/BaseSpringTestsCategory.java b/repository/src/test/java/org/alfresco/test_category/BaseSpringTestsCategory.java
similarity index 100%
rename from src/test/java/org/alfresco/test_category/BaseSpringTestsCategory.java
rename to repository/src/test/java/org/alfresco/test_category/BaseSpringTestsCategory.java
diff --git a/src/test/java/org/alfresco/test_category/LegacyCategory.java b/repository/src/test/java/org/alfresco/test_category/LegacyCategory.java
similarity index 100%
rename from src/test/java/org/alfresco/test_category/LegacyCategory.java
rename to repository/src/test/java/org/alfresco/test_category/LegacyCategory.java
diff --git a/src/test/java/org/alfresco/test_category/OwnJVMTestsCategory.java b/repository/src/test/java/org/alfresco/test_category/OwnJVMTestsCategory.java
similarity index 100%
rename from src/test/java/org/alfresco/test_category/OwnJVMTestsCategory.java
rename to repository/src/test/java/org/alfresco/test_category/OwnJVMTestsCategory.java
diff --git a/src/test/java/org/alfresco/tools/RenameUserTest.java b/repository/src/test/java/org/alfresco/tools/RenameUserTest.java
similarity index 100%
rename from src/test/java/org/alfresco/tools/RenameUserTest.java
rename to repository/src/test/java/org/alfresco/tools/RenameUserTest.java
diff --git a/src/test/java/org/alfresco/traitextender/AJExtensionsCompileTest.java b/repository/src/test/java/org/alfresco/traitextender/AJExtensionsCompileTest.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/AJExtensionsCompileTest.java
rename to repository/src/test/java/org/alfresco/traitextender/AJExtensionsCompileTest.java
diff --git a/src/test/java/org/alfresco/traitextender/RouteTestExtesnions.java b/repository/src/test/java/org/alfresco/traitextender/RouteTestExtesnions.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/RouteTestExtesnions.java
rename to repository/src/test/java/org/alfresco/traitextender/RouteTestExtesnions.java
diff --git a/src/test/java/org/alfresco/traitextender/TestException.java b/repository/src/test/java/org/alfresco/traitextender/TestException.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestException.java
rename to repository/src/test/java/org/alfresco/traitextender/TestException.java
diff --git a/src/test/java/org/alfresco/traitextender/TestExtension.java b/repository/src/test/java/org/alfresco/traitextender/TestExtension.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestExtension.java
rename to repository/src/test/java/org/alfresco/traitextender/TestExtension.java
diff --git a/src/test/java/org/alfresco/traitextender/TestExtensionImpl.java b/repository/src/test/java/org/alfresco/traitextender/TestExtensionImpl.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestExtensionImpl.java
rename to repository/src/test/java/org/alfresco/traitextender/TestExtensionImpl.java
diff --git a/src/test/java/org/alfresco/traitextender/TestPublicExtension.java b/repository/src/test/java/org/alfresco/traitextender/TestPublicExtension.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestPublicExtension.java
rename to repository/src/test/java/org/alfresco/traitextender/TestPublicExtension.java
diff --git a/src/test/java/org/alfresco/traitextender/TestPublicExtensionImpl.java b/repository/src/test/java/org/alfresco/traitextender/TestPublicExtensionImpl.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestPublicExtensionImpl.java
rename to repository/src/test/java/org/alfresco/traitextender/TestPublicExtensionImpl.java
diff --git a/src/test/java/org/alfresco/traitextender/TestPublicService.java b/repository/src/test/java/org/alfresco/traitextender/TestPublicService.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestPublicService.java
rename to repository/src/test/java/org/alfresco/traitextender/TestPublicService.java
diff --git a/src/test/java/org/alfresco/traitextender/TestPublicServiceExtension.java b/repository/src/test/java/org/alfresco/traitextender/TestPublicServiceExtension.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestPublicServiceExtension.java
rename to repository/src/test/java/org/alfresco/traitextender/TestPublicServiceExtension.java
diff --git a/src/test/java/org/alfresco/traitextender/TestPublicTrait.java b/repository/src/test/java/org/alfresco/traitextender/TestPublicTrait.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestPublicTrait.java
rename to repository/src/test/java/org/alfresco/traitextender/TestPublicTrait.java
diff --git a/src/test/java/org/alfresco/traitextender/TestRuntimeException.java b/repository/src/test/java/org/alfresco/traitextender/TestRuntimeException.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestRuntimeException.java
rename to repository/src/test/java/org/alfresco/traitextender/TestRuntimeException.java
diff --git a/src/test/java/org/alfresco/traitextender/TestService.java b/repository/src/test/java/org/alfresco/traitextender/TestService.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestService.java
rename to repository/src/test/java/org/alfresco/traitextender/TestService.java
diff --git a/src/test/java/org/alfresco/traitextender/TestServiceExtension.java b/repository/src/test/java/org/alfresco/traitextender/TestServiceExtension.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestServiceExtension.java
rename to repository/src/test/java/org/alfresco/traitextender/TestServiceExtension.java
diff --git a/src/test/java/org/alfresco/traitextender/TestSingletonExtensionImpl.java b/repository/src/test/java/org/alfresco/traitextender/TestSingletonExtensionImpl.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestSingletonExtensionImpl.java
rename to repository/src/test/java/org/alfresco/traitextender/TestSingletonExtensionImpl.java
diff --git a/src/test/java/org/alfresco/traitextender/TestTrait.java b/repository/src/test/java/org/alfresco/traitextender/TestTrait.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TestTrait.java
rename to repository/src/test/java/org/alfresco/traitextender/TestTrait.java
diff --git a/src/test/java/org/alfresco/traitextender/TraitExtenderIntegrationTest.java b/repository/src/test/java/org/alfresco/traitextender/TraitExtenderIntegrationTest.java
similarity index 100%
rename from src/test/java/org/alfresco/traitextender/TraitExtenderIntegrationTest.java
rename to repository/src/test/java/org/alfresco/traitextender/TraitExtenderIntegrationTest.java
diff --git a/src/test/java/org/alfresco/transform/client/registry/LocalTransformServiceRegistryConfigTest.java b/repository/src/test/java/org/alfresco/transform/client/registry/LocalTransformServiceRegistryConfigTest.java
similarity index 100%
rename from src/test/java/org/alfresco/transform/client/registry/LocalTransformServiceRegistryConfigTest.java
rename to repository/src/test/java/org/alfresco/transform/client/registry/LocalTransformServiceRegistryConfigTest.java
diff --git a/src/test/java/org/alfresco/transform/client/registry/TransformServiceRegistryConfigTest.java b/repository/src/test/java/org/alfresco/transform/client/registry/TransformServiceRegistryConfigTest.java
similarity index 100%
rename from src/test/java/org/alfresco/transform/client/registry/TransformServiceRegistryConfigTest.java
rename to repository/src/test/java/org/alfresco/transform/client/registry/TransformServiceRegistryConfigTest.java
diff --git a/src/test/java/org/alfresco/util/BaseAlfrescoSpringTest.java b/repository/src/test/java/org/alfresco/util/BaseAlfrescoSpringTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/BaseAlfrescoSpringTest.java
rename to repository/src/test/java/org/alfresco/util/BaseAlfrescoSpringTest.java
diff --git a/src/test/java/org/alfresco/util/BaseAlfrescoTestCase.java b/repository/src/test/java/org/alfresco/util/BaseAlfrescoTestCase.java
similarity index 100%
rename from src/test/java/org/alfresco/util/BaseAlfrescoTestCase.java
rename to repository/src/test/java/org/alfresco/util/BaseAlfrescoTestCase.java
diff --git a/src/test/java/org/alfresco/util/BaseSpringTest.java b/repository/src/test/java/org/alfresco/util/BaseSpringTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/BaseSpringTest.java
rename to repository/src/test/java/org/alfresco/util/BaseSpringTest.java
diff --git a/src/test/java/org/alfresco/util/BeanExtenderUnitTest.java b/repository/src/test/java/org/alfresco/util/BeanExtenderUnitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/BeanExtenderUnitTest.java
rename to repository/src/test/java/org/alfresco/util/BeanExtenderUnitTest.java
diff --git a/src/test/java/org/alfresco/util/EmailHelperTest.java b/repository/src/test/java/org/alfresco/util/EmailHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/EmailHelperTest.java
rename to repository/src/test/java/org/alfresco/util/EmailHelperTest.java
diff --git a/src/test/java/org/alfresco/util/FileNameValidatorTest.java b/repository/src/test/java/org/alfresco/util/FileNameValidatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/FileNameValidatorTest.java
rename to repository/src/test/java/org/alfresco/util/FileNameValidatorTest.java
diff --git a/src/test/java/org/alfresco/util/HttpClientHelperTest.java b/repository/src/test/java/org/alfresco/util/HttpClientHelperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/HttpClientHelperTest.java
rename to repository/src/test/java/org/alfresco/util/HttpClientHelperTest.java
diff --git a/src/test/java/org/alfresco/util/JSONtoFmModelTest.java b/repository/src/test/java/org/alfresco/util/JSONtoFmModelTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/JSONtoFmModelTest.java
rename to repository/src/test/java/org/alfresco/util/JSONtoFmModelTest.java
diff --git a/src/test/java/org/alfresco/util/ModelUtilTest.java b/repository/src/test/java/org/alfresco/util/ModelUtilTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/ModelUtilTest.java
rename to repository/src/test/java/org/alfresco/util/ModelUtilTest.java
diff --git a/src/test/java/org/alfresco/util/PropertyMapTest.java b/repository/src/test/java/org/alfresco/util/PropertyMapTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/PropertyMapTest.java
rename to repository/src/test/java/org/alfresco/util/PropertyMapTest.java
diff --git a/src/test/java/org/alfresco/util/RetryingTransactionHelperTestCase.java b/repository/src/test/java/org/alfresco/util/RetryingTransactionHelperTestCase.java
similarity index 100%
rename from src/test/java/org/alfresco/util/RetryingTransactionHelperTestCase.java
rename to repository/src/test/java/org/alfresco/util/RetryingTransactionHelperTestCase.java
diff --git a/src/test/java/org/alfresco/util/TestHelper.java b/repository/src/test/java/org/alfresco/util/TestHelper.java
similarity index 100%
rename from src/test/java/org/alfresco/util/TestHelper.java
rename to repository/src/test/java/org/alfresco/util/TestHelper.java
diff --git a/src/test/java/org/alfresco/util/TestWithUserUtils.java b/repository/src/test/java/org/alfresco/util/TestWithUserUtils.java
similarity index 100%
rename from src/test/java/org/alfresco/util/TestWithUserUtils.java
rename to repository/src/test/java/org/alfresco/util/TestWithUserUtils.java
diff --git a/src/test/java/org/alfresco/util/ValueProtectingMapTest.java b/repository/src/test/java/org/alfresco/util/ValueProtectingMapTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/ValueProtectingMapTest.java
rename to repository/src/test/java/org/alfresco/util/ValueProtectingMapTest.java
diff --git a/src/test/java/org/alfresco/util/bean/HierarchicalBeanLoaderTest.java b/repository/src/test/java/org/alfresco/util/bean/HierarchicalBeanLoaderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/bean/HierarchicalBeanLoaderTest.java
rename to repository/src/test/java/org/alfresco/util/bean/HierarchicalBeanLoaderTest.java
diff --git a/src/test/java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java b/repository/src/test/java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java
rename to repository/src/test/java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java
diff --git a/src/test/java/org/alfresco/util/email/EmailUtil.java b/repository/src/test/java/org/alfresco/util/email/EmailUtil.java
similarity index 100%
rename from src/test/java/org/alfresco/util/email/EmailUtil.java
rename to repository/src/test/java/org/alfresco/util/email/EmailUtil.java
diff --git a/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java b/repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java
similarity index 100%
rename from src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java
rename to repository/src/test/java/org/alfresco/util/email/ExtendedMailActionExecutor.java
diff --git a/src/test/java/org/alfresco/util/json/ExceptionJsonSerializerTest.java b/repository/src/test/java/org/alfresco/util/json/ExceptionJsonSerializerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/json/ExceptionJsonSerializerTest.java
rename to repository/src/test/java/org/alfresco/util/json/ExceptionJsonSerializerTest.java
diff --git a/src/test/java/org/alfresco/util/resource/HierarchicalResourceLoaderTest.java b/repository/src/test/java/org/alfresco/util/resource/HierarchicalResourceLoaderTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/resource/HierarchicalResourceLoaderTest.java
rename to repository/src/test/java/org/alfresco/util/resource/HierarchicalResourceLoaderTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/DbPropertyTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/DbPropertyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/DbPropertyTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/DbPropertyTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/DbToXMLTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/DbToXMLTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/DbToXMLTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/DbToXMLTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/DefaultComparisonUtilsTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/DefaultComparisonUtilsTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/DefaultComparisonUtilsTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/DefaultComparisonUtilsTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/DifferenceTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/DifferenceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/DifferenceTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/DifferenceTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/ExportDbTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/ExportDbTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/ExportDbTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/ExportDbTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/MultiFileDumperTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/MultiFileDumperTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/MultiFileDumperTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/MultiFileDumperTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/RedundantDbObjectTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/RedundantDbObjectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/RedundantDbObjectTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/RedundantDbObjectTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaCompPackageTestSuite.java b/repository/src/test/java/org/alfresco/util/schemacomp/SchemaCompPackageTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/SchemaCompPackageTestSuite.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/SchemaCompPackageTestSuite.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaCompTestSuite.java b/repository/src/test/java/org/alfresco/util/schemacomp/SchemaCompTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/SchemaCompTestSuite.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/SchemaCompTestSuite.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaCompTestingUtils.java b/repository/src/test/java/org/alfresco/util/schemacomp/SchemaCompTestingUtils.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/SchemaCompTestingUtils.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/SchemaCompTestingUtils.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaComparatorTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/SchemaComparatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/SchemaComparatorTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/SchemaComparatorTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaToXMLTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/SchemaToXMLTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/SchemaToXMLTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/SchemaToXMLTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/ValidatingVisitorTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/ValidatingVisitorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/ValidatingVisitorTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/ValidatingVisitorTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/ValidationResultTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/ValidationResultTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/ValidationResultTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/ValidationResultTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/XMLToSchemaTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/XMLToSchemaTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/XMLToSchemaTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/XMLToSchemaTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/AbstractDbObjectTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/AbstractDbObjectTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/AbstractDbObjectTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/AbstractDbObjectTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/ColumnTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/ColumnTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/ColumnTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/ColumnTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/DbObjectTestBase.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/DbObjectTestBase.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/DbObjectTestBase.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/DbObjectTestBase.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/ForeignKeyTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/IndexTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/IndexTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/IndexTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/IndexTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/ModelTestSuite.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/ModelTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/ModelTestSuite.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/ModelTestSuite.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/PrimaryKeyTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/SchemaTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/SchemaTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/SchemaTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/SchemaTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/SequenceTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/SequenceTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/SequenceTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/SequenceTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/model/TableTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/model/TableTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/model/TableTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/model/TableTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/test/exportdb/AbstractExportTester.java b/repository/src/test/java/org/alfresco/util/schemacomp/test/exportdb/AbstractExportTester.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/test/exportdb/AbstractExportTester.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/test/exportdb/AbstractExportTester.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/test/exportdb/MySQLDialectExportTester.java b/repository/src/test/java/org/alfresco/util/schemacomp/test/exportdb/MySQLDialectExportTester.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/test/exportdb/MySQLDialectExportTester.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/test/exportdb/MySQLDialectExportTester.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/test/exportdb/PostgreSQLDialectExportTester.java b/repository/src/test/java/org/alfresco/util/schemacomp/test/exportdb/PostgreSQLDialectExportTester.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/test/exportdb/PostgreSQLDialectExportTester.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/test/exportdb/PostgreSQLDialectExportTester.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidatorTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidatorTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/validator/IndexColumnsValidatorTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/validator/NameValidatorTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/validator/NameValidatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/validator/NameValidatorTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/validator/NameValidatorTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidatorTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidatorTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/validator/SchemaVersionValidatorTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidatorTest.java b/repository/src/test/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidatorTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidatorTest.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/validator/TypeNameOnlyValidatorTest.java
diff --git a/src/test/java/org/alfresco/util/schemacomp/validator/ValidatorTestSuite.java b/repository/src/test/java/org/alfresco/util/schemacomp/validator/ValidatorTestSuite.java
similarity index 100%
rename from src/test/java/org/alfresco/util/schemacomp/validator/ValidatorTestSuite.java
rename to repository/src/test/java/org/alfresco/util/schemacomp/validator/ValidatorTestSuite.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AbstractAlfrescoPersonTest.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AbstractAlfrescoPersonTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AbstractAlfrescoPersonTest.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AbstractAlfrescoPersonTest.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AbstractPersonRule.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AbstractPersonRule.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AbstractPersonRule.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AbstractPersonRule.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AbstractRule.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AbstractRule.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AbstractRule.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AbstractRule.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPeople.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPeople.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AlfrescoPeople.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPeople.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPerson.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPerson.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AlfrescoPerson.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPerson.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPersonTest.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPersonTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AlfrescoPersonTest.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoPersonTest.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java b/repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInit.java b/repository/src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInit.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInit.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInit.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInitTest.java b/repository/src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInitTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInitTest.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/ApplicationContextInitTest.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/LoadTestRule.java b/repository/src/test/java/org/alfresco/util/test/junitrules/LoadTestRule.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/LoadTestRule.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/LoadTestRule.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/RunAsFullyAuthenticatedRule.java b/repository/src/test/java/org/alfresco/util/test/junitrules/RunAsFullyAuthenticatedRule.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/RunAsFullyAuthenticatedRule.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/RunAsFullyAuthenticatedRule.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverride.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverride.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverride.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverride.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverrideTest.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverrideTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverrideTest.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryMockOverrideTest.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporaryModels.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryModels.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporaryModels.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryModels.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporaryNodes.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryNodes.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporaryNodes.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryNodes.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporarySites.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporarySites.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporarySites.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporarySites.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TemporarySitesTest.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TemporarySitesTest.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TemporarySitesTest.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TemporarySitesTest.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/TenantPerson.java b/repository/src/test/java/org/alfresco/util/test/junitrules/TenantPerson.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/TenantPerson.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/TenantPerson.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/WellKnownNodes.java b/repository/src/test/java/org/alfresco/util/test/junitrules/WellKnownNodes.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/WellKnownNodes.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/WellKnownNodes.java
diff --git a/src/test/java/org/alfresco/util/test/junitrules/package-info.java b/repository/src/test/java/org/alfresco/util/test/junitrules/package-info.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/junitrules/package-info.java
rename to repository/src/test/java/org/alfresco/util/test/junitrules/package-info.java
diff --git a/src/test/java/org/alfresco/util/test/testusers/TestUserComponent.java b/repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponent.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/testusers/TestUserComponent.java
rename to repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponent.java
diff --git a/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java b/repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java
similarity index 100%
rename from src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java
rename to repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java
diff --git a/src/test/resources/JSONtoFmModel/test1.ftl b/repository/src/test/resources/JSONtoFmModel/test1.ftl
similarity index 100%
rename from src/test/resources/JSONtoFmModel/test1.ftl
rename to repository/src/test/resources/JSONtoFmModel/test1.ftl
diff --git a/src/test/resources/JSONtoFmModel/test2.ftl b/repository/src/test/resources/JSONtoFmModel/test2.ftl
similarity index 100%
rename from src/test/resources/JSONtoFmModel/test2.ftl
rename to repository/src/test/resources/JSONtoFmModel/test2.ftl
diff --git a/src/test/resources/JSONtoFmModel/test3.ftl b/repository/src/test/resources/JSONtoFmModel/test3.ftl
similarity index 100%
rename from src/test/resources/JSONtoFmModel/test3.ftl
rename to repository/src/test/resources/JSONtoFmModel/test3.ftl
diff --git a/src/test/resources/JSONtoFmModel/test4.ftl b/repository/src/test/resources/JSONtoFmModel/test4.ftl
similarity index 100%
rename from src/test/resources/JSONtoFmModel/test4.ftl
rename to repository/src/test/resources/JSONtoFmModel/test4.ftl
diff --git a/src/test/resources/Plan270904b.xls b/repository/src/test/resources/Plan270904b.xls
similarity index 100%
rename from src/test/resources/Plan270904b.xls
rename to repository/src/test/resources/Plan270904b.xls
diff --git a/src/test/resources/activiti/activiti.cfg.xml b/repository/src/test/resources/activiti/activiti.cfg.xml
similarity index 100%
rename from src/test/resources/activiti/activiti.cfg.xml
rename to repository/src/test/resources/activiti/activiti.cfg.xml
diff --git a/src/test/resources/activiti/test-activiti-component-context.xml b/repository/src/test/resources/activiti/test-activiti-component-context.xml
similarity index 100%
rename from src/test/resources/activiti/test-activiti-component-context.xml
rename to repository/src/test/resources/activiti/test-activiti-component-context.xml
diff --git a/src/test/resources/activiti/test-callactivity-main.bpmn20.xml b/repository/src/test/resources/activiti/test-callactivity-main.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/test-callactivity-main.bpmn20.xml
rename to repository/src/test/resources/activiti/test-callactivity-main.bpmn20.xml
diff --git a/src/test/resources/activiti/test-callactivity-subprocess.bpmn20.xml b/repository/src/test/resources/activiti/test-callactivity-subprocess.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/test-callactivity-subprocess.bpmn20.xml
rename to repository/src/test/resources/activiti/test-callactivity-subprocess.bpmn20.xml
diff --git a/src/test/resources/activiti/testAdhoc.bpmn20.xml b/repository/src/test/resources/activiti/testAdhoc.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testAdhoc.bpmn20.xml
rename to repository/src/test/resources/activiti/testAdhoc.bpmn20.xml
diff --git a/src/test/resources/activiti/testAssignmentListener.bmn20.xml b/repository/src/test/resources/activiti/testAssignmentListener.bmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testAssignmentListener.bmn20.xml
rename to repository/src/test/resources/activiti/testAssignmentListener.bmn20.xml
diff --git a/src/test/resources/activiti/testCustomActiviti.bpmn20.xml b/repository/src/test/resources/activiti/testCustomActiviti.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testCustomActiviti.bpmn20.xml
rename to repository/src/test/resources/activiti/testCustomActiviti.bpmn20.xml
diff --git a/src/test/resources/activiti/testDiagram.bpmn20.xml b/repository/src/test/resources/activiti/testDiagram.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testDiagram.bpmn20.xml
rename to repository/src/test/resources/activiti/testDiagram.bpmn20.xml
diff --git a/src/test/resources/activiti/testJob.bpmn20.xml b/repository/src/test/resources/activiti/testJob.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testJob.bpmn20.xml
rename to repository/src/test/resources/activiti/testJob.bpmn20.xml
diff --git a/src/test/resources/activiti/testReview.bpmn20.xml b/repository/src/test/resources/activiti/testReview.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testReview.bpmn20.xml
rename to repository/src/test/resources/activiti/testReview.bpmn20.xml
diff --git a/src/test/resources/activiti/testSignalling.bpmn20.xml b/repository/src/test/resources/activiti/testSignalling.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testSignalling.bpmn20.xml
rename to repository/src/test/resources/activiti/testSignalling.bpmn20.xml
diff --git a/src/test/resources/activiti/testStartWfFromListener.bpmn20.xml b/repository/src/test/resources/activiti/testStartWfFromListener.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testStartWfFromListener.bpmn20.xml
rename to repository/src/test/resources/activiti/testStartWfFromListener.bpmn20.xml
diff --git a/src/test/resources/activiti/testTimer.bpmn20.xml b/repository/src/test/resources/activiti/testTimer.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testTimer.bpmn20.xml
rename to repository/src/test/resources/activiti/testTimer.bpmn20.xml
diff --git a/src/test/resources/activiti/testTimerTransaction.bpmn20.xml b/repository/src/test/resources/activiti/testTimerTransaction.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testTimerTransaction.bpmn20.xml
rename to repository/src/test/resources/activiti/testTimerTransaction.bpmn20.xml
diff --git a/src/test/resources/activiti/testTransaction.bpmn20.xml b/repository/src/test/resources/activiti/testTransaction.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testTransaction.bpmn20.xml
rename to repository/src/test/resources/activiti/testTransaction.bpmn20.xml
diff --git a/src/test/resources/activiti/testWorkflowModel.xml b/repository/src/test/resources/activiti/testWorkflowModel.xml
similarity index 100%
rename from src/test/resources/activiti/testWorkflowModel.xml
rename to repository/src/test/resources/activiti/testWorkflowModel.xml
diff --git a/src/test/resources/activiti/testWorkflowNoUserTasks.bpmn20.xml b/repository/src/test/resources/activiti/testWorkflowNoUserTasks.bpmn20.xml
similarity index 100%
rename from src/test/resources/activiti/testWorkflowNoUserTasks.bpmn20.xml
rename to repository/src/test/resources/activiti/testWorkflowNoUserTasks.bpmn20.xml
diff --git a/src/test/resources/activiti/testWorkflowWithSubprocess.xml b/repository/src/test/resources/activiti/testWorkflowWithSubprocess.xml
similarity index 100%
rename from src/test/resources/activiti/testWorkflowWithSubprocess.xml
rename to repository/src/test/resources/activiti/testWorkflowWithSubprocess.xml
diff --git a/src/test/resources/activities/org/alfresco/generic.atomentry.ftl b/repository/src/test/resources/activities/org/alfresco/generic.atomentry.ftl
similarity index 100%
rename from src/test/resources/activities/org/alfresco/generic.atomentry.ftl
rename to repository/src/test/resources/activities/org/alfresco/generic.atomentry.ftl
diff --git a/src/test/resources/activities/org/alfresco/generic.json.ftl b/repository/src/test/resources/activities/org/alfresco/generic.json.ftl
similarity index 100%
rename from src/test/resources/activities/org/alfresco/generic.json.ftl
rename to repository/src/test/resources/activities/org/alfresco/generic.json.ftl
diff --git a/src/test/resources/activities/org/alfresco/site/user-joined.atomentry.ftl b/repository/src/test/resources/activities/org/alfresco/site/user-joined.atomentry.ftl
similarity index 100%
rename from src/test/resources/activities/org/alfresco/site/user-joined.atomentry.ftl
rename to repository/src/test/resources/activities/org/alfresco/site/user-joined.atomentry.ftl
diff --git a/src/test/resources/activities/org/alfresco/site/user-left.atomentry.ftl b/repository/src/test/resources/activities/org/alfresco/site/user-left.atomentry.ftl
similarity index 100%
rename from src/test/resources/activities/org/alfresco/site/user-left.atomentry.ftl
rename to repository/src/test/resources/activities/org/alfresco/site/user-left.atomentry.ftl
diff --git a/src/test/resources/activities/org/alfresco/site/user-role-changed.atomentry.ftl b/repository/src/test/resources/activities/org/alfresco/site/user-role-changed.atomentry.ftl
similarity index 100%
rename from src/test/resources/activities/org/alfresco/site/user-role-changed.atomentry.ftl
rename to repository/src/test/resources/activities/org/alfresco/site/user-role-changed.atomentry.ftl
diff --git a/src/test/resources/alfresco-global.properties b/repository/src/test/resources/alfresco-global.properties
similarity index 100%
rename from src/test/resources/alfresco-global.properties
rename to repository/src/test/resources/alfresco-global.properties
diff --git a/src/test/resources/alfresco/alfresco-jmxrmi.access b/repository/src/test/resources/alfresco/alfresco-jmxrmi.access
similarity index 100%
rename from src/test/resources/alfresco/alfresco-jmxrmi.access
rename to repository/src/test/resources/alfresco/alfresco-jmxrmi.access
diff --git a/src/test/resources/alfresco/alfresco-jmxrmi.password b/repository/src/test/resources/alfresco/alfresco-jmxrmi.password
similarity index 100%
rename from src/test/resources/alfresco/alfresco-jmxrmi.password
rename to repository/src/test/resources/alfresco/alfresco-jmxrmi.password
diff --git a/src/test/resources/alfresco/extension/model/testContentModel.xml b/repository/src/test/resources/alfresco/extension/model/testContentModel.xml
similarity index 100%
rename from src/test/resources/alfresco/extension/model/testContentModel.xml
rename to repository/src/test/resources/alfresco/extension/model/testContentModel.xml
diff --git a/src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTP-test-context.xml b/repository/src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTP-test-context.xml
similarity index 100%
rename from src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTP-test-context.xml
rename to repository/src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTP-test-context.xml
diff --git a/src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties b/repository/src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
similarity index 100%
rename from src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
rename to repository/src/test/resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
diff --git a/src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/mytest-context.xml b/repository/src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/mytest-context.xml
similarity index 100%
rename from src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/mytest-context.xml
rename to repository/src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/mytest-context.xml
diff --git a/src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/testProps.properties b/repository/src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/testProps.properties
similarity index 100%
rename from src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/testProps.properties
rename to repository/src/test/resources/alfresco/extension/subsystems/testsubsystem/testType/default/testProps.properties
diff --git a/src/test/resources/alfresco/ibatis/ibatis-test-context.xml b/repository/src/test/resources/alfresco/ibatis/ibatis-test-context.xml
similarity index 100%
rename from src/test/resources/alfresco/ibatis/ibatis-test-context.xml
rename to repository/src/test/resources/alfresco/ibatis/ibatis-test-context.xml
diff --git a/src/test/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-test-common-SqlMap.xml b/repository/src/test/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-test-common-SqlMap.xml
similarity index 100%
rename from src/test/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-test-common-SqlMap.xml
rename to repository/src/test/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-test-common-SqlMap.xml
diff --git a/src/test/resources/alfresco/keystore-tests/encryption-test-context.xml b/repository/src/test/resources/alfresco/keystore-tests/encryption-test-context.xml
similarity index 100%
rename from src/test/resources/alfresco/keystore-tests/encryption-test-context.xml
rename to repository/src/test/resources/alfresco/keystore-tests/encryption-test-context.xml
diff --git a/src/test/resources/alfresco/keystore-tests/ks-test-1.jks b/repository/src/test/resources/alfresco/keystore-tests/ks-test-1.jks
similarity index 100%
rename from src/test/resources/alfresco/keystore-tests/ks-test-1.jks
rename to repository/src/test/resources/alfresco/keystore-tests/ks-test-1.jks
diff --git a/src/test/resources/alfresco/keystore-tests/ks-test-2.jks b/repository/src/test/resources/alfresco/keystore-tests/ks-test-2.jks
similarity index 100%
rename from src/test/resources/alfresco/keystore-tests/ks-test-2.jks
rename to repository/src/test/resources/alfresco/keystore-tests/ks-test-2.jks
diff --git a/src/test/resources/alfresco/keystore-tests/ks-test-3.jks b/repository/src/test/resources/alfresco/keystore-tests/ks-test-3.jks
similarity index 100%
rename from src/test/resources/alfresco/keystore-tests/ks-test-3.jks
rename to repository/src/test/resources/alfresco/keystore-tests/ks-test-3.jks
diff --git a/src/test/resources/alfresco/keystore-tests/ks-test-4.jks b/repository/src/test/resources/alfresco/keystore-tests/ks-test-4.jks
similarity index 100%
rename from src/test/resources/alfresco/keystore-tests/ks-test-4.jks
rename to repository/src/test/resources/alfresco/keystore-tests/ks-test-4.jks
diff --git a/src/test/resources/alfresco/keystore-tests/passwords.txt b/repository/src/test/resources/alfresco/keystore-tests/passwords.txt
similarity index 100%
rename from src/test/resources/alfresco/keystore-tests/passwords.txt
rename to repository/src/test/resources/alfresco/keystore-tests/passwords.txt
diff --git a/src/test/resources/alfresco/keystore/keystore b/repository/src/test/resources/alfresco/keystore/keystore
similarity index 100%
rename from src/test/resources/alfresco/keystore/keystore
rename to repository/src/test/resources/alfresco/keystore/keystore
diff --git a/src/test/resources/alfresco/keystore/keystore-passwords.properties b/repository/src/test/resources/alfresco/keystore/keystore-passwords.properties
similarity index 100%
rename from src/test/resources/alfresco/keystore/keystore-passwords.properties
rename to repository/src/test/resources/alfresco/keystore/keystore-passwords.properties
diff --git a/src/test/resources/alfresco/local-transform-service-config-pipeline-test.json b/repository/src/test/resources/alfresco/local-transform-service-config-pipeline-test.json
similarity index 100%
rename from src/test/resources/alfresco/local-transform-service-config-pipeline-test.json
rename to repository/src/test/resources/alfresco/local-transform-service-config-pipeline-test.json
diff --git a/src/test/resources/alfresco/local-transform-service-config-test.json b/repository/src/test/resources/alfresco/local-transform-service-config-test.json
similarity index 100%
rename from src/test/resources/alfresco/local-transform-service-config-test.json
rename to repository/src/test/resources/alfresco/local-transform-service-config-test.json
diff --git a/src/test/resources/alfresco/metadata/ConcurrencyPdfBoxMetadataExtracterTest-SlowPdfBoxMetadataExtracter.properties b/repository/src/test/resources/alfresco/metadata/ConcurrencyPdfBoxMetadataExtracterTest-SlowPdfBoxMetadataExtracter.properties
similarity index 100%
rename from src/test/resources/alfresco/metadata/ConcurrencyPdfBoxMetadataExtracterTest-SlowPdfBoxMetadataExtracter.properties
rename to repository/src/test/resources/alfresco/metadata/ConcurrencyPdfBoxMetadataExtracterTest-SlowPdfBoxMetadataExtracter.properties
diff --git a/src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyMetadataEmbedder.properties b/repository/src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyMetadataEmbedder.properties
similarity index 100%
rename from src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyMetadataEmbedder.properties
rename to repository/src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyMetadataEmbedder.properties
diff --git a/src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyPropertiesInMetadataLocationMappingMetadataExtracter.properties b/repository/src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyPropertiesInMetadataLocationMappingMetadataExtracter.properties
similarity index 100%
rename from src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyPropertiesInMetadataLocationMappingMetadataExtracter.properties
rename to repository/src/test/resources/alfresco/metadata/MappingMetadataExtracterTest-DummyPropertiesInMetadataLocationMappingMetadataExtracter.properties
diff --git a/src/test/resources/alfresco/metadata/MetadataExtracterLimitsTest-MockDelayedMetadataExtracter.properties b/repository/src/test/resources/alfresco/metadata/MetadataExtracterLimitsTest-MockDelayedMetadataExtracter.properties
similarity index 100%
rename from src/test/resources/alfresco/metadata/MetadataExtracterLimitsTest-MockDelayedMetadataExtracter.properties
rename to repository/src/test/resources/alfresco/metadata/MetadataExtracterLimitsTest-MockDelayedMetadataExtracter.properties
diff --git a/src/test/resources/alfresco/module/simplemodule.properties b/repository/src/test/resources/alfresco/module/simplemodule.properties
similarity index 100%
rename from src/test/resources/alfresco/module/simplemodule.properties
rename to repository/src/test/resources/alfresco/module/simplemodule.properties
diff --git a/src/test/resources/alfresco/renditions/test/overrideRendition.json b/repository/src/test/resources/alfresco/renditions/test/overrideRendition.json
similarity index 100%
rename from src/test/resources/alfresco/renditions/test/overrideRendition.json
rename to repository/src/test/resources/alfresco/renditions/test/overrideRendition.json
diff --git a/src/test/resources/alfresco/scripts/email/cronjob_test.txt b/repository/src/test/resources/alfresco/scripts/email/cronjob_test.txt
similarity index 100%
rename from src/test/resources/alfresco/scripts/email/cronjob_test.txt
rename to repository/src/test/resources/alfresco/scripts/email/cronjob_test.txt
diff --git a/src/test/resources/alfresco/scripts/email/mail_test.js b/repository/src/test/resources/alfresco/scripts/email/mail_test.js
similarity index 100%
rename from src/test/resources/alfresco/scripts/email/mail_test.js
rename to repository/src/test/resources/alfresco/scripts/email/mail_test.js
diff --git a/src/test/resources/alfresco/scripts/email/notify_new_document_email.ftl b/repository/src/test/resources/alfresco/scripts/email/notify_new_document_email.ftl
similarity index 100%
rename from src/test/resources/alfresco/scripts/email/notify_new_document_email.ftl
rename to repository/src/test/resources/alfresco/scripts/email/notify_new_document_email.ftl
diff --git a/src/test/resources/alfresco/scripts/email/test-scheduled-action-services-context.xml b/repository/src/test/resources/alfresco/scripts/email/test-scheduled-action-services-context.xml
similarity index 100%
rename from src/test/resources/alfresco/scripts/email/test-scheduled-action-services-context.xml
rename to repository/src/test/resources/alfresco/scripts/email/test-scheduled-action-services-context.xml
diff --git a/src/test/resources/alfresco/subsystems/identityServiceAuthentication/keystore.jks b/repository/src/test/resources/alfresco/subsystems/identityServiceAuthentication/keystore.jks
similarity index 100%
rename from src/test/resources/alfresco/subsystems/identityServiceAuthentication/keystore.jks
rename to repository/src/test/resources/alfresco/subsystems/identityServiceAuthentication/keystore.jks
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType1/authType1.properties
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType2/authType2.properties
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthentication/authType3/authType3.properties
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType1/authType1.properties
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllDisabled/authType2/authType2.properties
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType1/authType1.properties
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2-context.xml b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2.properties b/repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2.properties
rename to repository/src/test/resources/alfresco/subsystems/testFtpAuthenticationAllFailing/authType2/authType2.properties
diff --git a/src/test/resources/alfresco/subsystems/testsubsystem/testType/mytest-context.xml b/repository/src/test/resources/alfresco/subsystems/testsubsystem/testType/mytest-context.xml
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testsubsystem/testType/mytest-context.xml
rename to repository/src/test/resources/alfresco/subsystems/testsubsystem/testType/mytest-context.xml
diff --git a/src/test/resources/alfresco/subsystems/testsubsystem/testType/testProps.properties b/repository/src/test/resources/alfresco/subsystems/testsubsystem/testType/testProps.properties
similarity index 100%
rename from src/test/resources/alfresco/subsystems/testsubsystem/testType/testProps.properties
rename to repository/src/test/resources/alfresco/subsystems/testsubsystem/testType/testProps.properties
diff --git a/src/test/resources/alfresco/templates/mail/test.txt.ftl b/repository/src/test/resources/alfresco/templates/mail/test.txt.ftl
similarity index 100%
rename from src/test/resources/alfresco/templates/mail/test.txt.ftl
rename to repository/src/test/resources/alfresco/templates/mail/test.txt.ftl
diff --git a/src/test/resources/alfresco/templates/mail/test.txt_en_AU.ftl b/repository/src/test/resources/alfresco/templates/mail/test.txt_en_AU.ftl
similarity index 100%
rename from src/test/resources/alfresco/templates/mail/test.txt_en_AU.ftl
rename to repository/src/test/resources/alfresco/templates/mail/test.txt_en_AU.ftl
diff --git a/src/test/resources/alfresco/templates/mail/test.txt_fr.ftl b/repository/src/test/resources/alfresco/templates/mail/test.txt_fr.ftl
similarity index 100%
rename from src/test/resources/alfresco/templates/mail/test.txt_fr.ftl
rename to repository/src/test/resources/alfresco/templates/mail/test.txt_fr.ftl
diff --git a/src/test/resources/alfresco/templates/mail/testSentTo.txt.ftl b/repository/src/test/resources/alfresco/templates/mail/testSentTo.txt.ftl
similarity index 100%
rename from src/test/resources/alfresco/templates/mail/testSentTo.txt.ftl
rename to repository/src/test/resources/alfresco/templates/mail/testSentTo.txt.ftl
diff --git a/src/test/resources/alfresco/test/global-integration-test-context.xml b/repository/src/test/resources/alfresco/test/global-integration-test-context.xml
similarity index 100%
rename from src/test/resources/alfresco/test/global-integration-test-context.xml
rename to repository/src/test/resources/alfresco/test/global-integration-test-context.xml
diff --git a/src/test/resources/alfresco/test/integration/cloud/readme.txt b/repository/src/test/resources/alfresco/test/integration/cloud/readme.txt
similarity index 100%
rename from src/test/resources/alfresco/test/integration/cloud/readme.txt
rename to repository/src/test/resources/alfresco/test/integration/cloud/readme.txt
diff --git a/src/test/resources/alfresco/test/integration/community/community-integration-test-context.xml b/repository/src/test/resources/alfresco/test/integration/community/community-integration-test-context.xml
similarity index 100%
rename from src/test/resources/alfresco/test/integration/community/community-integration-test-context.xml
rename to repository/src/test/resources/alfresco/test/integration/community/community-integration-test-context.xml
diff --git a/src/test/resources/alfresco/test/integration/enterprise/readme.txt b/repository/src/test/resources/alfresco/test/integration/enterprise/readme.txt
similarity index 100%
rename from src/test/resources/alfresco/test/integration/enterprise/readme.txt
rename to repository/src/test/resources/alfresco/test/integration/enterprise/readme.txt
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-alf-12638.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-alf-12638.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-alf-12638.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-alf-12638.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-authenticationservice.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-authenticationservice.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-authenticationservice.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-authenticationservice.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-01.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-01.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-01.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-01.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-02.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-02.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-02.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-02.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-03.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-03.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-03.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-03.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-04.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-04.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-04.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-04.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-05.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-05.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-05.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-05.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-06.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-06.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-06.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-bad-06.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10070.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10070.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10070.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10070.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10767.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10767.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10767.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-10767.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-11072.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-11072.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-11072.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-11072.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-16748.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-16748.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-16748.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-mnt-16748.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test-repository.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-repository.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test-repository.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test-repository.xml
diff --git a/src/test/resources/alfresco/testaudit/alfresco-audit-test.xml b/repository/src/test/resources/alfresco/testaudit/alfresco-audit-test.xml
similarity index 100%
rename from src/test/resources/alfresco/testaudit/alfresco-audit-test.xml
rename to repository/src/test/resources/alfresco/testaudit/alfresco-audit-test.xml
diff --git a/src/test/resources/alfresco/transform-service-config-pipeline-test.json b/repository/src/test/resources/alfresco/transform-service-config-pipeline-test.json
similarity index 100%
rename from src/test/resources/alfresco/transform-service-config-pipeline-test.json
rename to repository/src/test/resources/alfresco/transform-service-config-pipeline-test.json
diff --git a/src/test/resources/alfresco/transform-service-config-test.json b/repository/src/test/resources/alfresco/transform-service-config-test.json
similarity index 100%
rename from src/test/resources/alfresco/transform-service-config-test.json
rename to repository/src/test/resources/alfresco/transform-service-config-test.json
diff --git a/src/test/resources/alfresco/transforms/0999-testPipeline.json b/repository/src/test/resources/alfresco/transforms/0999-testPipeline.json
similarity index 100%
rename from src/test/resources/alfresco/transforms/0999-testPipeline.json
rename to repository/src/test/resources/alfresco/transforms/0999-testPipeline.json
diff --git a/src/test/resources/alfresco/version.properties b/repository/src/test/resources/alfresco/version.properties
similarity index 100%
rename from src/test/resources/alfresco/version.properties
rename to repository/src/test/resources/alfresco/version.properties
diff --git a/src/test/resources/alfresco/workflow/test-security.bpmn20.xml b/repository/src/test/resources/alfresco/workflow/test-security.bpmn20.xml
similarity index 100%
rename from src/test/resources/alfresco/workflow/test-security.bpmn20.xml
rename to repository/src/test/resources/alfresco/workflow/test-security.bpmn20.xml
diff --git a/src/test/resources/auto-thumbnail-context.xml b/repository/src/test/resources/auto-thumbnail-context.xml
similarity index 100%
rename from src/test/resources/auto-thumbnail-context.xml
rename to repository/src/test/resources/auto-thumbnail-context.xml
diff --git a/src/test/resources/bean-loader/hierarchical-bean-loader-test-context.xml b/repository/src/test/resources/bean-loader/hierarchical-bean-loader-test-context.xml
similarity index 100%
rename from src/test/resources/bean-loader/hierarchical-bean-loader-test-context.xml
rename to repository/src/test/resources/bean-loader/hierarchical-bean-loader-test-context.xml
diff --git a/src/test/resources/broker.xml b/repository/src/test/resources/broker.xml
similarity index 100%
rename from src/test/resources/broker.xml
rename to repository/src/test/resources/broker.xml
diff --git a/src/test/resources/bulkimport-autoversion/pass1/example.txt b/repository/src/test/resources/bulkimport-autoversion/pass1/example.txt
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass1/example.txt
rename to repository/src/test/resources/bulkimport-autoversion/pass1/example.txt
diff --git a/src/test/resources/bulkimport-autoversion/pass2/example.txt b/repository/src/test/resources/bulkimport-autoversion/pass2/example.txt
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass2/example.txt
rename to repository/src/test/resources/bulkimport-autoversion/pass2/example.txt
diff --git a/src/test/resources/bulkimport-autoversion/pass2/example.txt.v123 b/repository/src/test/resources/bulkimport-autoversion/pass2/example.txt.v123
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass2/example.txt.v123
rename to repository/src/test/resources/bulkimport-autoversion/pass2/example.txt.v123
diff --git a/src/test/resources/bulkimport-autoversion/pass3/another.txt.v1 b/repository/src/test/resources/bulkimport-autoversion/pass3/another.txt.v1
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass3/another.txt.v1
rename to repository/src/test/resources/bulkimport-autoversion/pass3/another.txt.v1
diff --git a/src/test/resources/bulkimport-autoversion/pass3/example.txt b/repository/src/test/resources/bulkimport-autoversion/pass3/example.txt
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass3/example.txt
rename to repository/src/test/resources/bulkimport-autoversion/pass3/example.txt
diff --git a/src/test/resources/bulkimport-autoversion/pass3/subfolder.metadata.properties.xml b/repository/src/test/resources/bulkimport-autoversion/pass3/subfolder.metadata.properties.xml
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass3/subfolder.metadata.properties.xml
rename to repository/src/test/resources/bulkimport-autoversion/pass3/subfolder.metadata.properties.xml
diff --git a/src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt b/repository/src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt
rename to repository/src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt
diff --git a/src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt.v1 b/repository/src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt.v1
similarity index 100%
rename from src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt.v1
rename to repository/src/test/resources/bulkimport-autoversion/pass3/subfolder/file.txt.v1
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick-secured.pdf b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick-secured.pdf
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick-secured.pdf
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick-secured.pdf
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.bmp b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.bmp
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.bmp
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.bmp
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.chinese.msg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.chinese.msg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.chinese.msg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.chinese.msg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.doc b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.doc
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.doc
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.doc
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.docx b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.docx
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.docx
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.docx
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eml b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eml
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eml
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eml
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eps b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eps
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eps
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.eps
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.gif b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.gif
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.gif
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.gif
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.html b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.html
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.html
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.html
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.jpg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.jpg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.jpg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.jpg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.mp3 b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.mp3
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.mp3
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.mp3
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.msg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.msg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.msg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.msg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odf b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odf
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odf
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odf
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.1/quick.odg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.vsd b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.vsd
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.vsd
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.vsd
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.wpd b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.wpd
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.wpd
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.wpd
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xls b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xls
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xls
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xls
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xlsx b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xlsx
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xlsx
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xlsx
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xml b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xml
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xml
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.xml
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.zip b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.zip
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.zip
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick.zip
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2004.dwg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2004.dwg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2004.dwg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2004.dwg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2007.dwg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2007.dwg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2007.dwg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2007.dwg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2010.dwg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2010.dwg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2010.dwg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick2010.dwg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick6.doc b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick6.doc
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick6.doc
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick6.doc
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick95.doc b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick95.doc
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick95.doc
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quick95.doc
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS3.ai b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS3.ai
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS3.ai
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS3.ai
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS5.ai b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS5.ai
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS5.ai
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCS5.ai
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCorrupt.pdf b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCorrupt.pdf
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCorrupt.pdf
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickCorrupt.pdf
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.doc b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.doc
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.doc
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.doc
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.docx b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.docx
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.docx
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.docx
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.ppt b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.ppt
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.ppt
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.ppt
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.pptx b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.pptx
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.pptx
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.pptx
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xls b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xls
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xls
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xls
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xlsx b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xlsx
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xlsx
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickEmbeds.xlsx
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickGEO.jpg b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickGEO.jpg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickGEO.jpg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickGEO.jpg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickI3.ai b/repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickI3.ai
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickI3.ai
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/folder1.1.2/quickI3.ai
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.smf b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.smf
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.smf
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.smf
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.sxc b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxc
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.sxc
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxc
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.sxd b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxd
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.sxd
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxd
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.sxi b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxi
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.sxi
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxi
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.sxm b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxm
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.sxm
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxm
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.sxw b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxw
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.sxw
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.sxw
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.tar b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.tar
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.tar
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.tar
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.tar.bz2 b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.tar.bz2
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.tar.bz2
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.tar.bz2
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.tar.gz b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.tar.gz
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.tar.gz
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.tar.gz
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.txt b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.txt
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.txt
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.txt
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.unicode.msg b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.unicode.msg
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.unicode.msg
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.unicode.msg
diff --git a/src/test/resources/bulkimport/folder1/folder1.1/quick.vdx b/repository/src/test/resources/bulkimport/folder1/folder1.1/quick.vdx
similarity index 100%
rename from src/test/resources/bulkimport/folder1/folder1.1/quick.vdx
rename to repository/src/test/resources/bulkimport/folder1/folder1.1/quick.vdx
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.odp b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.odp
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.odp
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.odp
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.ods b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ods
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.ods
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ods
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.odt b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.odt
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.odt
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.odt
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.ogg b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ogg
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.ogg
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ogg
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.otg b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.otg
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.otg
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.otg
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.otp b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.otp
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.otp
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.otp
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.ots b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ots
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.ots
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ots
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.ott b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ott
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.ott
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ott
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.pdf b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.pdf
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.pdf
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.pdf
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.png b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.png
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.png
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.png
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.ppt b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ppt
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.ppt
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.ppt
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.pptx b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.pptx
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.pptx
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.pptx
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.pub b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.pub
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.pub
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.pub
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.sda b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sda
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.sda
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sda
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.sdc b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sdc
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.sdc
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sdc
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.sdd b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sdd
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.sdd
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sdd
diff --git a/src/test/resources/bulkimport/folder2/folder2.1/quick.sdw b/repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sdw
similarity index 100%
rename from src/test/resources/bulkimport/folder2/folder2.1/quick.sdw
rename to repository/src/test/resources/bulkimport/folder2/folder2.1/quick.sdw
diff --git a/src/test/resources/bulkimport/quick.txt b/repository/src/test/resources/bulkimport/quick.txt
similarity index 100%
rename from src/test/resources/bulkimport/quick.txt
rename to repository/src/test/resources/bulkimport/quick.txt
diff --git a/src/test/resources/bulkimport/quickImg1.doc b/repository/src/test/resources/bulkimport/quickImg1.doc
similarity index 100%
rename from src/test/resources/bulkimport/quickImg1.doc
rename to repository/src/test/resources/bulkimport/quickImg1.doc
diff --git a/src/test/resources/bulkimport/quickImg1.docx b/repository/src/test/resources/bulkimport/quickImg1.docx
similarity index 100%
rename from src/test/resources/bulkimport/quickImg1.docx
rename to repository/src/test/resources/bulkimport/quickImg1.docx
diff --git a/src/test/resources/bulkimport/quickImg1.xls b/repository/src/test/resources/bulkimport/quickImg1.xls
similarity index 100%
rename from src/test/resources/bulkimport/quickImg1.xls
rename to repository/src/test/resources/bulkimport/quickImg1.xls
diff --git a/src/test/resources/bulkimport/quickImg1.xlsx b/repository/src/test/resources/bulkimport/quickImg1.xlsx
similarity index 100%
rename from src/test/resources/bulkimport/quickImg1.xlsx
rename to repository/src/test/resources/bulkimport/quickImg1.xlsx
diff --git a/src/test/resources/bulkimport/quickImg2.ppt b/repository/src/test/resources/bulkimport/quickImg2.ppt
similarity index 100%
rename from src/test/resources/bulkimport/quickImg2.ppt
rename to repository/src/test/resources/bulkimport/quickImg2.ppt
diff --git a/src/test/resources/bulkimport/quickImg2.pptx b/repository/src/test/resources/bulkimport/quickImg2.pptx
similarity index 100%
rename from src/test/resources/bulkimport/quickImg2.pptx
rename to repository/src/test/resources/bulkimport/quickImg2.pptx
diff --git a/src/test/resources/bulkimport/quickImg3.doc b/repository/src/test/resources/bulkimport/quickImg3.doc
similarity index 100%
rename from src/test/resources/bulkimport/quickImg3.doc
rename to repository/src/test/resources/bulkimport/quickImg3.doc
diff --git a/src/test/resources/bulkimport/quickImg3.docx b/repository/src/test/resources/bulkimport/quickImg3.docx
similarity index 100%
rename from src/test/resources/bulkimport/quickImg3.docx
rename to repository/src/test/resources/bulkimport/quickImg3.docx
diff --git a/src/test/resources/bulkimport1/folder1.metadata.properties.xml b/repository/src/test/resources/bulkimport1/folder1.metadata.properties.xml
similarity index 100%
rename from src/test/resources/bulkimport1/folder1.metadata.properties.xml
rename to repository/src/test/resources/bulkimport1/folder1.metadata.properties.xml
diff --git a/src/test/resources/bulkimport1/folder1/dummyFile.txt b/repository/src/test/resources/bulkimport1/folder1/dummyFile.txt
similarity index 100%
rename from src/test/resources/bulkimport1/folder1/dummyFile.txt
rename to repository/src/test/resources/bulkimport1/folder1/dummyFile.txt
diff --git a/src/test/resources/bulkimport2/fileWithVersions.txt b/repository/src/test/resources/bulkimport2/fileWithVersions.txt
similarity index 100%
rename from src/test/resources/bulkimport2/fileWithVersions.txt
rename to repository/src/test/resources/bulkimport2/fileWithVersions.txt
diff --git a/src/test/resources/bulkimport2/fileWithVersions.txt.v1 b/repository/src/test/resources/bulkimport2/fileWithVersions.txt.v1
similarity index 100%
rename from src/test/resources/bulkimport2/fileWithVersions.txt.v1
rename to repository/src/test/resources/bulkimport2/fileWithVersions.txt.v1
diff --git a/src/test/resources/bulkimport2/fileWithVersions.txt.v2 b/repository/src/test/resources/bulkimport2/fileWithVersions.txt.v2
similarity index 100%
rename from src/test/resources/bulkimport2/fileWithVersions.txt.v2
rename to repository/src/test/resources/bulkimport2/fileWithVersions.txt.v2
diff --git a/src/test/resources/bulkimport2/fileWithVersions.txt.v3 b/repository/src/test/resources/bulkimport2/fileWithVersions.txt.v3
similarity index 100%
rename from src/test/resources/bulkimport2/fileWithVersions.txt.v3
rename to repository/src/test/resources/bulkimport2/fileWithVersions.txt.v3
diff --git a/src/test/resources/bulkimport3/initial/fileWithVersions.txt b/repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt
similarity index 100%
rename from src/test/resources/bulkimport3/initial/fileWithVersions.txt
rename to repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt
diff --git a/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v1 b/repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v1
similarity index 100%
rename from src/test/resources/bulkimport3/initial/fileWithVersions.txt.v1
rename to repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v1
diff --git a/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v2 b/repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v2
similarity index 100%
rename from src/test/resources/bulkimport3/initial/fileWithVersions.txt.v2
rename to repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v2
diff --git a/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v3 b/repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v3
similarity index 100%
rename from src/test/resources/bulkimport3/initial/fileWithVersions.txt.v3
rename to repository/src/test/resources/bulkimport3/initial/fileWithVersions.txt.v3
diff --git a/src/test/resources/bulkimport3/replace_with_non_versioned/fileWithVersions.txt b/repository/src/test/resources/bulkimport3/replace_with_non_versioned/fileWithVersions.txt
similarity index 100%
rename from src/test/resources/bulkimport3/replace_with_non_versioned/fileWithVersions.txt
rename to repository/src/test/resources/bulkimport3/replace_with_non_versioned/fileWithVersions.txt
diff --git a/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt b/repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt
similarity index 100%
rename from src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt
rename to repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt
diff --git a/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v1 b/repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v1
similarity index 100%
rename from src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v1
rename to repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v1
diff --git a/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v2 b/repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v2
similarity index 100%
rename from src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v2
rename to repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v2
diff --git a/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v3 b/repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v3
similarity index 100%
rename from src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v3
rename to repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v3
diff --git a/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v4 b/repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v4
similarity index 100%
rename from src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v4
rename to repository/src/test/resources/bulkimport3/replace_with_versioned/fileWithVersions.txt.v4
diff --git a/src/test/resources/bulkimport4/testbulk.gz b/repository/src/test/resources/bulkimport4/testbulk.gz
similarity index 100%
rename from src/test/resources/bulkimport4/testbulk.gz
rename to repository/src/test/resources/bulkimport4/testbulk.gz
diff --git a/src/test/resources/bulkimport5/Amazing.ai b/repository/src/test/resources/bulkimport5/Amazing.ai
similarity index 100%
rename from src/test/resources/bulkimport5/Amazing.ai
rename to repository/src/test/resources/bulkimport5/Amazing.ai
diff --git a/src/test/resources/bulkimport5/quick.eps b/repository/src/test/resources/bulkimport5/quick.eps
similarity index 100%
rename from src/test/resources/bulkimport5/quick.eps
rename to repository/src/test/resources/bulkimport5/quick.eps
diff --git a/src/test/resources/bulkimport5/quick.gif b/repository/src/test/resources/bulkimport5/quick.gif
similarity index 100%
rename from src/test/resources/bulkimport5/quick.gif
rename to repository/src/test/resources/bulkimport5/quick.gif
diff --git a/src/test/resources/bulkimport6/doc.xlsx b/repository/src/test/resources/bulkimport6/doc.xlsx
similarity index 100%
rename from src/test/resources/bulkimport6/doc.xlsx
rename to repository/src/test/resources/bulkimport6/doc.xlsx
diff --git a/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml b/repository/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml
similarity index 100%
rename from src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml
rename to repository/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml
diff --git a/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v1 b/repository/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v1
similarity index 100%
rename from src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v1
rename to repository/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v1
diff --git a/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v2 b/repository/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v2
similarity index 100%
rename from src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v2
rename to repository/src/test/resources/bulkimport6/doc.xlsx.metadata.properties.xml.v2
diff --git a/src/test/resources/bulkimport6/doc.xlsx.v1 b/repository/src/test/resources/bulkimport6/doc.xlsx.v1
similarity index 100%
rename from src/test/resources/bulkimport6/doc.xlsx.v1
rename to repository/src/test/resources/bulkimport6/doc.xlsx.v1
diff --git a/src/test/resources/bulkimport6/doc.xlsx.v2 b/repository/src/test/resources/bulkimport6/doc.xlsx.v2
similarity index 100%
rename from src/test/resources/bulkimport6/doc.xlsx.v2
rename to repository/src/test/resources/bulkimport6/doc.xlsx.v2
diff --git a/src/test/resources/cache-test/cache-test-context.xml b/repository/src/test/resources/cache-test/cache-test-context.xml
similarity index 100%
rename from src/test/resources/cache-test/cache-test-context.xml
rename to repository/src/test/resources/cache-test/cache-test-context.xml
diff --git a/src/test/resources/cachingstore/test-cleaner-context.xml b/repository/src/test/resources/cachingstore/test-cleaner-context.xml
similarity index 100%
rename from src/test/resources/cachingstore/test-cleaner-context.xml
rename to repository/src/test/resources/cachingstore/test-cleaner-context.xml
diff --git a/src/test/resources/cachingstore/test-context.xml b/repository/src/test/resources/cachingstore/test-context.xml
similarity index 100%
rename from src/test/resources/cachingstore/test-context.xml
rename to repository/src/test/resources/cachingstore/test-context.xml
diff --git a/src/test/resources/cachingstore/test-slow-context.xml b/repository/src/test/resources/cachingstore/test-slow-context.xml
similarity index 100%
rename from src/test/resources/cachingstore/test-slow-context.xml
rename to repository/src/test/resources/cachingstore/test-slow-context.xml
diff --git a/src/test/resources/cachingstore/test-std-quota-context.xml b/repository/src/test/resources/cachingstore/test-std-quota-context.xml
similarity index 100%
rename from src/test/resources/cachingstore/test-std-quota-context.xml
rename to repository/src/test/resources/cachingstore/test-std-quota-context.xml
diff --git a/src/test/resources/cmis/exampleModel.xml b/repository/src/test/resources/cmis/exampleModel.xml
similarity index 100%
rename from src/test/resources/cmis/exampleModel.xml
rename to repository/src/test/resources/cmis/exampleModel.xml
diff --git a/src/test/resources/dictionary/dictionarydaotest_model1.properties b/repository/src/test/resources/dictionary/dictionarydaotest_model1.properties
similarity index 100%
rename from src/test/resources/dictionary/dictionarydaotest_model1.properties
rename to repository/src/test/resources/dictionary/dictionarydaotest_model1.properties
diff --git a/src/test/resources/dictionary/dictionarydaotest_model1.xml b/repository/src/test/resources/dictionary/dictionarydaotest_model1.xml
similarity index 100%
rename from src/test/resources/dictionary/dictionarydaotest_model1.xml
rename to repository/src/test/resources/dictionary/dictionarydaotest_model1.xml
diff --git a/src/test/resources/dictionary/dictionarytest_model1.properties b/repository/src/test/resources/dictionary/dictionarytest_model1.properties
similarity index 100%
rename from src/test/resources/dictionary/dictionarytest_model1.properties
rename to repository/src/test/resources/dictionary/dictionarytest_model1.properties
diff --git a/src/test/resources/dictionary/dictionarytest_model1.xml b/repository/src/test/resources/dictionary/dictionarytest_model1.xml
similarity index 100%
rename from src/test/resources/dictionary/dictionarytest_model1.xml
rename to repository/src/test/resources/dictionary/dictionarytest_model1.xml
diff --git a/src/test/resources/dictionary/modelA.xml b/repository/src/test/resources/dictionary/modelA.xml
similarity index 100%
rename from src/test/resources/dictionary/modelA.xml
rename to repository/src/test/resources/dictionary/modelA.xml
diff --git a/src/test/resources/dictionary/modelAupdated.xml b/repository/src/test/resources/dictionary/modelAupdated.xml
similarity index 100%
rename from src/test/resources/dictionary/modelAupdated.xml
rename to repository/src/test/resources/dictionary/modelAupdated.xml
diff --git a/src/test/resources/dictionary/modelAupdatedWithSecondNamespace.xml b/repository/src/test/resources/dictionary/modelAupdatedWithSecondNamespace.xml
similarity index 100%
rename from src/test/resources/dictionary/modelAupdatedWithSecondNamespace.xml
rename to repository/src/test/resources/dictionary/modelAupdatedWithSecondNamespace.xml
diff --git a/src/test/resources/dictionary/modelB.xml b/repository/src/test/resources/dictionary/modelB.xml
similarity index 100%
rename from src/test/resources/dictionary/modelB.xml
rename to repository/src/test/resources/dictionary/modelB.xml
diff --git a/src/test/resources/dictionary/modelWithCurrentNamespaceImported.xml b/repository/src/test/resources/dictionary/modelWithCurrentNamespaceImported.xml
similarity index 100%
rename from src/test/resources/dictionary/modelWithCurrentNamespaceImported.xml
rename to repository/src/test/resources/dictionary/modelWithCurrentNamespaceImported.xml
diff --git a/src/test/resources/dictionary/testModel.xml b/repository/src/test/resources/dictionary/testModel.xml
similarity index 100%
rename from src/test/resources/dictionary/testModel.xml
rename to repository/src/test/resources/dictionary/testModel.xml
diff --git a/src/test/resources/dictionary/testModel2.xml b/repository/src/test/resources/dictionary/testModel2.xml
similarity index 100%
rename from src/test/resources/dictionary/testModel2.xml
rename to repository/src/test/resources/dictionary/testModel2.xml
diff --git a/src/test/resources/facets/extension/facets-config-custom-sample.properties b/repository/src/test/resources/facets/extension/facets-config-custom-sample.properties
similarity index 100%
rename from src/test/resources/facets/extension/facets-config-custom-sample.properties
rename to repository/src/test/resources/facets/extension/facets-config-custom-sample.properties
diff --git a/src/test/resources/facets/facets-config-sample.properties b/repository/src/test/resources/facets/facets-config-sample.properties
similarity index 100%
rename from src/test/resources/facets/facets-config-sample.properties
rename to repository/src/test/resources/facets/facets-config-sample.properties
diff --git a/src/test/resources/facets/test-facet-property-context.xml b/repository/src/test/resources/facets/test-facet-property-context.xml
similarity index 100%
rename from src/test/resources/facets/test-facet-property-context.xml
rename to repository/src/test/resources/facets/test-facet-property-context.xml
diff --git a/src/test/resources/farmers_markets_list_2003.doc b/repository/src/test/resources/farmers_markets_list_2003.doc
similarity index 100%
rename from src/test/resources/farmers_markets_list_2003.doc
rename to repository/src/test/resources/farmers_markets_list_2003.doc
diff --git a/src/test/resources/filefolder/filefolder-test-import.xml b/repository/src/test/resources/filefolder/filefolder-test-import.xml
similarity index 100%
rename from src/test/resources/filefolder/filefolder-test-import.xml
rename to repository/src/test/resources/filefolder/filefolder-test-import.xml
diff --git a/src/test/resources/filesys/ContentComparatorTest0.mpp b/repository/src/test/resources/filesys/ContentComparatorTest0.mpp
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTest0.mpp
rename to repository/src/test/resources/filesys/ContentComparatorTest0.mpp
diff --git a/src/test/resources/filesys/ContentComparatorTest1.mpp b/repository/src/test/resources/filesys/ContentComparatorTest1.mpp
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTest1.mpp
rename to repository/src/test/resources/filesys/ContentComparatorTest1.mpp
diff --git a/src/test/resources/filesys/ContentComparatorTest2.mpp b/repository/src/test/resources/filesys/ContentComparatorTest2.mpp
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTest2.mpp
rename to repository/src/test/resources/filesys/ContentComparatorTest2.mpp
diff --git a/src/test/resources/filesys/ContentComparatorTestExcel2003-1.xls b/repository/src/test/resources/filesys/ContentComparatorTestExcel2003-1.xls
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestExcel2003-1.xls
rename to repository/src/test/resources/filesys/ContentComparatorTestExcel2003-1.xls
diff --git a/src/test/resources/filesys/ContentComparatorTestExcel2003-2.xls b/repository/src/test/resources/filesys/ContentComparatorTestExcel2003-2.xls
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestExcel2003-2.xls
rename to repository/src/test/resources/filesys/ContentComparatorTestExcel2003-2.xls
diff --git a/src/test/resources/filesys/ContentComparatorTestExcel2003-3.xls b/repository/src/test/resources/filesys/ContentComparatorTestExcel2003-3.xls
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestExcel2003-3.xls
rename to repository/src/test/resources/filesys/ContentComparatorTestExcel2003-3.xls
diff --git a/src/test/resources/filesys/ContentComparatorTestExcel2003-4.xls b/repository/src/test/resources/filesys/ContentComparatorTestExcel2003-4.xls
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestExcel2003-4.xls
rename to repository/src/test/resources/filesys/ContentComparatorTestExcel2003-4.xls
diff --git a/src/test/resources/filesys/ContentComparatorTestExcel2003-5.xls b/repository/src/test/resources/filesys/ContentComparatorTestExcel2003-5.xls
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestExcel2003-5.xls
rename to repository/src/test/resources/filesys/ContentComparatorTestExcel2003-5.xls
diff --git a/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-0-initial.ppt b/repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-0-initial.ppt
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestPowerPoint2003-0-initial.ppt
rename to repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-0-initial.ppt
diff --git a/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-1-edited-lt-3073bytes.ppt b/repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-1-edited-lt-3073bytes.ppt
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestPowerPoint2003-1-edited-lt-3073bytes.ppt
rename to repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-1-edited-lt-3073bytes.ppt
diff --git a/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-2-opened-closed.ppt b/repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-2-opened-closed.ppt
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestPowerPoint2003-2-opened-closed.ppt
rename to repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-2-opened-closed.ppt
diff --git a/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-3-opened-edited-closed.ppt b/repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-3-opened-edited-closed.ppt
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestPowerPoint2003-3-opened-edited-closed.ppt
rename to repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-3-opened-edited-closed.ppt
diff --git a/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-4-edited-gt-3072bytes.ppt b/repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-4-edited-gt-3072bytes.ppt
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestPowerPoint2003-4-edited-gt-3072bytes.ppt
rename to repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-4-edited-gt-3072bytes.ppt
diff --git a/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-5-edited-lt-0bytes.ppt b/repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-5-edited-lt-0bytes.ppt
similarity index 100%
rename from src/test/resources/filesys/ContentComparatorTestPowerPoint2003-5-edited-lt-0bytes.ppt
rename to repository/src/test/resources/filesys/ContentComparatorTestPowerPoint2003-5-edited-lt-0bytes.ppt
diff --git a/src/test/resources/filesys/ContentDiskDriverTest1.docx b/repository/src/test/resources/filesys/ContentDiskDriverTest1.docx
similarity index 100%
rename from src/test/resources/filesys/ContentDiskDriverTest1.docx
rename to repository/src/test/resources/filesys/ContentDiskDriverTest1.docx
diff --git a/src/test/resources/filesys/ContentDiskDriverTest2.docx b/repository/src/test/resources/filesys/ContentDiskDriverTest2.docx
similarity index 100%
rename from src/test/resources/filesys/ContentDiskDriverTest2.docx
rename to repository/src/test/resources/filesys/ContentDiskDriverTest2.docx
diff --git a/src/test/resources/filesys/ContentDiskDriverTest3.doc b/repository/src/test/resources/filesys/ContentDiskDriverTest3.doc
similarity index 100%
rename from src/test/resources/filesys/ContentDiskDriverTest3.doc
rename to repository/src/test/resources/filesys/ContentDiskDriverTest3.doc
diff --git a/src/test/resources/filesys/ContentDiskDriverTestMark.jpg b/repository/src/test/resources/filesys/ContentDiskDriverTestMark.jpg
similarity index 100%
rename from src/test/resources/filesys/ContentDiskDriverTestMark.jpg
rename to repository/src/test/resources/filesys/ContentDiskDriverTestMark.jpg
diff --git a/src/test/resources/filesys/ContentDiskDriverTestMark2.jpg b/repository/src/test/resources/filesys/ContentDiskDriverTestMark2.jpg
similarity index 100%
rename from src/test/resources/filesys/ContentDiskDriverTestMark2.jpg
rename to repository/src/test/resources/filesys/ContentDiskDriverTestMark2.jpg
diff --git a/src/test/resources/filesys/ContentDiskDriverTestTxt1.txt b/repository/src/test/resources/filesys/ContentDiskDriverTestTxt1.txt
similarity index 100%
rename from src/test/resources/filesys/ContentDiskDriverTestTxt1.txt
rename to repository/src/test/resources/filesys/ContentDiskDriverTestTxt1.txt
diff --git a/src/test/resources/filesys/X1.fm b/repository/src/test/resources/filesys/X1.fm
similarity index 100%
rename from src/test/resources/filesys/X1.fm
rename to repository/src/test/resources/filesys/X1.fm
diff --git a/src/test/resources/filesys/X2.fm b/repository/src/test/resources/filesys/X2.fm
similarity index 100%
rename from src/test/resources/filesys/X2.fm
rename to repository/src/test/resources/filesys/X2.fm
diff --git a/src/test/resources/ibatis/hierarchy-test/hierarchy-test-SqlMapConfig.xml b/repository/src/test/resources/ibatis/hierarchy-test/hierarchy-test-SqlMapConfig.xml
similarity index 100%
rename from src/test/resources/ibatis/hierarchy-test/hierarchy-test-SqlMapConfig.xml
rename to repository/src/test/resources/ibatis/hierarchy-test/hierarchy-test-SqlMapConfig.xml
diff --git a/src/test/resources/ibatis/hierarchy-test/hierarchy-test-context.xml b/repository/src/test/resources/ibatis/hierarchy-test/hierarchy-test-context.xml
similarity index 100%
rename from src/test/resources/ibatis/hierarchy-test/hierarchy-test-context.xml
rename to repository/src/test/resources/ibatis/hierarchy-test/hierarchy-test-context.xml
diff --git a/src/test/resources/ibatis/hierarchy-test/java.util.AbstractCollection/hierarchy-test-SqlMap.xml b/repository/src/test/resources/ibatis/hierarchy-test/java.util.AbstractCollection/hierarchy-test-SqlMap.xml
similarity index 100%
rename from src/test/resources/ibatis/hierarchy-test/java.util.AbstractCollection/hierarchy-test-SqlMap.xml
rename to repository/src/test/resources/ibatis/hierarchy-test/java.util.AbstractCollection/hierarchy-test-SqlMap.xml
diff --git a/src/test/resources/ibatis/hierarchy-test/java.util.AbstractList/hierarchy-test-SqlMap.xml b/repository/src/test/resources/ibatis/hierarchy-test/java.util.AbstractList/hierarchy-test-SqlMap.xml
similarity index 100%
rename from src/test/resources/ibatis/hierarchy-test/java.util.AbstractList/hierarchy-test-SqlMap.xml
rename to repository/src/test/resources/ibatis/hierarchy-test/java.util.AbstractList/hierarchy-test-SqlMap.xml
diff --git a/src/test/resources/ibatis/hierarchy-test/java.util.TreeSet/hierarchy-test-SqlMap.xml b/repository/src/test/resources/ibatis/hierarchy-test/java.util.TreeSet/hierarchy-test-SqlMap.xml
similarity index 100%
rename from src/test/resources/ibatis/hierarchy-test/java.util.TreeSet/hierarchy-test-SqlMap.xml
rename to repository/src/test/resources/ibatis/hierarchy-test/java.util.TreeSet/hierarchy-test-SqlMap.xml
diff --git a/src/test/resources/images/gray21.512.png b/repository/src/test/resources/images/gray21.512.png
similarity index 100%
rename from src/test/resources/images/gray21.512.png
rename to repository/src/test/resources/images/gray21.512.png
diff --git a/src/test/resources/images/gray21.512.tiff b/repository/src/test/resources/images/gray21.512.tiff
similarity index 100%
rename from src/test/resources/images/gray21.512.tiff
rename to repository/src/test/resources/images/gray21.512.tiff
diff --git a/src/test/resources/images/rotated_gray21.512.jpg b/repository/src/test/resources/images/rotated_gray21.512.jpg
similarity index 100%
rename from src/test/resources/images/rotated_gray21.512.jpg
rename to repository/src/test/resources/images/rotated_gray21.512.jpg
diff --git a/src/test/resources/imap/imapservice_test_folder_a.acp b/repository/src/test/resources/imap/imapservice_test_folder_a.acp
similarity index 100%
rename from src/test/resources/imap/imapservice_test_folder_a.acp
rename to repository/src/test/resources/imap/imapservice_test_folder_a.acp
diff --git a/src/test/resources/imap/load_test_data.acp b/repository/src/test/resources/imap/load_test_data.acp
similarity index 100%
rename from src/test/resources/imap/load_test_data.acp
rename to repository/src/test/resources/imap/load_test_data.acp
diff --git a/src/test/resources/imap/test-8bit-message.eml b/repository/src/test/resources/imap/test-8bit-message.eml
similarity index 100%
rename from src/test/resources/imap/test-8bit-message.eml
rename to repository/src/test/resources/imap/test-8bit-message.eml
diff --git a/src/test/resources/imap/test-tnef-message.eml b/repository/src/test/resources/imap/test-tnef-message.eml
similarity index 100%
rename from src/test/resources/imap/test-tnef-message.eml
rename to repository/src/test/resources/imap/test-tnef-message.eml
diff --git a/src/test/resources/import-archive-test/SuspiciousPathsArchive.zip b/repository/src/test/resources/import-archive-test/SuspiciousPathsArchive.zip
similarity index 100%
rename from src/test/resources/import-archive-test/SuspiciousPathsArchive.zip
rename to repository/src/test/resources/import-archive-test/SuspiciousPathsArchive.zip
diff --git a/src/test/resources/import-archive-test/folderCmTitledAspectArchive.zip b/repository/src/test/resources/import-archive-test/folderCmTitledAspectArchive.zip
similarity index 100%
rename from src/test/resources/import-archive-test/folderCmTitledAspectArchive.zip
rename to repository/src/test/resources/import-archive-test/folderCmTitledAspectArchive.zip
diff --git a/src/test/resources/log4j.properties b/repository/src/test/resources/log4j.properties
similarity index 100%
rename from src/test/resources/log4j.properties
rename to repository/src/test/resources/log4j.properties
diff --git a/src/test/resources/log4j/custom-log4j.properties b/repository/src/test/resources/log4j/custom-log4j.properties
similarity index 100%
rename from src/test/resources/log4j/custom-log4j.properties
rename to repository/src/test/resources/log4j/custom-log4j.properties
diff --git a/src/test/resources/log4j/log4j-test-context.xml b/repository/src/test/resources/log4j/log4j-test-context.xml
similarity index 100%
rename from src/test/resources/log4j/log4j-test-context.xml
rename to repository/src/test/resources/log4j/log4j-test-context.xml
diff --git a/src/test/resources/log4j/log4j.properties b/repository/src/test/resources/log4j/log4j.properties
similarity index 100%
rename from src/test/resources/log4j/log4j.properties
rename to repository/src/test/resources/log4j/log4j.properties
diff --git a/src/test/resources/misc/empty.html b/repository/src/test/resources/misc/empty.html
similarity index 100%
rename from src/test/resources/misc/empty.html
rename to repository/src/test/resources/misc/empty.html
diff --git a/src/test/resources/module/alfresco-4.2.a.war b/repository/src/test/resources/module/alfresco-4.2.a.war
similarity index 100%
rename from src/test/resources/module/alfresco-4.2.a.war
rename to repository/src/test/resources/module/alfresco-4.2.a.war
diff --git a/src/test/resources/module/alfresco-4.2.c.war b/repository/src/test/resources/module/alfresco-4.2.c.war
similarity index 100%
rename from src/test/resources/module/alfresco-4.2.c.war
rename to repository/src/test/resources/module/alfresco-4.2.c.war
diff --git a/src/test/resources/module/dependent_on_test_v1.amp b/repository/src/test/resources/module/dependent_on_test_v1.amp
similarity index 100%
rename from src/test/resources/module/dependent_on_test_v1.amp
rename to repository/src/test/resources/module/dependent_on_test_v1.amp
diff --git a/src/test/resources/module/dependent_on_test_v2.amp b/repository/src/test/resources/module/dependent_on_test_v2.amp
similarity index 100%
rename from src/test/resources/module/dependent_on_test_v2.amp
rename to repository/src/test/resources/module/dependent_on_test_v2.amp
diff --git a/src/test/resources/module/empty.war b/repository/src/test/resources/module/empty.war
similarity index 100%
rename from src/test/resources/module/empty.war
rename to repository/src/test/resources/module/empty.war
diff --git a/src/test/resources/module/module-component-test-beans.xml b/repository/src/test/resources/module/module-component-test-beans.xml
similarity index 100%
rename from src/test/resources/module/module-component-test-beans.xml
rename to repository/src/test/resources/module/module-component-test-beans.xml
diff --git a/src/test/resources/module/module-importer-test-categories.xml b/repository/src/test/resources/module/module-importer-test-categories.xml
similarity index 100%
rename from src/test/resources/module/module-importer-test-categories.xml
rename to repository/src/test/resources/module/module-importer-test-categories.xml
diff --git a/src/test/resources/module/share-3.4.11.war b/repository/src/test/resources/module/share-3.4.11.war
similarity index 100%
rename from src/test/resources/module/share-3.4.11.war
rename to repository/src/test/resources/module/share-3.4.11.war
diff --git a/src/test/resources/module/share-4.2.a.war b/repository/src/test/resources/module/share-4.2.a.war
similarity index 100%
rename from src/test/resources/module/share-4.2.a.war
rename to repository/src/test/resources/module/share-4.2.a.war
diff --git a/src/test/resources/module/test.war b/repository/src/test/resources/module/test.war
similarity index 100%
rename from src/test/resources/module/test.war
rename to repository/src/test/resources/module/test.war
diff --git a/src/test/resources/module/test_v1.amp b/repository/src/test/resources/module/test_v1.amp
similarity index 100%
rename from src/test/resources/module/test_v1.amp
rename to repository/src/test/resources/module/test_v1.amp
diff --git a/src/test/resources/module/test_v2.amp b/repository/src/test/resources/module/test_v2.amp
similarity index 100%
rename from src/test/resources/module/test_v2.amp
rename to repository/src/test/resources/module/test_v2.amp
diff --git a/src/test/resources/module/test_v3.amp b/repository/src/test/resources/module/test_v3.amp
similarity index 100%
rename from src/test/resources/module/test_v3.amp
rename to repository/src/test/resources/module/test_v3.amp
diff --git a/src/test/resources/module/test_v4.amp b/repository/src/test/resources/module/test_v4.amp
similarity index 100%
rename from src/test/resources/module/test_v4.amp
rename to repository/src/test/resources/module/test_v4.amp
diff --git a/src/test/resources/module/test_v5.amp b/repository/src/test/resources/module/test_v5.amp
similarity index 100%
rename from src/test/resources/module/test_v5.amp
rename to repository/src/test/resources/module/test_v5.amp
diff --git a/src/test/resources/module/test_v6.amp b/repository/src/test/resources/module/test_v6.amp
similarity index 100%
rename from src/test/resources/module/test_v6.amp
rename to repository/src/test/resources/module/test_v6.amp
diff --git a/src/test/resources/module/test_v7.amp b/repository/src/test/resources/module/test_v7.amp
similarity index 100%
rename from src/test/resources/module/test_v7.amp
rename to repository/src/test/resources/module/test_v7.amp
diff --git a/src/test/resources/opencmis/opencmistest-context.xml b/repository/src/test/resources/opencmis/opencmistest-context.xml
similarity index 100%
rename from src/test/resources/opencmis/opencmistest-context.xml
rename to repository/src/test/resources/opencmis/opencmistest-context.xml
diff --git a/src/test/resources/opencmis/testcmis-model.xml b/repository/src/test/resources/opencmis/testcmis-model.xml
similarity index 100%
rename from src/test/resources/opencmis/testcmis-model.xml
rename to repository/src/test/resources/opencmis/testcmis-model.xml
diff --git a/src/test/resources/opencmis/testcmis_item_model.xml b/repository/src/test/resources/opencmis/testcmis_item_model.xml
similarity index 100%
rename from src/test/resources/opencmis/testcmis_item_model.xml
rename to repository/src/test/resources/opencmis/testcmis_item_model.xml
diff --git a/src/test/resources/opencmis/testcmisdecimal_model.xml b/repository/src/test/resources/opencmis/testcmisdecimal_model.xml
similarity index 100%
rename from src/test/resources/opencmis/testcmisdecimal_model.xml
rename to repository/src/test/resources/opencmis/testcmisdecimal_model.xml
diff --git a/src/test/resources/opencmis/testcmisinteger_model.xml b/repository/src/test/resources/opencmis/testcmisinteger_model.xml
similarity index 100%
rename from src/test/resources/opencmis/testcmisinteger_model.xml
rename to repository/src/test/resources/opencmis/testcmisinteger_model.xml
diff --git a/src/test/resources/org/alfresco/cmis/search/CMIS-query-test-model.xml b/repository/src/test/resources/org/alfresco/cmis/search/CMIS-query-test-model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/cmis/search/CMIS-query-test-model.xml
rename to repository/src/test/resources/org/alfresco/cmis/search/CMIS-query-test-model.xml
diff --git a/src/test/resources/org/alfresco/repo/action/script/test_actionTrackingService.js b/repository/src/test/resources/org/alfresco/repo/action/script/test_actionTrackingService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/action/script/test_actionTrackingService.js
rename to repository/src/test/resources/org/alfresco/repo/action/script/test_actionTrackingService.js
diff --git a/src/test/resources/org/alfresco/repo/action/test-action-services-context.xml b/repository/src/test/resources/org/alfresco/repo/action/test-action-services-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/action/test-action-services-context.xml
rename to repository/src/test/resources/org/alfresco/repo/action/test-action-services-context.xml
diff --git a/src/test/resources/org/alfresco/repo/activities/script/test_activityService.js b/repository/src/test/resources/org/alfresco/repo/activities/script/test_activityService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/activities/script/test_activityService.js
rename to repository/src/test/resources/org/alfresco/repo/activities/script/test_activityService.js
diff --git a/src/test/resources/org/alfresco/repo/client/config/test-global-properties.properties b/repository/src/test/resources/org/alfresco/repo/client/config/test-global-properties.properties
similarity index 100%
rename from src/test/resources/org/alfresco/repo/client/config/test-global-properties.properties
rename to repository/src/test/resources/org/alfresco/repo/client/config/test-global-properties.properties
diff --git a/src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps-context.xml b/repository/src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps-context.xml
rename to repository/src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps-context.xml
diff --git a/src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps.properties b/repository/src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps.properties
similarity index 100%
rename from src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps.properties
rename to repository/src/test/resources/org/alfresco/repo/client/config/test-repo-clients-apps.properties
diff --git a/src/test/resources/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest-DummyPropertiesInPackageLocationMappingMetadataExtracter.properties b/repository/src/test/resources/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest-DummyPropertiesInPackageLocationMappingMetadataExtracter.properties
similarity index 100%
rename from src/test/resources/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest-DummyPropertiesInPackageLocationMappingMetadataExtracter.properties
rename to repository/src/test/resources/org/alfresco/repo/content/metadata/MappingMetadataExtracterTest-DummyPropertiesInPackageLocationMappingMetadataExtracter.properties
diff --git a/src/test/resources/org/alfresco/repo/content/transform/FailoverContentTransformerTest-context.xml b/repository/src/test/resources/org/alfresco/repo/content/transform/FailoverContentTransformerTest-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/content/transform/FailoverContentTransformerTest-context.xml
rename to repository/src/test/resources/org/alfresco/repo/content/transform/FailoverContentTransformerTest-context.xml
diff --git a/src/test/resources/org/alfresco/repo/forms/MNT-7383-context.xml b/repository/src/test/resources/org/alfresco/repo/forms/MNT-7383-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/forms/MNT-7383-context.xml
rename to repository/src/test/resources/org/alfresco/repo/forms/MNT-7383-context.xml
diff --git a/src/test/resources/org/alfresco/repo/forms/script/test_formService.js b/repository/src/test/resources/org/alfresco/repo/forms/script/test_formService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/forms/script/test_formService.js
rename to repository/src/test/resources/org/alfresco/repo/forms/script/test_formService.js
diff --git a/src/test/resources/org/alfresco/repo/importer/import_folders.xml b/repository/src/test/resources/org/alfresco/repo/importer/import_folders.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/importer/import_folders.xml
rename to repository/src/test/resources/org/alfresco/repo/importer/import_folders.xml
diff --git a/src/test/resources/org/alfresco/repo/importer/importercomponent_test.xml b/repository/src/test/resources/org/alfresco/repo/importer/importercomponent_test.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/importer/importercomponent_test.xml
rename to repository/src/test/resources/org/alfresco/repo/importer/importercomponent_test.xml
diff --git a/src/test/resources/org/alfresco/repo/importer/importercomponent_testfile.txt b/repository/src/test/resources/org/alfresco/repo/importer/importercomponent_testfile.txt
similarity index 100%
rename from src/test/resources/org/alfresco/repo/importer/importercomponent_testfile.txt
rename to repository/src/test/resources/org/alfresco/repo/importer/importercomponent_testfile.txt
diff --git a/src/test/resources/org/alfresco/repo/jscript/test-context.xml b/repository/src/test/resources/org/alfresco/repo/jscript/test-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test-context.xml
rename to repository/src/test/resources/org/alfresco/repo/jscript/test-context.xml
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_childbynameparents.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_childbynameparents.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_childbynameparents.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_childbynameparents.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_childfilefolders.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_childfilefolders.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_childfilefolders.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_childfilefolders.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_onAddAspect_cmCountable.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_onAddAspect_cmCountable.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_onAddAspect_cmCountable.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_onAddAspect_cmCountable.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_onCreateChildAssociation.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_onCreateChildAssociation.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_onCreateChildAssociation.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_onCreateChildAssociation.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_onCreateNode_cmContent.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_onCreateNode_cmContent.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_onCreateNode_cmContent.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_onCreateNode_cmContent.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_script1.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_script1.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_script1.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_script1.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_script2.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_script2.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_script2.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_script2.js
diff --git a/src/test/resources/org/alfresco/repo/jscript/test_script3.js b/repository/src/test/resources/org/alfresco/repo/jscript/test_script3.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/jscript/test_script3.js
rename to repository/src/test/resources/org/alfresco/repo/jscript/test_script3.js
diff --git a/src/test/resources/org/alfresco/repo/model/filefolder/testModel.xml b/repository/src/test/resources/org/alfresco/repo/model/filefolder/testModel.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/model/filefolder/testModel.xml
rename to repository/src/test/resources/org/alfresco/repo/model/filefolder/testModel.xml
diff --git a/src/test/resources/org/alfresco/repo/node/BaseNodeServiceTest_model.xml b/repository/src/test/resources/org/alfresco/repo/node/BaseNodeServiceTest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/node/BaseNodeServiceTest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/node/BaseNodeServiceTest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/node/NodeRefTestModel.xml b/repository/src/test/resources/org/alfresco/repo/node/NodeRefTestModel.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/node/NodeRefTestModel.xml
rename to repository/src/test/resources/org/alfresco/repo/node/NodeRefTestModel.xml
diff --git a/src/test/resources/org/alfresco/repo/node/archive/archiveTest_model.xml b/repository/src/test/resources/org/alfresco/repo/node/archive/archiveTest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/node/archive/archiveTest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/node/archive/archiveTest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml b/repository/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml
rename to repository/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml
diff --git a/src/test/resources/org/alfresco/repo/node/integrity/IntegrityTest_model.xml b/repository/src/test/resources/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml b/repository/src/test/resources/org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml
rename to repository/src/test/resources/org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml
diff --git a/src/test/resources/org/alfresco/repo/policy/policycomponenttest_model.xml b/repository/src/test/resources/org/alfresco/repo/policy/policycomponenttest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/policy/policycomponenttest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/policy/policycomponenttest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/preference/script/test_preferenceService.js b/repository/src/test/resources/org/alfresco/repo/preference/script/test_preferenceService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/preference/script/test_preferenceService.js
rename to repository/src/test/resources/org/alfresco/repo/preference/script/test_preferenceService.js
diff --git a/src/test/resources/org/alfresco/repo/rating/script/test_ratingService.js b/repository/src/test/resources/org/alfresco/repo/rating/script/test_ratingService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/rating/script/test_ratingService.js
rename to repository/src/test/resources/org/alfresco/repo/rating/script/test_ratingService.js
diff --git a/src/test/resources/org/alfresco/repo/rendition/renditionTestTemplate.ftl b/repository/src/test/resources/org/alfresco/repo/rendition/renditionTestTemplate.ftl
similarity index 100%
rename from src/test/resources/org/alfresco/repo/rendition/renditionTestTemplate.ftl
rename to repository/src/test/resources/org/alfresco/repo/rendition/renditionTestTemplate.ftl
diff --git a/src/test/resources/org/alfresco/repo/rendition/script/test_renditionService.js b/repository/src/test/resources/org/alfresco/repo/rendition/script/test_renditionService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/rendition/script/test_renditionService.js
rename to repository/src/test/resources/org/alfresco/repo/rendition/script/test_renditionService.js
diff --git a/src/test/resources/org/alfresco/repo/rendition2/test-transform-context.xml b/repository/src/test/resources/org/alfresco/repo/rendition2/test-transform-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/rendition2/test-transform-context.xml
rename to repository/src/test/resources/org/alfresco/repo/rendition2/test-transform-context.xml
diff --git a/src/test/resources/org/alfresco/repo/replication/script/test_replicationService.js b/repository/src/test/resources/org/alfresco/repo/replication/script/test_replicationService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/replication/script/test_replicationService.js
rename to repository/src/test/resources/org/alfresco/repo/replication/script/test_replicationService.js
diff --git a/src/test/resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml b/repository/src/test/resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery2.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery2.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery2.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/correctlySpelledTermQuery2.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean2.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean2.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean2.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/didYouMean2.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/noSuggestions.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/noSuggestions.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/noSuggestions.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/noSuggestions.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor2.json b/repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor2.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor2.json
rename to repository/src/test/resources/org/alfresco/repo/search/impl/spellcheck/searchInsteadFor2.json
diff --git a/src/test/resources/org/alfresco/repo/search/impl/test-solr-search-context.xml b/repository/src/test/resources/org/alfresco/repo/search/impl/test-solr-search-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/search/impl/test-solr-search-context.xml
rename to repository/src/test/resources/org/alfresco/repo/search/impl/test-solr-search-context.xml
diff --git a/src/test/resources/org/alfresco/repo/service/serviceregistrytest_model.xml b/repository/src/test/resources/org/alfresco/repo/service/serviceregistrytest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/service/serviceregistrytest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/service/serviceregistrytest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/service/testredirector.xml b/repository/src/test/resources/org/alfresco/repo/service/testredirector.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/service/testredirector.xml
rename to repository/src/test/resources/org/alfresco/repo/service/testredirector.xml
diff --git a/src/test/resources/org/alfresco/repo/site/script/test_siteService.js b/repository/src/test/resources/org/alfresco/repo/site/script/test_siteService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/site/script/test_siteService.js
rename to repository/src/test/resources/org/alfresco/repo/site/script/test_siteService.js
diff --git a/src/test/resources/org/alfresco/repo/site/script/test_tagScopeALF_21875.js b/repository/src/test/resources/org/alfresco/repo/site/script/test_tagScopeALF_21875.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/site/script/test_tagScopeALF_21875.js
rename to repository/src/test/resources/org/alfresco/repo/site/script/test_tagScopeALF_21875.js
diff --git a/src/test/resources/org/alfresco/repo/site/site-custom-context.xml b/repository/src/test/resources/org/alfresco/repo/site/site-custom-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/site/site-custom-context.xml
rename to repository/src/test/resources/org/alfresco/repo/site/site-custom-context.xml
diff --git a/src/test/resources/org/alfresco/repo/site/sitePermissionDefinitionsWithCustomRole.xml b/repository/src/test/resources/org/alfresco/repo/site/sitePermissionDefinitionsWithCustomRole.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/site/sitePermissionDefinitionsWithCustomRole.xml
rename to repository/src/test/resources/org/alfresco/repo/site/sitePermissionDefinitionsWithCustomRole.xml
diff --git a/src/test/resources/org/alfresco/repo/solr/testModel.xml b/repository/src/test/resources/org/alfresco/repo/solr/testModel.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/solr/testModel.xml
rename to repository/src/test/resources/org/alfresco/repo/solr/testModel.xml
diff --git a/src/test/resources/org/alfresco/repo/tagging/script/test_taggingService.js b/repository/src/test/resources/org/alfresco/repo/tagging/script/test_taggingService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/tagging/script/test_taggingService.js
rename to repository/src/test/resources/org/alfresco/repo/tagging/script/test_taggingService.js
diff --git a/src/test/resources/org/alfresco/repo/template/test_template1.ftl b/repository/src/test/resources/org/alfresco/repo/template/test_template1.ftl
similarity index 100%
rename from src/test/resources/org/alfresco/repo/template/test_template1.ftl
rename to repository/src/test/resources/org/alfresco/repo/template/test_template1.ftl
diff --git a/src/test/resources/org/alfresco/repo/template/test_template1.xsl b/repository/src/test/resources/org/alfresco/repo/template/test_template1.xsl
similarity index 100%
rename from src/test/resources/org/alfresco/repo/template/test_template1.xsl
rename to repository/src/test/resources/org/alfresco/repo/template/test_template1.xsl
diff --git a/src/test/resources/org/alfresco/repo/template/test_template1_en_AU.xsl b/repository/src/test/resources/org/alfresco/repo/template/test_template1_en_AU.xsl
similarity index 100%
rename from src/test/resources/org/alfresco/repo/template/test_template1_en_AU.xsl
rename to repository/src/test/resources/org/alfresco/repo/template/test_template1_en_AU.xsl
diff --git a/src/test/resources/org/alfresco/repo/template/test_template1_fr.xsl b/repository/src/test/resources/org/alfresco/repo/template/test_template1_fr.xsl
similarity index 100%
rename from src/test/resources/org/alfresco/repo/template/test_template1_fr.xsl
rename to repository/src/test/resources/org/alfresco/repo/template/test_template1_fr.xsl
diff --git a/src/test/resources/org/alfresco/repo/thumbnail/script/test_thumbnailAPI.js b/repository/src/test/resources/org/alfresco/repo/thumbnail/script/test_thumbnailAPI.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/thumbnail/script/test_thumbnailAPI.js
rename to repository/src/test/resources/org/alfresco/repo/thumbnail/script/test_thumbnailAPI.js
diff --git a/src/test/resources/org/alfresco/repo/transfer/script/test_transferService.js b/repository/src/test/resources/org/alfresco/repo/transfer/script/test_transferService.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/transfer/script/test_transferService.js
rename to repository/src/test/resources/org/alfresco/repo/transfer/script/test_transferService.js
diff --git a/src/test/resources/org/alfresco/repo/version/VersionStoreBaseTest_model.xml b/repository/src/test/resources/org/alfresco/repo/version/VersionStoreBaseTest_model.xml
similarity index 100%
rename from src/test/resources/org/alfresco/repo/version/VersionStoreBaseTest_model.xml
rename to repository/src/test/resources/org/alfresco/repo/version/VersionStoreBaseTest_model.xml
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.js b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.js
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.js
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.js
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate1.json
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate2.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate2.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate2.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate2.json
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate3.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate3.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate3.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate3.json
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate4.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate4.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate4.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate4.json
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate5.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate5.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate5.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate5.json
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate6.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate6.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate6.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate6.json
diff --git a/src/test/resources/org/alfresco/repo/virtual/template/testTemplate7.json b/repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate7.json
similarity index 100%
rename from src/test/resources/org/alfresco/repo/virtual/template/testTemplate7.json
rename to repository/src/test/resources/org/alfresco/repo/virtual/template/testTemplate7.json
diff --git a/src/test/resources/org/alfresco/util/test/junitrules/dummy1-context.xml b/repository/src/test/resources/org/alfresco/util/test/junitrules/dummy1-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/util/test/junitrules/dummy1-context.xml
rename to repository/src/test/resources/org/alfresco/util/test/junitrules/dummy1-context.xml
diff --git a/src/test/resources/org/alfresco/util/test/junitrules/dummy2-context.xml b/repository/src/test/resources/org/alfresco/util/test/junitrules/dummy2-context.xml
similarity index 100%
rename from src/test/resources/org/alfresco/util/test/junitrules/dummy2-context.xml
rename to repository/src/test/resources/org/alfresco/util/test/junitrules/dummy2-context.xml
diff --git a/src/test/resources/org/alfresco/wcm/webproject/script/test_WebProjectService.js b/repository/src/test/resources/org/alfresco/wcm/webproject/script/test_WebProjectService.js
similarity index 100%
rename from src/test/resources/org/alfresco/wcm/webproject/script/test_WebProjectService.js
rename to repository/src/test/resources/org/alfresco/wcm/webproject/script/test_WebProjectService.js
diff --git a/src/test/resources/quick/dmsu1332-reproduced.xlsx b/repository/src/test/resources/quick/dmsu1332-reproduced.xlsx
similarity index 100%
rename from src/test/resources/quick/dmsu1332-reproduced.xlsx
rename to repository/src/test/resources/quick/dmsu1332-reproduced.xlsx
diff --git a/src/test/resources/quick/problemFootnotes.docx b/repository/src/test/resources/quick/problemFootnotes.docx
similarity index 100%
rename from src/test/resources/quick/problemFootnotes.docx
rename to repository/src/test/resources/quick/problemFootnotes.docx
diff --git a/src/test/resources/quick/problemFootnotes2.docx b/repository/src/test/resources/quick/problemFootnotes2.docx
similarity index 100%
rename from src/test/resources/quick/problemFootnotes2.docx
rename to repository/src/test/resources/quick/problemFootnotes2.docx
diff --git a/src/test/resources/quick/quick-1.0.1-unsigned.apk b/repository/src/test/resources/quick/quick-1.0.1-unsigned.apk
similarity index 100%
rename from src/test/resources/quick/quick-1.0.1-unsigned.apk
rename to repository/src/test/resources/quick/quick-1.0.1-unsigned.apk
diff --git a/src/test/resources/quick/quick-differentMimetype.docx b/repository/src/test/resources/quick/quick-differentMimetype.docx
similarity index 100%
rename from src/test/resources/quick/quick-differentMimetype.docx
rename to repository/src/test/resources/quick/quick-differentMimetype.docx
diff --git a/src/test/resources/quick/quick-secured.pdf b/repository/src/test/resources/quick/quick-secured.pdf
similarity index 100%
rename from src/test/resources/quick/quick-secured.pdf
rename to repository/src/test/resources/quick/quick-secured.pdf
diff --git a/src/test/resources/quick/quick-size-limit.pdf b/repository/src/test/resources/quick/quick-size-limit.pdf
similarity index 100%
rename from src/test/resources/quick/quick-size-limit.pdf
rename to repository/src/test/resources/quick/quick-size-limit.pdf
diff --git a/src/test/resources/quick/quick.3g2 b/repository/src/test/resources/quick/quick.3g2
similarity index 100%
rename from src/test/resources/quick/quick.3g2
rename to repository/src/test/resources/quick/quick.3g2
diff --git a/src/test/resources/quick/quick.3gp b/repository/src/test/resources/quick/quick.3gp
similarity index 100%
rename from src/test/resources/quick/quick.3gp
rename to repository/src/test/resources/quick/quick.3gp
diff --git a/src/test/resources/quick/quick.acp b/repository/src/test/resources/quick/quick.acp
similarity index 100%
rename from src/test/resources/quick/quick.acp
rename to repository/src/test/resources/quick/quick.acp
diff --git a/src/test/resources/quick/quick.alternative.eml b/repository/src/test/resources/quick/quick.alternative.eml
similarity index 100%
rename from src/test/resources/quick/quick.alternative.eml
rename to repository/src/test/resources/quick/quick.alternative.eml
diff --git a/src/test/resources/quick/quick.asf b/repository/src/test/resources/quick/quick.asf
similarity index 100%
rename from src/test/resources/quick/quick.asf
rename to repository/src/test/resources/quick/quick.asf
diff --git a/src/test/resources/quick/quick.attachment.eml b/repository/src/test/resources/quick/quick.attachment.eml
similarity index 100%
rename from src/test/resources/quick/quick.attachment.eml
rename to repository/src/test/resources/quick/quick.attachment.eml
diff --git a/src/test/resources/quick/quick.avi b/repository/src/test/resources/quick/quick.avi
similarity index 100%
rename from src/test/resources/quick/quick.avi
rename to repository/src/test/resources/quick/quick.avi
diff --git a/src/test/resources/quick/quick.bmp b/repository/src/test/resources/quick/quick.bmp
similarity index 100%
rename from src/test/resources/quick/quick.bmp
rename to repository/src/test/resources/quick/quick.bmp
diff --git a/src/test/resources/quick/quick.chinese.msg b/repository/src/test/resources/quick/quick.chinese.msg
similarity index 100%
rename from src/test/resources/quick/quick.chinese.msg
rename to repository/src/test/resources/quick/quick.chinese.msg
diff --git a/src/test/resources/quick/quick.doc b/repository/src/test/resources/quick/quick.doc
similarity index 100%
rename from src/test/resources/quick/quick.doc
rename to repository/src/test/resources/quick/quick.doc
diff --git a/src/test/resources/quick/quick.docx b/repository/src/test/resources/quick/quick.docx
similarity index 100%
rename from src/test/resources/quick/quick.docx
rename to repository/src/test/resources/quick/quick.docx
diff --git a/src/test/resources/quick/quick.eml b/repository/src/test/resources/quick/quick.eml
similarity index 100%
rename from src/test/resources/quick/quick.eml
rename to repository/src/test/resources/quick/quick.eml
diff --git a/src/test/resources/quick/quick.flv b/repository/src/test/resources/quick/quick.flv
similarity index 100%
rename from src/test/resources/quick/quick.flv
rename to repository/src/test/resources/quick/quick.flv
diff --git a/src/test/resources/quick/quick.gif b/repository/src/test/resources/quick/quick.gif
similarity index 100%
rename from src/test/resources/quick/quick.gif
rename to repository/src/test/resources/quick/quick.gif
diff --git a/src/test/resources/quick/quick.html b/repository/src/test/resources/quick/quick.html
similarity index 100%
rename from src/test/resources/quick/quick.html
rename to repository/src/test/resources/quick/quick.html
diff --git a/src/test/resources/quick/quick.htmlChars.eml b/repository/src/test/resources/quick/quick.htmlChars.eml
similarity index 100%
rename from src/test/resources/quick/quick.htmlChars.eml
rename to repository/src/test/resources/quick/quick.htmlChars.eml
diff --git a/src/test/resources/quick/quick.ibooks b/repository/src/test/resources/quick/quick.ibooks
similarity index 100%
rename from src/test/resources/quick/quick.ibooks
rename to repository/src/test/resources/quick/quick.ibooks
diff --git a/src/test/resources/quick/quick.japanese.html b/repository/src/test/resources/quick/quick.japanese.html
similarity index 100%
rename from src/test/resources/quick/quick.japanese.html
rename to repository/src/test/resources/quick/quick.japanese.html
diff --git a/src/test/resources/quick/quick.jpg b/repository/src/test/resources/quick/quick.jpg
similarity index 100%
rename from src/test/resources/quick/quick.jpg
rename to repository/src/test/resources/quick/quick.jpg
diff --git a/src/test/resources/quick/quick.key b/repository/src/test/resources/quick/quick.key
similarity index 100%
rename from src/test/resources/quick/quick.key
rename to repository/src/test/resources/quick/quick.key
diff --git a/src/test/resources/quick/quick.m4a b/repository/src/test/resources/quick/quick.m4a
similarity index 100%
rename from src/test/resources/quick/quick.m4a
rename to repository/src/test/resources/quick/quick.m4a
diff --git a/src/test/resources/quick/quick.m4v b/repository/src/test/resources/quick/quick.m4v
similarity index 100%
rename from src/test/resources/quick/quick.m4v
rename to repository/src/test/resources/quick/quick.m4v
diff --git a/src/test/resources/quick/quick.mov b/repository/src/test/resources/quick/quick.mov
similarity index 100%
rename from src/test/resources/quick/quick.mov
rename to repository/src/test/resources/quick/quick.mov
diff --git a/src/test/resources/quick/quick.mp3 b/repository/src/test/resources/quick/quick.mp3
similarity index 100%
rename from src/test/resources/quick/quick.mp3
rename to repository/src/test/resources/quick/quick.mp3
diff --git a/src/test/resources/quick/quick.mp4 b/repository/src/test/resources/quick/quick.mp4
similarity index 100%
rename from src/test/resources/quick/quick.mp4
rename to repository/src/test/resources/quick/quick.mp4
diff --git a/src/test/resources/quick/quick.mpg b/repository/src/test/resources/quick/quick.mpg
similarity index 100%
rename from src/test/resources/quick/quick.mpg
rename to repository/src/test/resources/quick/quick.mpg
diff --git a/src/test/resources/quick/quick.msg b/repository/src/test/resources/quick/quick.msg
similarity index 100%
rename from src/test/resources/quick/quick.msg
rename to repository/src/test/resources/quick/quick.msg
diff --git a/src/test/resources/quick/quick.nested.alternative.eml b/repository/src/test/resources/quick/quick.nested.alternative.eml
similarity index 100%
rename from src/test/resources/quick/quick.nested.alternative.eml
rename to repository/src/test/resources/quick/quick.nested.alternative.eml
diff --git a/src/test/resources/quick/quick.numbers b/repository/src/test/resources/quick/quick.numbers
similarity index 100%
rename from src/test/resources/quick/quick.numbers
rename to repository/src/test/resources/quick/quick.numbers
diff --git a/src/test/resources/quick/quick.odf b/repository/src/test/resources/quick/quick.odf
similarity index 100%
rename from src/test/resources/quick/quick.odf
rename to repository/src/test/resources/quick/quick.odf
diff --git a/src/test/resources/quick/quick.odg b/repository/src/test/resources/quick/quick.odg
similarity index 100%
rename from src/test/resources/quick/quick.odg
rename to repository/src/test/resources/quick/quick.odg
diff --git a/src/test/resources/quick/quick.odp b/repository/src/test/resources/quick/quick.odp
similarity index 100%
rename from src/test/resources/quick/quick.odp
rename to repository/src/test/resources/quick/quick.odp
diff --git a/src/test/resources/quick/quick.ods b/repository/src/test/resources/quick/quick.ods
similarity index 100%
rename from src/test/resources/quick/quick.ods
rename to repository/src/test/resources/quick/quick.ods
diff --git a/src/test/resources/quick/quick.odt b/repository/src/test/resources/quick/quick.odt
similarity index 100%
rename from src/test/resources/quick/quick.odt
rename to repository/src/test/resources/quick/quick.odt
diff --git a/src/test/resources/quick/quick.ogg b/repository/src/test/resources/quick/quick.ogg
similarity index 100%
rename from src/test/resources/quick/quick.ogg
rename to repository/src/test/resources/quick/quick.ogg
diff --git a/src/test/resources/quick/quick.ogv b/repository/src/test/resources/quick/quick.ogv
similarity index 100%
rename from src/test/resources/quick/quick.ogv
rename to repository/src/test/resources/quick/quick.ogv
diff --git a/src/test/resources/quick/quick.otg b/repository/src/test/resources/quick/quick.otg
similarity index 100%
rename from src/test/resources/quick/quick.otg
rename to repository/src/test/resources/quick/quick.otg
diff --git a/src/test/resources/quick/quick.otp b/repository/src/test/resources/quick/quick.otp
similarity index 100%
rename from src/test/resources/quick/quick.otp
rename to repository/src/test/resources/quick/quick.otp
diff --git a/src/test/resources/quick/quick.ots b/repository/src/test/resources/quick/quick.ots
similarity index 100%
rename from src/test/resources/quick/quick.ots
rename to repository/src/test/resources/quick/quick.ots
diff --git a/src/test/resources/quick/quick.ott b/repository/src/test/resources/quick/quick.ott
similarity index 100%
rename from src/test/resources/quick/quick.ott
rename to repository/src/test/resources/quick/quick.ott
diff --git a/src/test/resources/quick/quick.pages b/repository/src/test/resources/quick/quick.pages
similarity index 100%
rename from src/test/resources/quick/quick.pages
rename to repository/src/test/resources/quick/quick.pages
diff --git a/src/test/resources/quick/quick.pdf b/repository/src/test/resources/quick/quick.pdf
similarity index 100%
rename from src/test/resources/quick/quick.pdf
rename to repository/src/test/resources/quick/quick.pdf
diff --git a/src/test/resources/quick/quick.png b/repository/src/test/resources/quick/quick.png
similarity index 100%
rename from src/test/resources/quick/quick.png
rename to repository/src/test/resources/quick/quick.png
diff --git a/src/test/resources/quick/quick.ppt b/repository/src/test/resources/quick/quick.ppt
similarity index 100%
rename from src/test/resources/quick/quick.ppt
rename to repository/src/test/resources/quick/quick.ppt
diff --git a/src/test/resources/quick/quick.pptx b/repository/src/test/resources/quick/quick.pptx
similarity index 100%
rename from src/test/resources/quick/quick.pptx
rename to repository/src/test/resources/quick/quick.pptx
diff --git a/src/test/resources/quick/quick.pub b/repository/src/test/resources/quick/quick.pub
similarity index 100%
rename from src/test/resources/quick/quick.pub
rename to repository/src/test/resources/quick/quick.pub
diff --git a/src/test/resources/quick/quick.sda b/repository/src/test/resources/quick/quick.sda
similarity index 100%
rename from src/test/resources/quick/quick.sda
rename to repository/src/test/resources/quick/quick.sda
diff --git a/src/test/resources/quick/quick.sdc b/repository/src/test/resources/quick/quick.sdc
similarity index 100%
rename from src/test/resources/quick/quick.sdc
rename to repository/src/test/resources/quick/quick.sdc
diff --git a/src/test/resources/quick/quick.sdd b/repository/src/test/resources/quick/quick.sdd
similarity index 100%
rename from src/test/resources/quick/quick.sdd
rename to repository/src/test/resources/quick/quick.sdd
diff --git a/src/test/resources/quick/quick.sdw b/repository/src/test/resources/quick/quick.sdw
similarity index 100%
rename from src/test/resources/quick/quick.sdw
rename to repository/src/test/resources/quick/quick.sdw
diff --git a/src/test/resources/quick/quick.smf b/repository/src/test/resources/quick/quick.smf
similarity index 100%
rename from src/test/resources/quick/quick.smf
rename to repository/src/test/resources/quick/quick.smf
diff --git a/src/test/resources/quick/quick.spanish.eml b/repository/src/test/resources/quick/quick.spanish.eml
similarity index 100%
rename from src/test/resources/quick/quick.spanish.eml
rename to repository/src/test/resources/quick/quick.spanish.eml
diff --git a/src/test/resources/quick/quick.sxc b/repository/src/test/resources/quick/quick.sxc
similarity index 100%
rename from src/test/resources/quick/quick.sxc
rename to repository/src/test/resources/quick/quick.sxc
diff --git a/src/test/resources/quick/quick.sxd b/repository/src/test/resources/quick/quick.sxd
similarity index 100%
rename from src/test/resources/quick/quick.sxd
rename to repository/src/test/resources/quick/quick.sxd
diff --git a/src/test/resources/quick/quick.sxi b/repository/src/test/resources/quick/quick.sxi
similarity index 100%
rename from src/test/resources/quick/quick.sxi
rename to repository/src/test/resources/quick/quick.sxi
diff --git a/src/test/resources/quick/quick.sxm b/repository/src/test/resources/quick/quick.sxm
similarity index 100%
rename from src/test/resources/quick/quick.sxm
rename to repository/src/test/resources/quick/quick.sxm
diff --git a/src/test/resources/quick/quick.sxw b/repository/src/test/resources/quick/quick.sxw
similarity index 100%
rename from src/test/resources/quick/quick.sxw
rename to repository/src/test/resources/quick/quick.sxw
diff --git a/src/test/resources/quick/quick.tar b/repository/src/test/resources/quick/quick.tar
similarity index 100%
rename from src/test/resources/quick/quick.tar
rename to repository/src/test/resources/quick/quick.tar
diff --git a/src/test/resources/quick/quick.tar.bz2 b/repository/src/test/resources/quick/quick.tar.bz2
similarity index 100%
rename from src/test/resources/quick/quick.tar.bz2
rename to repository/src/test/resources/quick/quick.tar.bz2
diff --git a/src/test/resources/quick/quick.tar.gz b/repository/src/test/resources/quick/quick.tar.gz
similarity index 100%
rename from src/test/resources/quick/quick.tar.gz
rename to repository/src/test/resources/quick/quick.tar.gz
diff --git a/src/test/resources/quick/quick.tiff b/repository/src/test/resources/quick/quick.tiff
similarity index 100%
rename from src/test/resources/quick/quick.tiff
rename to repository/src/test/resources/quick/quick.tiff
diff --git a/src/test/resources/quick/quick.txt b/repository/src/test/resources/quick/quick.txt
similarity index 100%
rename from src/test/resources/quick/quick.txt
rename to repository/src/test/resources/quick/quick.txt
diff --git a/src/test/resources/quick/quick.unicode.msg b/repository/src/test/resources/quick/quick.unicode.msg
similarity index 100%
rename from src/test/resources/quick/quick.unicode.msg
rename to repository/src/test/resources/quick/quick.unicode.msg
diff --git a/src/test/resources/quick/quick.vdx b/repository/src/test/resources/quick/quick.vdx
similarity index 100%
rename from src/test/resources/quick/quick.vdx
rename to repository/src/test/resources/quick/quick.vdx
diff --git a/src/test/resources/quick/quick.vsd b/repository/src/test/resources/quick/quick.vsd
similarity index 100%
rename from src/test/resources/quick/quick.vsd
rename to repository/src/test/resources/quick/quick.vsd
diff --git a/src/test/resources/quick/quick.webm b/repository/src/test/resources/quick/quick.webm
similarity index 100%
rename from src/test/resources/quick/quick.webm
rename to repository/src/test/resources/quick/quick.webm
diff --git a/src/test/resources/quick/quick.wma b/repository/src/test/resources/quick/quick.wma
similarity index 100%
rename from src/test/resources/quick/quick.wma
rename to repository/src/test/resources/quick/quick.wma
diff --git a/src/test/resources/quick/quick.wmv b/repository/src/test/resources/quick/quick.wmv
similarity index 100%
rename from src/test/resources/quick/quick.wmv
rename to repository/src/test/resources/quick/quick.wmv
diff --git a/src/test/resources/quick/quick.wpd b/repository/src/test/resources/quick/quick.wpd
similarity index 100%
rename from src/test/resources/quick/quick.wpd
rename to repository/src/test/resources/quick/quick.wpd
diff --git a/src/test/resources/quick/quick.xls b/repository/src/test/resources/quick/quick.xls
similarity index 100%
rename from src/test/resources/quick/quick.xls
rename to repository/src/test/resources/quick/quick.xls
diff --git a/src/test/resources/quick/quick.xlsx b/repository/src/test/resources/quick/quick.xlsx
similarity index 100%
rename from src/test/resources/quick/quick.xlsx
rename to repository/src/test/resources/quick/quick.xlsx
diff --git a/src/test/resources/quick/quick.xml b/repository/src/test/resources/quick/quick.xml
similarity index 100%
rename from src/test/resources/quick/quick.xml
rename to repository/src/test/resources/quick/quick.xml
diff --git a/src/test/resources/quick/quick.zip b/repository/src/test/resources/quick/quick.zip
similarity index 100%
rename from src/test/resources/quick/quick.zip
rename to repository/src/test/resources/quick/quick.zip
diff --git a/src/test/resources/quick/quick2003.mpp b/repository/src/test/resources/quick/quick2003.mpp
similarity index 100%
rename from src/test/resources/quick/quick2003.mpp
rename to repository/src/test/resources/quick/quick2003.mpp
diff --git a/src/test/resources/quick/quick2004.dwg b/repository/src/test/resources/quick/quick2004.dwg
similarity index 100%
rename from src/test/resources/quick/quick2004.dwg
rename to repository/src/test/resources/quick/quick2004.dwg
diff --git a/src/test/resources/quick/quick2007.dwg b/repository/src/test/resources/quick/quick2007.dwg
similarity index 100%
rename from src/test/resources/quick/quick2007.dwg
rename to repository/src/test/resources/quick/quick2007.dwg
diff --git a/src/test/resources/quick/quick2007.mpp b/repository/src/test/resources/quick/quick2007.mpp
similarity index 100%
rename from src/test/resources/quick/quick2007.mpp
rename to repository/src/test/resources/quick/quick2007.mpp
diff --git a/src/test/resources/quick/quick2009.pages b/repository/src/test/resources/quick/quick2009.pages
similarity index 100%
rename from src/test/resources/quick/quick2009.pages
rename to repository/src/test/resources/quick/quick2009.pages
diff --git a/src/test/resources/quick/quick2010.dwg b/repository/src/test/resources/quick/quick2010.dwg
similarity index 100%
rename from src/test/resources/quick/quick2010.dwg
rename to repository/src/test/resources/quick/quick2010.dwg
diff --git a/src/test/resources/quick/quick2010CustomProps.dwg b/repository/src/test/resources/quick/quick2010CustomProps.dwg
similarity index 100%
rename from src/test/resources/quick/quick2010CustomProps.dwg
rename to repository/src/test/resources/quick/quick2010CustomProps.dwg
diff --git a/src/test/resources/quick/quick6.doc b/repository/src/test/resources/quick/quick6.doc
similarity index 100%
rename from src/test/resources/quick/quick6.doc
rename to repository/src/test/resources/quick/quick6.doc
diff --git a/src/test/resources/quick/quick95.doc b/repository/src/test/resources/quick/quick95.doc
similarity index 100%
rename from src/test/resources/quick/quick95.doc
rename to repository/src/test/resources/quick/quick95.doc
diff --git a/src/test/resources/quick/quickCS3.ai b/repository/src/test/resources/quick/quickCS3.ai
similarity index 100%
rename from src/test/resources/quick/quickCS3.ai
rename to repository/src/test/resources/quick/quickCS3.ai
diff --git a/src/test/resources/quick/quickCS5.ai b/repository/src/test/resources/quick/quickCS5.ai
similarity index 100%
rename from src/test/resources/quick/quickCS5.ai
rename to repository/src/test/resources/quick/quickCS5.ai
diff --git a/src/test/resources/quick/quickConcept.dita b/repository/src/test/resources/quick/quickConcept.dita
similarity index 100%
rename from src/test/resources/quick/quickConcept.dita
rename to repository/src/test/resources/quick/quickConcept.dita
diff --git a/src/test/resources/quick/quickCorrupt.jpg b/repository/src/test/resources/quick/quickCorrupt.jpg
similarity index 100%
rename from src/test/resources/quick/quickCorrupt.jpg
rename to repository/src/test/resources/quick/quickCorrupt.jpg
diff --git a/src/test/resources/quick/quickCorrupt.pdf b/repository/src/test/resources/quick/quickCorrupt.pdf
similarity index 100%
rename from src/test/resources/quick/quickCorrupt.pdf
rename to repository/src/test/resources/quick/quickCorrupt.pdf
diff --git a/src/test/resources/quick/quickEmbeds.doc b/repository/src/test/resources/quick/quickEmbeds.doc
similarity index 100%
rename from src/test/resources/quick/quickEmbeds.doc
rename to repository/src/test/resources/quick/quickEmbeds.doc
diff --git a/src/test/resources/quick/quickEmbeds.docx b/repository/src/test/resources/quick/quickEmbeds.docx
similarity index 100%
rename from src/test/resources/quick/quickEmbeds.docx
rename to repository/src/test/resources/quick/quickEmbeds.docx
diff --git a/src/test/resources/quick/quickEmbeds.ppt b/repository/src/test/resources/quick/quickEmbeds.ppt
similarity index 100%
rename from src/test/resources/quick/quickEmbeds.ppt
rename to repository/src/test/resources/quick/quickEmbeds.ppt
diff --git a/src/test/resources/quick/quickEmbeds.pptx b/repository/src/test/resources/quick/quickEmbeds.pptx
similarity index 100%
rename from src/test/resources/quick/quickEmbeds.pptx
rename to repository/src/test/resources/quick/quickEmbeds.pptx
diff --git a/src/test/resources/quick/quickEmbeds.xls b/repository/src/test/resources/quick/quickEmbeds.xls
similarity index 100%
rename from src/test/resources/quick/quickEmbeds.xls
rename to repository/src/test/resources/quick/quickEmbeds.xls
diff --git a/src/test/resources/quick/quickEmbeds.xlsx b/repository/src/test/resources/quick/quickEmbeds.xlsx
similarity index 100%
rename from src/test/resources/quick/quickEmbeds.xlsx
rename to repository/src/test/resources/quick/quickEmbeds.xlsx
diff --git a/src/test/resources/quick/quickGEO.jpg b/repository/src/test/resources/quick/quickGEO.jpg
similarity index 100%
rename from src/test/resources/quick/quickGEO.jpg
rename to repository/src/test/resources/quick/quickGEO.jpg
diff --git a/src/test/resources/quick/quickIPTC.jpg b/repository/src/test/resources/quick/quickIPTC.jpg
similarity index 100%
rename from src/test/resources/quick/quickIPTC.jpg
rename to repository/src/test/resources/quick/quickIPTC.jpg
diff --git a/src/test/resources/quick/quickIPTC2.jpg b/repository/src/test/resources/quick/quickIPTC2.jpg
similarity index 100%
rename from src/test/resources/quick/quickIPTC2.jpg
rename to repository/src/test/resources/quick/quickIPTC2.jpg
diff --git a/src/test/resources/quick/quickIPTC3.jpg b/repository/src/test/resources/quick/quickIPTC3.jpg
similarity index 100%
rename from src/test/resources/quick/quickIPTC3.jpg
rename to repository/src/test/resources/quick/quickIPTC3.jpg
diff --git a/src/test/resources/quick/quickImg1.doc b/repository/src/test/resources/quick/quickImg1.doc
similarity index 100%
rename from src/test/resources/quick/quickImg1.doc
rename to repository/src/test/resources/quick/quickImg1.doc
diff --git a/src/test/resources/quick/quickImg1.docx b/repository/src/test/resources/quick/quickImg1.docx
similarity index 100%
rename from src/test/resources/quick/quickImg1.docx
rename to repository/src/test/resources/quick/quickImg1.docx
diff --git a/src/test/resources/quick/quickImg1.xls b/repository/src/test/resources/quick/quickImg1.xls
similarity index 100%
rename from src/test/resources/quick/quickImg1.xls
rename to repository/src/test/resources/quick/quickImg1.xls
diff --git a/src/test/resources/quick/quickImg1.xlsx b/repository/src/test/resources/quick/quickImg1.xlsx
similarity index 100%
rename from src/test/resources/quick/quickImg1.xlsx
rename to repository/src/test/resources/quick/quickImg1.xlsx
diff --git a/src/test/resources/quick/quickImg2.ppt b/repository/src/test/resources/quick/quickImg2.ppt
similarity index 100%
rename from src/test/resources/quick/quickImg2.ppt
rename to repository/src/test/resources/quick/quickImg2.ppt
diff --git a/src/test/resources/quick/quickImg2.pptx b/repository/src/test/resources/quick/quickImg2.pptx
similarity index 100%
rename from src/test/resources/quick/quickImg2.pptx
rename to repository/src/test/resources/quick/quickImg2.pptx
diff --git a/src/test/resources/quick/quickImg3.doc b/repository/src/test/resources/quick/quickImg3.doc
similarity index 100%
rename from src/test/resources/quick/quickImg3.doc
rename to repository/src/test/resources/quick/quickImg3.doc
diff --git a/src/test/resources/quick/quickImg3.docx b/repository/src/test/resources/quick/quickImg3.docx
similarity index 100%
rename from src/test/resources/quick/quickImg3.docx
rename to repository/src/test/resources/quick/quickImg3.docx
diff --git a/src/test/resources/quick/quickLotus.eml b/repository/src/test/resources/quick/quickLotus.eml
similarity index 100%
rename from src/test/resources/quick/quickLotus.eml
rename to repository/src/test/resources/quick/quickLotus.eml
diff --git a/src/test/resources/quick/quickMaskedHtml.jpeg b/repository/src/test/resources/quick/quickMaskedHtml.jpeg
similarity index 100%
rename from src/test/resources/quick/quickMaskedHtml.jpeg
rename to repository/src/test/resources/quick/quickMaskedHtml.jpeg
diff --git a/src/test/resources/quick/quickSizeSample.jpg b/repository/src/test/resources/quick/quickSizeSample.jpg
similarity index 100%
rename from src/test/resources/quick/quickSizeSample.jpg
rename to repository/src/test/resources/quick/quickSizeSample.jpg
diff --git a/src/test/resources/quick/readme.txt b/repository/src/test/resources/quick/readme.txt
similarity index 100%
rename from src/test/resources/quick/readme.txt
rename to repository/src/test/resources/quick/readme.txt
diff --git a/src/test/resources/quick/svn-book.pdf b/repository/src/test/resources/quick/svn-book.pdf
similarity index 100%
rename from src/test/resources/quick/svn-book.pdf
rename to repository/src/test/resources/quick/svn-book.pdf
diff --git a/src/test/resources/ratings/test-RatingServiceIntegrationTest-context.xml b/repository/src/test/resources/ratings/test-RatingServiceIntegrationTest-context.xml
similarity index 100%
rename from src/test/resources/ratings/test-RatingServiceIntegrationTest-context.xml
rename to repository/src/test/resources/ratings/test-RatingServiceIntegrationTest-context.xml
diff --git a/src/test/resources/ratings/testRatingsModel.xml b/repository/src/test/resources/ratings/testRatingsModel.xml
similarity index 100%
rename from src/test/resources/ratings/testRatingsModel.xml
rename to repository/src/test/resources/ratings/testRatingsModel.xml
diff --git a/src/test/resources/realms/alfresco-realm.json b/repository/src/test/resources/realms/alfresco-realm.json
similarity index 100%
rename from src/test/resources/realms/alfresco-realm.json
rename to repository/src/test/resources/realms/alfresco-realm.json
diff --git a/src/test/resources/schemacomp/xml_to_schema_test.xml b/repository/src/test/resources/schemacomp/xml_to_schema_test.xml
similarity index 100%
rename from src/test/resources/schemacomp/xml_to_schema_test.xml
rename to repository/src/test/resources/schemacomp/xml_to_schema_test.xml
diff --git a/src/test/resources/scriptexec/basic.sql b/repository/src/test/resources/scriptexec/basic.sql
similarity index 100%
rename from src/test/resources/scriptexec/basic.sql
rename to repository/src/test/resources/scriptexec/basic.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_a.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_a.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_a.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_a.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_b.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_b.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_b.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_b.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_c.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_c.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_c.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle/script_c.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/post_script.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/post_script.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/post_script.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/post_script.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_a.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_a.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_a.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_a.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_b.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_b.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_b.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/bundle2/script_b.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/custom-delimiter.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/custom-delimiter.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/custom-delimiter.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/custom-delimiter.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists/test-data1.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists/test-data1.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists/test-data1.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/delete-not-exists/test-data1.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/empty-delimiter.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/empty-delimiter.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/empty-delimiter.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/empty-delimiter.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/generic.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/generic.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/generic.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/generic.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/override.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/override.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/override.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/override.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/unterminated-custom-delimiter.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/unterminated-custom-delimiter.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/unterminated-custom-delimiter.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/unterminated-custom-delimiter.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/wrong-usage-delimiter.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/wrong-usage-delimiter.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/wrong-usage-delimiter.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.Dialect/wrong-usage-delimiter.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/override.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/override.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/override.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/override.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/specific.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/specific.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/specific.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/specific.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/override.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/override.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/override.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/override.sql
diff --git a/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/specific.sql b/repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/specific.sql
similarity index 100%
rename from src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/specific.sql
rename to repository/src/test/resources/scriptexec/org.alfresco.repo.domain.dialect.PostgreSQLDialect/specific.sql
diff --git a/src/test/resources/scriptexec/script-exec-test.xml b/repository/src/test/resources/scriptexec/script-exec-test.xml
similarity index 100%
rename from src/test/resources/scriptexec/script-exec-test.xml
rename to repository/src/test/resources/scriptexec/script-exec-test.xml
diff --git a/src/test/resources/session-size-test-context.xml b/repository/src/test/resources/session-size-test-context.xml
similarity index 100%
rename from src/test/resources/session-size-test-context.xml
rename to repository/src/test/resources/session-size-test-context.xml
diff --git a/src/test/resources/sites/test-TemporarySitesTest-context.xml b/repository/src/test/resources/sites/test-TemporarySitesTest-context.xml
similarity index 100%
rename from src/test/resources/sites/test-TemporarySitesTest-context.xml
rename to repository/src/test/resources/sites/test-TemporarySitesTest-context.xml
diff --git a/src/test/resources/sites/testSiteModel.xml b/repository/src/test/resources/sites/testSiteModel.xml
similarity index 100%
rename from src/test/resources/sites/testSiteModel.xml
rename to repository/src/test/resources/sites/testSiteModel.xml
diff --git a/src/test/resources/solr/solr-test-model.xml b/repository/src/test/resources/solr/solr-test-model.xml
similarity index 100%
rename from src/test/resources/solr/solr-test-model.xml
rename to repository/src/test/resources/solr/solr-test-model.xml
diff --git a/src/test/resources/subsystem-test-context.xml b/repository/src/test/resources/subsystem-test-context.xml
similarity index 100%
rename from src/test/resources/subsystem-test-context.xml
rename to repository/src/test/resources/subsystem-test-context.xml
diff --git a/src/test/resources/sync-test-context.xml b/repository/src/test/resources/sync-test-context.xml
similarity index 100%
rename from src/test/resources/sync-test-context.xml
rename to repository/src/test/resources/sync-test-context.xml
diff --git a/src/test/resources/tenant/exampleModel.xml b/repository/src/test/resources/tenant/exampleModel.xml
similarity index 100%
rename from src/test/resources/tenant/exampleModel.xml
rename to repository/src/test/resources/tenant/exampleModel.xml
diff --git a/src/test/resources/tenant/mt-admin-context.xml b/repository/src/test/resources/tenant/mt-admin-context.xml
similarity index 100%
rename from src/test/resources/tenant/mt-admin-context.xml
rename to repository/src/test/resources/tenant/mt-admin-context.xml
diff --git a/src/test/resources/tenant/mt-contentstore-context.xml b/repository/src/test/resources/tenant/mt-contentstore-context.xml
similarity index 100%
rename from src/test/resources/tenant/mt-contentstore-context.xml
rename to repository/src/test/resources/tenant/mt-contentstore-context.xml
diff --git a/src/test/resources/tenant/mt-context.xml b/repository/src/test/resources/tenant/mt-context.xml
similarity index 100%
rename from src/test/resources/tenant/mt-context.xml
rename to repository/src/test/resources/tenant/mt-context.xml
diff --git a/src/test/resources/tenant/web-client-config-custom.xml b/repository/src/test/resources/tenant/web-client-config-custom.xml
similarity index 100%
rename from src/test/resources/tenant/web-client-config-custom.xml
rename to repository/src/test/resources/tenant/web-client-config-custom.xml
diff --git a/src/test/resources/tenant/webclient.properties b/repository/src/test/resources/tenant/webclient.properties
similarity index 100%
rename from src/test/resources/tenant/webclient.properties
rename to repository/src/test/resources/tenant/webclient.properties
diff --git a/src/test/resources/test-cmisinteger_modell-context.xml b/repository/src/test/resources/test-cmisinteger_modell-context.xml
similarity index 100%
rename from src/test/resources/test-cmisinteger_modell-context.xml
rename to repository/src/test/resources/test-cmisinteger_modell-context.xml
diff --git a/src/test/resources/test-database-context.xml b/repository/src/test/resources/test-database-context.xml
similarity index 100%
rename from src/test/resources/test-database-context.xml
rename to repository/src/test/resources/test-database-context.xml
diff --git a/src/test/resources/test-ftp-auth-context.xml b/repository/src/test/resources/test-ftp-auth-context.xml
similarity index 100%
rename from src/test/resources/test-ftp-auth-context.xml
rename to repository/src/test/resources/test-ftp-auth-context.xml
diff --git a/src/test/resources/test-messaging-context.xml b/repository/src/test/resources/test-messaging-context.xml
similarity index 100%
rename from src/test/resources/test-messaging-context.xml
rename to repository/src/test/resources/test-messaging-context.xml
diff --git a/src/test/resources/test-messaging.properties b/repository/src/test/resources/test-messaging.properties
similarity index 100%
rename from src/test/resources/test-messaging.properties
rename to repository/src/test/resources/test-messaging.properties
diff --git a/src/test/resources/test-nodeLocatorServiceImpl-context.xml b/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
similarity index 100%
rename from src/test/resources/test-nodeLocatorServiceImpl-context.xml
rename to repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
diff --git a/src/test/resources/test/alfresco/TestImageFile.png b/repository/src/test/resources/test/alfresco/TestImageFile.png
similarity index 100%
rename from src/test/resources/test/alfresco/TestImageFile.png
rename to repository/src/test/resources/test/alfresco/TestImageFile.png
diff --git a/src/test/resources/test/alfresco/TestPresentation.pptx b/repository/src/test/resources/test/alfresco/TestPresentation.pptx
similarity index 100%
rename from src/test/resources/test/alfresco/TestPresentation.pptx
rename to repository/src/test/resources/test/alfresco/TestPresentation.pptx
diff --git a/src/test/resources/test/alfresco/TestPresentation2.ppt b/repository/src/test/resources/test/alfresco/TestPresentation2.ppt
similarity index 100%
rename from src/test/resources/test/alfresco/TestPresentation2.ppt
rename to repository/src/test/resources/test/alfresco/TestPresentation2.ppt
diff --git a/src/test/resources/test/alfresco/TestPresentation3.odp b/repository/src/test/resources/test/alfresco/TestPresentation3.odp
similarity index 100%
rename from src/test/resources/test/alfresco/TestPresentation3.odp
rename to repository/src/test/resources/test/alfresco/TestPresentation3.odp
diff --git a/src/test/resources/test/alfresco/TestPresentation4.pdf b/repository/src/test/resources/test/alfresco/TestPresentation4.pdf
similarity index 100%
rename from src/test/resources/test/alfresco/TestPresentation4.pdf
rename to repository/src/test/resources/test/alfresco/TestPresentation4.pdf
diff --git a/src/test/resources/test/alfresco/TestVideoFile.MP4 b/repository/src/test/resources/test/alfresco/TestVideoFile.MP4
similarity index 100%
rename from src/test/resources/test/alfresco/TestVideoFile.MP4
rename to repository/src/test/resources/test/alfresco/TestVideoFile.MP4
diff --git a/src/test/resources/test/alfresco/fake-context/README.txt b/repository/src/test/resources/test/alfresco/fake-context/README.txt
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/README.txt
rename to repository/src/test/resources/test/alfresco/fake-context/README.txt
diff --git a/src/test/resources/test/alfresco/fake-context/application-context.xml b/repository/src/test/resources/test/alfresco/fake-context/application-context.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/application-context.xml
rename to repository/src/test/resources/test/alfresco/fake-context/application-context.xml
diff --git a/src/test/resources/test/alfresco/fake-context/context-a.xml b/repository/src/test/resources/test/alfresco/fake-context/context-a.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/context-a.xml
rename to repository/src/test/resources/test/alfresco/fake-context/context-a.xml
diff --git a/src/test/resources/test/alfresco/fake-context/context-b.xml b/repository/src/test/resources/test/alfresco/fake-context/context-b.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/context-b.xml
rename to repository/src/test/resources/test/alfresco/fake-context/context-b.xml
diff --git a/src/test/resources/test/alfresco/fake-context/context-c.xml b/repository/src/test/resources/test/alfresco/fake-context/context-c.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/context-c.xml
rename to repository/src/test/resources/test/alfresco/fake-context/context-c.xml
diff --git a/src/test/resources/test/alfresco/fake-context/nested.xml b/repository/src/test/resources/test/alfresco/fake-context/nested.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/nested.xml
rename to repository/src/test/resources/test/alfresco/fake-context/nested.xml
diff --git a/src/test/resources/test/alfresco/fake-context/override-1.xml b/repository/src/test/resources/test/alfresco/fake-context/override-1.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/override-1.xml
rename to repository/src/test/resources/test/alfresco/fake-context/override-1.xml
diff --git a/src/test/resources/test/alfresco/fake-context/override-2.xml b/repository/src/test/resources/test/alfresco/fake-context/override-2.xml
similarity index 100%
rename from src/test/resources/test/alfresco/fake-context/override-2.xml
rename to repository/src/test/resources/test/alfresco/fake-context/override-2.xml
diff --git a/src/test/resources/test/alfresco/model/testSubscriptionModel.xml b/repository/src/test/resources/test/alfresco/model/testSubscriptionModel.xml
similarity index 100%
rename from src/test/resources/test/alfresco/model/testSubscriptionModel.xml
rename to repository/src/test/resources/test/alfresco/model/testSubscriptionModel.xml
diff --git a/src/test/resources/test/alfresco/test-context.xml b/repository/src/test/resources/test/alfresco/test-context.xml
similarity index 100%
rename from src/test/resources/test/alfresco/test-context.xml
rename to repository/src/test/resources/test/alfresco/test-context.xml
diff --git a/src/test/resources/test/alfresco/test-database-context.xml b/repository/src/test/resources/test/alfresco/test-database-context.xml
similarity index 100%
rename from src/test/resources/test/alfresco/test-database-context.xml
rename to repository/src/test/resources/test/alfresco/test-database-context.xml
diff --git a/src/test/resources/test/alfresco/test-renditions-context.xml b/repository/src/test/resources/test/alfresco/test-renditions-context.xml
similarity index 100%
rename from src/test/resources/test/alfresco/test-renditions-context.xml
rename to repository/src/test/resources/test/alfresco/test-renditions-context.xml
diff --git a/src/test/resources/test/alfresco/test-subscriptions-context.xml b/repository/src/test/resources/test/alfresco/test-subscriptions-context.xml
similarity index 100%
rename from src/test/resources/test/alfresco/test-subscriptions-context.xml
rename to repository/src/test/resources/test/alfresco/test-subscriptions-context.xml
diff --git a/src/test/resources/testQueryRegister.xml b/repository/src/test/resources/testQueryRegister.xml
similarity index 100%
rename from src/test/resources/testQueryRegister.xml
rename to repository/src/test/resources/testQueryRegister.xml
diff --git a/src/test/resources/testRoutes.xml b/repository/src/test/resources/testRoutes.xml
similarity index 100%
rename from src/test/resources/testRoutes.xml
rename to repository/src/test/resources/testRoutes.xml
diff --git a/src/test/resources/testcmis-model-context.xml b/repository/src/test/resources/testcmis-model-context.xml
similarity index 100%
rename from src/test/resources/testcmis-model-context.xml
rename to repository/src/test/resources/testcmis-model-context.xml
diff --git a/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V2.2.4.bin b/repository/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V2.2.4.bin
similarity index 100%
rename from src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V2.2.4.bin
rename to repository/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V2.2.4.bin
diff --git a/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0-dev.bin b/repository/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0-dev.bin
similarity index 100%
rename from src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0-dev.bin
rename to repository/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0-dev.bin
diff --git a/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0.bin b/repository/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0.bin
similarity index 100%
rename from src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0.bin
rename to repository/src/test/resources/version-history/VersionHistoryImplTest-testSerialize-V3.1.0.bin
diff --git a/src/test/resources/virtualization-test-context.xml b/repository/src/test/resources/virtualization-test-context.xml
similarity index 100%
rename from src/test/resources/virtualization-test-context.xml
rename to repository/src/test/resources/virtualization-test-context.xml
diff --git a/src/test/resources/web_app.zip b/repository/src/test/resources/web_app.zip
similarity index 100%
rename from src/test/resources/web_app.zip
rename to repository/src/test/resources/web_app.zip
diff --git a/src/test/resources/xml-metadata/alfresco-model-mappings.properties b/repository/src/test/resources/xml-metadata/alfresco-model-mappings.properties
similarity index 100%
rename from src/test/resources/xml-metadata/alfresco-model-mappings.properties
rename to repository/src/test/resources/xml-metadata/alfresco-model-mappings.properties
diff --git a/src/test/resources/xml-metadata/alfresco-model-sample.xml b/repository/src/test/resources/xml-metadata/alfresco-model-sample.xml
similarity index 100%
rename from src/test/resources/xml-metadata/alfresco-model-sample.xml
rename to repository/src/test/resources/xml-metadata/alfresco-model-sample.xml
diff --git a/src/test/resources/xml-metadata/alfresco-model-xpath-mappings.properties b/repository/src/test/resources/xml-metadata/alfresco-model-xpath-mappings.properties
similarity index 100%
rename from src/test/resources/xml-metadata/alfresco-model-xpath-mappings.properties
rename to repository/src/test/resources/xml-metadata/alfresco-model-xpath-mappings.properties
diff --git a/src/test/resources/xml-metadata/dita-concept-quick-mappings.properties b/repository/src/test/resources/xml-metadata/dita-concept-quick-mappings.properties
similarity index 100%
rename from src/test/resources/xml-metadata/dita-concept-quick-mappings.properties
rename to repository/src/test/resources/xml-metadata/dita-concept-quick-mappings.properties
diff --git a/src/test/resources/xml-metadata/dita-concept-quick-xpath-mappings.properties b/repository/src/test/resources/xml-metadata/dita-concept-quick-xpath-mappings.properties
similarity index 100%
rename from src/test/resources/xml-metadata/dita-concept-quick-xpath-mappings.properties
rename to repository/src/test/resources/xml-metadata/dita-concept-quick-xpath-mappings.properties
diff --git a/src/test/resources/xml-metadata/dita-concept-quick.xml b/repository/src/test/resources/xml-metadata/dita-concept-quick.xml
similarity index 100%
rename from src/test/resources/xml-metadata/dita-concept-quick.xml
rename to repository/src/test/resources/xml-metadata/dita-concept-quick.xml
diff --git a/src/test/resources/xml-metadata/eclipse-project-mappings.properties b/repository/src/test/resources/xml-metadata/eclipse-project-mappings.properties
similarity index 100%
rename from src/test/resources/xml-metadata/eclipse-project-mappings.properties
rename to repository/src/test/resources/xml-metadata/eclipse-project-mappings.properties
diff --git a/src/test/resources/xml-metadata/eclipse-project-sample.xml b/repository/src/test/resources/xml-metadata/eclipse-project-sample.xml
similarity index 100%
rename from src/test/resources/xml-metadata/eclipse-project-sample.xml
rename to repository/src/test/resources/xml-metadata/eclipse-project-sample.xml
diff --git a/src/test/resources/xml-metadata/eclipse-project-xpath-mappings.properties b/repository/src/test/resources/xml-metadata/eclipse-project-xpath-mappings.properties
similarity index 100%
rename from src/test/resources/xml-metadata/eclipse-project-xpath-mappings.properties
rename to repository/src/test/resources/xml-metadata/eclipse-project-xpath-mappings.properties
diff --git a/src/test/resources/xml-metadata/empty-sample.xml b/repository/src/test/resources/xml-metadata/empty-sample.xml
similarity index 100%
rename from src/test/resources/xml-metadata/empty-sample.xml
rename to repository/src/test/resources/xml-metadata/empty-sample.xml
diff --git a/src/test/resources/xml-metadata/malformed-sample.xml b/repository/src/test/resources/xml-metadata/malformed-sample.xml
similarity index 100%
rename from src/test/resources/xml-metadata/malformed-sample.xml
rename to repository/src/test/resources/xml-metadata/malformed-sample.xml
diff --git a/src/test/resources/xml-metadata/xml-metadata-test-context.xml b/repository/src/test/resources/xml-metadata/xml-metadata-test-context.xml
similarity index 100%
rename from src/test/resources/xml-metadata/xml-metadata-test-context.xml
rename to repository/src/test/resources/xml-metadata/xml-metadata-test-context.xml