diff --git a/.gitattributes b/core/.gitattributes similarity index 100% rename from .gitattributes rename to core/.gitattributes diff --git a/.gitbugtraq b/core/.gitbugtraq similarity index 100% rename from .gitbugtraq rename to core/.gitbugtraq diff --git a/.gitignore b/core/.gitignore similarity index 100% rename from .gitignore rename to core/.gitignore diff --git a/.travis.settings.xml b/core/.travis.settings.xml similarity index 100% rename from .travis.settings.xml rename to core/.travis.settings.xml diff --git a/.travis.yml b/core/.travis.yml similarity index 100% rename from .travis.yml rename to core/.travis.yml diff --git a/.whitesource b/core/.whitesource similarity index 100% rename from .whitesource rename to core/.whitesource diff --git a/.wss-unified-agent.config b/core/.wss-unified-agent.config similarity index 100% rename from .wss-unified-agent.config rename to core/.wss-unified-agent.config diff --git a/CONTRIBUTING.md b/core/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to core/CONTRIBUTING.md diff --git a/LICENSE.txt b/core/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to core/LICENSE.txt diff --git a/README.md b/core/README.md similarity index 100% rename from README.md rename to core/README.md diff --git a/pom.xml b/core/pom.xml similarity index 100% rename from pom.xml rename to core/pom.xml diff --git a/src/main/java/org/alfresco/api/AlfrescoPublicApi.java b/core/src/main/java/org/alfresco/api/AlfrescoPublicApi.java similarity index 100% rename from src/main/java/org/alfresco/api/AlfrescoPublicApi.java rename to core/src/main/java/org/alfresco/api/AlfrescoPublicApi.java diff --git a/src/main/java/org/alfresco/config/AlfrescoPropertiesPersister.java b/core/src/main/java/org/alfresco/config/AlfrescoPropertiesPersister.java similarity index 100% rename from src/main/java/org/alfresco/config/AlfrescoPropertiesPersister.java rename to core/src/main/java/org/alfresco/config/AlfrescoPropertiesPersister.java diff --git a/src/main/java/org/alfresco/config/JndiObjectFactoryBean.java b/core/src/main/java/org/alfresco/config/JndiObjectFactoryBean.java similarity index 100% rename from src/main/java/org/alfresco/config/JndiObjectFactoryBean.java rename to core/src/main/java/org/alfresco/config/JndiObjectFactoryBean.java diff --git a/src/main/java/org/alfresco/config/JndiPropertiesFactoryBean.java b/core/src/main/java/org/alfresco/config/JndiPropertiesFactoryBean.java similarity index 100% rename from src/main/java/org/alfresco/config/JndiPropertiesFactoryBean.java rename to core/src/main/java/org/alfresco/config/JndiPropertiesFactoryBean.java diff --git a/src/main/java/org/alfresco/config/JndiPropertyPlaceholderConfigurer.java b/core/src/main/java/org/alfresco/config/JndiPropertyPlaceholderConfigurer.java similarity index 100% rename from src/main/java/org/alfresco/config/JndiPropertyPlaceholderConfigurer.java rename to core/src/main/java/org/alfresco/config/JndiPropertyPlaceholderConfigurer.java diff --git a/src/main/java/org/alfresco/config/NonBlockingLazyInitTargetSource.java b/core/src/main/java/org/alfresco/config/NonBlockingLazyInitTargetSource.java similarity index 100% rename from src/main/java/org/alfresco/config/NonBlockingLazyInitTargetSource.java rename to core/src/main/java/org/alfresco/config/NonBlockingLazyInitTargetSource.java diff --git a/src/main/java/org/alfresco/config/PathMatchingHelper.java b/core/src/main/java/org/alfresco/config/PathMatchingHelper.java similarity index 100% rename from src/main/java/org/alfresco/config/PathMatchingHelper.java rename to core/src/main/java/org/alfresco/config/PathMatchingHelper.java diff --git a/src/main/java/org/alfresco/config/SystemPropertiesFactoryBean.java b/core/src/main/java/org/alfresco/config/SystemPropertiesFactoryBean.java similarity index 100% rename from src/main/java/org/alfresco/config/SystemPropertiesFactoryBean.java rename to core/src/main/java/org/alfresco/config/SystemPropertiesFactoryBean.java diff --git a/src/main/java/org/alfresco/config/SystemPropertiesSetterBean.java b/core/src/main/java/org/alfresco/config/SystemPropertiesSetterBean.java similarity index 100% rename from src/main/java/org/alfresco/config/SystemPropertiesSetterBean.java rename to core/src/main/java/org/alfresco/config/SystemPropertiesSetterBean.java diff --git a/src/main/java/org/alfresco/encoding/AbstractCharactersetFinder.java b/core/src/main/java/org/alfresco/encoding/AbstractCharactersetFinder.java similarity index 100% rename from src/main/java/org/alfresco/encoding/AbstractCharactersetFinder.java rename to core/src/main/java/org/alfresco/encoding/AbstractCharactersetFinder.java diff --git a/src/main/java/org/alfresco/encoding/BomCharactersetFinder.java b/core/src/main/java/org/alfresco/encoding/BomCharactersetFinder.java similarity index 100% rename from src/main/java/org/alfresco/encoding/BomCharactersetFinder.java rename to core/src/main/java/org/alfresco/encoding/BomCharactersetFinder.java diff --git a/src/main/java/org/alfresco/encoding/CharactersetFinder.java b/core/src/main/java/org/alfresco/encoding/CharactersetFinder.java similarity index 100% rename from src/main/java/org/alfresco/encoding/CharactersetFinder.java rename to core/src/main/java/org/alfresco/encoding/CharactersetFinder.java diff --git a/src/main/java/org/alfresco/encoding/GuessEncodingCharsetFinder.java b/core/src/main/java/org/alfresco/encoding/GuessEncodingCharsetFinder.java similarity index 100% rename from src/main/java/org/alfresco/encoding/GuessEncodingCharsetFinder.java rename to core/src/main/java/org/alfresco/encoding/GuessEncodingCharsetFinder.java diff --git a/src/main/java/org/alfresco/encryption/AbstractEncryptor.java b/core/src/main/java/org/alfresco/encryption/AbstractEncryptor.java similarity index 100% rename from src/main/java/org/alfresco/encryption/AbstractEncryptor.java rename to core/src/main/java/org/alfresco/encryption/AbstractEncryptor.java diff --git a/src/main/java/org/alfresco/encryption/AbstractKeyProvider.java b/core/src/main/java/org/alfresco/encryption/AbstractKeyProvider.java similarity index 100% rename from src/main/java/org/alfresco/encryption/AbstractKeyProvider.java rename to core/src/main/java/org/alfresco/encryption/AbstractKeyProvider.java diff --git a/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java b/core/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java similarity index 100% rename from src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java rename to core/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java diff --git a/src/main/java/org/alfresco/encryption/AlfrescoKeyStoreImpl.java b/core/src/main/java/org/alfresco/encryption/AlfrescoKeyStoreImpl.java similarity index 100% rename from src/main/java/org/alfresco/encryption/AlfrescoKeyStoreImpl.java rename to core/src/main/java/org/alfresco/encryption/AlfrescoKeyStoreImpl.java diff --git a/src/main/java/org/alfresco/encryption/CachedKey.java b/core/src/main/java/org/alfresco/encryption/CachedKey.java similarity index 100% rename from src/main/java/org/alfresco/encryption/CachedKey.java rename to core/src/main/java/org/alfresco/encryption/CachedKey.java diff --git a/src/main/java/org/alfresco/encryption/DecryptingInputStream.java b/core/src/main/java/org/alfresco/encryption/DecryptingInputStream.java similarity index 100% rename from src/main/java/org/alfresco/encryption/DecryptingInputStream.java rename to core/src/main/java/org/alfresco/encryption/DecryptingInputStream.java diff --git a/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java b/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java similarity index 100% rename from src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java rename to core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java diff --git a/src/main/java/org/alfresco/encryption/DefaultEncryptor.java b/core/src/main/java/org/alfresco/encryption/DefaultEncryptor.java similarity index 100% rename from src/main/java/org/alfresco/encryption/DefaultEncryptor.java rename to core/src/main/java/org/alfresco/encryption/DefaultEncryptor.java diff --git a/src/main/java/org/alfresco/encryption/DefaultFallbackEncryptor.java b/core/src/main/java/org/alfresco/encryption/DefaultFallbackEncryptor.java similarity index 100% rename from src/main/java/org/alfresco/encryption/DefaultFallbackEncryptor.java rename to core/src/main/java/org/alfresco/encryption/DefaultFallbackEncryptor.java diff --git a/src/main/java/org/alfresco/encryption/EncryptingOutputStream.java b/core/src/main/java/org/alfresco/encryption/EncryptingOutputStream.java similarity index 100% rename from src/main/java/org/alfresco/encryption/EncryptingOutputStream.java rename to core/src/main/java/org/alfresco/encryption/EncryptingOutputStream.java diff --git a/src/main/java/org/alfresco/encryption/EncryptionKeysRegistry.java b/core/src/main/java/org/alfresco/encryption/EncryptionKeysRegistry.java similarity index 100% rename from src/main/java/org/alfresco/encryption/EncryptionKeysRegistry.java rename to core/src/main/java/org/alfresco/encryption/EncryptionKeysRegistry.java diff --git a/src/main/java/org/alfresco/encryption/EncryptionUtils.java b/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java similarity index 100% rename from src/main/java/org/alfresco/encryption/EncryptionUtils.java rename to core/src/main/java/org/alfresco/encryption/EncryptionUtils.java diff --git a/src/main/java/org/alfresco/encryption/Encryptor.java b/core/src/main/java/org/alfresco/encryption/Encryptor.java similarity index 100% rename from src/main/java/org/alfresco/encryption/Encryptor.java rename to core/src/main/java/org/alfresco/encryption/Encryptor.java diff --git a/src/main/java/org/alfresco/encryption/FallbackEncryptor.java b/core/src/main/java/org/alfresco/encryption/FallbackEncryptor.java similarity index 100% rename from src/main/java/org/alfresco/encryption/FallbackEncryptor.java rename to core/src/main/java/org/alfresco/encryption/FallbackEncryptor.java diff --git a/src/main/java/org/alfresco/encryption/GenerateSecretKey.java b/core/src/main/java/org/alfresco/encryption/GenerateSecretKey.java similarity index 100% rename from src/main/java/org/alfresco/encryption/GenerateSecretKey.java rename to core/src/main/java/org/alfresco/encryption/GenerateSecretKey.java diff --git a/src/main/java/org/alfresco/encryption/InvalidKeystoreException.java b/core/src/main/java/org/alfresco/encryption/InvalidKeystoreException.java similarity index 100% rename from src/main/java/org/alfresco/encryption/InvalidKeystoreException.java rename to core/src/main/java/org/alfresco/encryption/InvalidKeystoreException.java diff --git a/src/main/java/org/alfresco/encryption/KeyMap.java b/core/src/main/java/org/alfresco/encryption/KeyMap.java similarity index 100% rename from src/main/java/org/alfresco/encryption/KeyMap.java rename to core/src/main/java/org/alfresco/encryption/KeyMap.java diff --git a/src/main/java/org/alfresco/encryption/KeyProvider.java b/core/src/main/java/org/alfresco/encryption/KeyProvider.java similarity index 100% rename from src/main/java/org/alfresco/encryption/KeyProvider.java rename to core/src/main/java/org/alfresco/encryption/KeyProvider.java diff --git a/src/main/java/org/alfresco/encryption/KeyResourceLoader.java b/core/src/main/java/org/alfresco/encryption/KeyResourceLoader.java similarity index 100% rename from src/main/java/org/alfresco/encryption/KeyResourceLoader.java rename to core/src/main/java/org/alfresco/encryption/KeyResourceLoader.java diff --git a/src/main/java/org/alfresco/encryption/KeyStoreParameters.java b/core/src/main/java/org/alfresco/encryption/KeyStoreParameters.java similarity index 100% rename from src/main/java/org/alfresco/encryption/KeyStoreParameters.java rename to core/src/main/java/org/alfresco/encryption/KeyStoreParameters.java diff --git a/src/main/java/org/alfresco/encryption/KeysReport.java b/core/src/main/java/org/alfresco/encryption/KeysReport.java similarity index 100% rename from src/main/java/org/alfresco/encryption/KeysReport.java rename to core/src/main/java/org/alfresco/encryption/KeysReport.java diff --git a/src/main/java/org/alfresco/encryption/KeystoreKeyProvider.java b/core/src/main/java/org/alfresco/encryption/KeystoreKeyProvider.java similarity index 100% rename from src/main/java/org/alfresco/encryption/KeystoreKeyProvider.java rename to core/src/main/java/org/alfresco/encryption/KeystoreKeyProvider.java diff --git a/src/main/java/org/alfresco/encryption/MACUtils.java b/core/src/main/java/org/alfresco/encryption/MACUtils.java similarity index 100% rename from src/main/java/org/alfresco/encryption/MACUtils.java rename to core/src/main/java/org/alfresco/encryption/MACUtils.java diff --git a/src/main/java/org/alfresco/encryption/MissingKeyException.java b/core/src/main/java/org/alfresco/encryption/MissingKeyException.java similarity index 100% rename from src/main/java/org/alfresco/encryption/MissingKeyException.java rename to core/src/main/java/org/alfresco/encryption/MissingKeyException.java diff --git a/src/main/java/org/alfresco/encryption/SpringKeyResourceLoader.java b/core/src/main/java/org/alfresco/encryption/SpringKeyResourceLoader.java similarity index 100% rename from src/main/java/org/alfresco/encryption/SpringKeyResourceLoader.java rename to core/src/main/java/org/alfresco/encryption/SpringKeyResourceLoader.java diff --git a/src/main/java/org/alfresco/encryption/ssl/AuthSSLInitializationError.java b/core/src/main/java/org/alfresco/encryption/ssl/AuthSSLInitializationError.java similarity index 100% rename from src/main/java/org/alfresco/encryption/ssl/AuthSSLInitializationError.java rename to core/src/main/java/org/alfresco/encryption/ssl/AuthSSLInitializationError.java diff --git a/src/main/java/org/alfresco/encryption/ssl/AuthSSLProtocolSocketFactory.java b/core/src/main/java/org/alfresco/encryption/ssl/AuthSSLProtocolSocketFactory.java similarity index 100% rename from src/main/java/org/alfresco/encryption/ssl/AuthSSLProtocolSocketFactory.java rename to core/src/main/java/org/alfresco/encryption/ssl/AuthSSLProtocolSocketFactory.java diff --git a/src/main/java/org/alfresco/encryption/ssl/SSLEncryptionParameters.java b/core/src/main/java/org/alfresco/encryption/ssl/SSLEncryptionParameters.java similarity index 100% rename from src/main/java/org/alfresco/encryption/ssl/SSLEncryptionParameters.java rename to core/src/main/java/org/alfresco/encryption/ssl/SSLEncryptionParameters.java diff --git a/src/main/java/org/alfresco/error/AlfrescoRuntimeException.java b/core/src/main/java/org/alfresco/error/AlfrescoRuntimeException.java similarity index 100% rename from src/main/java/org/alfresco/error/AlfrescoRuntimeException.java rename to core/src/main/java/org/alfresco/error/AlfrescoRuntimeException.java diff --git a/src/main/java/org/alfresco/error/ExceptionStackUtil.java b/core/src/main/java/org/alfresco/error/ExceptionStackUtil.java similarity index 100% rename from src/main/java/org/alfresco/error/ExceptionStackUtil.java rename to core/src/main/java/org/alfresco/error/ExceptionStackUtil.java diff --git a/src/main/java/org/alfresco/error/StackTraceUtil.java b/core/src/main/java/org/alfresco/error/StackTraceUtil.java similarity index 100% rename from src/main/java/org/alfresco/error/StackTraceUtil.java rename to core/src/main/java/org/alfresco/error/StackTraceUtil.java diff --git a/src/main/java/org/alfresco/httpclient/AbstractHttpClient.java b/core/src/main/java/org/alfresco/httpclient/AbstractHttpClient.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/AbstractHttpClient.java rename to core/src/main/java/org/alfresco/httpclient/AbstractHttpClient.java diff --git a/src/main/java/org/alfresco/httpclient/AlfrescoHttpClient.java b/core/src/main/java/org/alfresco/httpclient/AlfrescoHttpClient.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/AlfrescoHttpClient.java rename to core/src/main/java/org/alfresco/httpclient/AlfrescoHttpClient.java diff --git a/src/main/java/org/alfresco/httpclient/AuthenticationException.java b/core/src/main/java/org/alfresco/httpclient/AuthenticationException.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/AuthenticationException.java rename to core/src/main/java/org/alfresco/httpclient/AuthenticationException.java diff --git a/src/main/java/org/alfresco/httpclient/GetRequest.java b/core/src/main/java/org/alfresco/httpclient/GetRequest.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/GetRequest.java rename to core/src/main/java/org/alfresco/httpclient/GetRequest.java diff --git a/src/main/java/org/alfresco/httpclient/HeadRequest.java b/core/src/main/java/org/alfresco/httpclient/HeadRequest.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/HeadRequest.java rename to core/src/main/java/org/alfresco/httpclient/HeadRequest.java diff --git a/src/main/java/org/alfresco/httpclient/HttpClientFactory.java b/core/src/main/java/org/alfresco/httpclient/HttpClientFactory.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/HttpClientFactory.java rename to core/src/main/java/org/alfresco/httpclient/HttpClientFactory.java diff --git a/src/main/java/org/alfresco/httpclient/HttpMethodResponse.java b/core/src/main/java/org/alfresco/httpclient/HttpMethodResponse.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/HttpMethodResponse.java rename to core/src/main/java/org/alfresco/httpclient/HttpMethodResponse.java diff --git a/src/main/java/org/alfresco/httpclient/MD5EncryptionParameters.java b/core/src/main/java/org/alfresco/httpclient/MD5EncryptionParameters.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/MD5EncryptionParameters.java rename to core/src/main/java/org/alfresco/httpclient/MD5EncryptionParameters.java diff --git a/src/main/java/org/alfresco/httpclient/PostRequest.java b/core/src/main/java/org/alfresco/httpclient/PostRequest.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/PostRequest.java rename to core/src/main/java/org/alfresco/httpclient/PostRequest.java diff --git a/src/main/java/org/alfresco/httpclient/Request.java b/core/src/main/java/org/alfresco/httpclient/Request.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/Request.java rename to core/src/main/java/org/alfresco/httpclient/Request.java diff --git a/src/main/java/org/alfresco/httpclient/Response.java b/core/src/main/java/org/alfresco/httpclient/Response.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/Response.java rename to core/src/main/java/org/alfresco/httpclient/Response.java diff --git a/src/main/java/org/alfresco/httpclient/SecureHttpClient.java b/core/src/main/java/org/alfresco/httpclient/SecureHttpClient.java similarity index 100% rename from src/main/java/org/alfresco/httpclient/SecureHttpClient.java rename to core/src/main/java/org/alfresco/httpclient/SecureHttpClient.java diff --git a/src/main/java/org/alfresco/i18n/ResourceBundleBootstrapComponent.java b/core/src/main/java/org/alfresco/i18n/ResourceBundleBootstrapComponent.java similarity index 100% rename from src/main/java/org/alfresco/i18n/ResourceBundleBootstrapComponent.java rename to core/src/main/java/org/alfresco/i18n/ResourceBundleBootstrapComponent.java diff --git a/src/main/java/org/alfresco/processor/Processor.java b/core/src/main/java/org/alfresco/processor/Processor.java similarity index 100% rename from src/main/java/org/alfresco/processor/Processor.java rename to core/src/main/java/org/alfresco/processor/Processor.java diff --git a/src/main/java/org/alfresco/processor/ProcessorExtension.java b/core/src/main/java/org/alfresco/processor/ProcessorExtension.java similarity index 100% rename from src/main/java/org/alfresco/processor/ProcessorExtension.java rename to core/src/main/java/org/alfresco/processor/ProcessorExtension.java diff --git a/src/main/java/org/alfresco/query/AbstractCachingCannedQueryFactory.java b/core/src/main/java/org/alfresco/query/AbstractCachingCannedQueryFactory.java similarity index 100% rename from src/main/java/org/alfresco/query/AbstractCachingCannedQueryFactory.java rename to core/src/main/java/org/alfresco/query/AbstractCachingCannedQueryFactory.java diff --git a/src/main/java/org/alfresco/query/AbstractCannedQuery.java b/core/src/main/java/org/alfresco/query/AbstractCannedQuery.java similarity index 100% rename from src/main/java/org/alfresco/query/AbstractCannedQuery.java rename to core/src/main/java/org/alfresco/query/AbstractCannedQuery.java diff --git a/src/main/java/org/alfresco/query/AbstractCannedQueryFactory.java b/core/src/main/java/org/alfresco/query/AbstractCannedQueryFactory.java similarity index 100% rename from src/main/java/org/alfresco/query/AbstractCannedQueryFactory.java rename to core/src/main/java/org/alfresco/query/AbstractCannedQueryFactory.java diff --git a/src/main/java/org/alfresco/query/CannedQuery.java b/core/src/main/java/org/alfresco/query/CannedQuery.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQuery.java rename to core/src/main/java/org/alfresco/query/CannedQuery.java diff --git a/src/main/java/org/alfresco/query/CannedQueryException.java b/core/src/main/java/org/alfresco/query/CannedQueryException.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQueryException.java rename to core/src/main/java/org/alfresco/query/CannedQueryException.java diff --git a/src/main/java/org/alfresco/query/CannedQueryFactory.java b/core/src/main/java/org/alfresco/query/CannedQueryFactory.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQueryFactory.java rename to core/src/main/java/org/alfresco/query/CannedQueryFactory.java diff --git a/src/main/java/org/alfresco/query/CannedQueryPageDetails.java b/core/src/main/java/org/alfresco/query/CannedQueryPageDetails.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQueryPageDetails.java rename to core/src/main/java/org/alfresco/query/CannedQueryPageDetails.java diff --git a/src/main/java/org/alfresco/query/CannedQueryParameters.java b/core/src/main/java/org/alfresco/query/CannedQueryParameters.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQueryParameters.java rename to core/src/main/java/org/alfresco/query/CannedQueryParameters.java diff --git a/src/main/java/org/alfresco/query/CannedQueryResults.java b/core/src/main/java/org/alfresco/query/CannedQueryResults.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQueryResults.java rename to core/src/main/java/org/alfresco/query/CannedQueryResults.java diff --git a/src/main/java/org/alfresco/query/CannedQuerySortDetails.java b/core/src/main/java/org/alfresco/query/CannedQuerySortDetails.java similarity index 100% rename from src/main/java/org/alfresco/query/CannedQuerySortDetails.java rename to core/src/main/java/org/alfresco/query/CannedQuerySortDetails.java diff --git a/src/main/java/org/alfresco/query/EmptyCannedQueryResults.java b/core/src/main/java/org/alfresco/query/EmptyCannedQueryResults.java similarity index 100% rename from src/main/java/org/alfresco/query/EmptyCannedQueryResults.java rename to core/src/main/java/org/alfresco/query/EmptyCannedQueryResults.java diff --git a/src/main/java/org/alfresco/query/EmptyPagingResults.java b/core/src/main/java/org/alfresco/query/EmptyPagingResults.java similarity index 100% rename from src/main/java/org/alfresco/query/EmptyPagingResults.java rename to core/src/main/java/org/alfresco/query/EmptyPagingResults.java diff --git a/src/main/java/org/alfresco/query/ListBackedPagingResults.java b/core/src/main/java/org/alfresco/query/ListBackedPagingResults.java similarity index 100% rename from src/main/java/org/alfresco/query/ListBackedPagingResults.java rename to core/src/main/java/org/alfresco/query/ListBackedPagingResults.java diff --git a/src/main/java/org/alfresco/query/PageDetails.java b/core/src/main/java/org/alfresco/query/PageDetails.java similarity index 100% rename from src/main/java/org/alfresco/query/PageDetails.java rename to core/src/main/java/org/alfresco/query/PageDetails.java diff --git a/src/main/java/org/alfresco/query/PagingRequest.java b/core/src/main/java/org/alfresco/query/PagingRequest.java similarity index 100% rename from src/main/java/org/alfresco/query/PagingRequest.java rename to core/src/main/java/org/alfresco/query/PagingRequest.java diff --git a/src/main/java/org/alfresco/query/PagingResults.java b/core/src/main/java/org/alfresco/query/PagingResults.java similarity index 100% rename from src/main/java/org/alfresco/query/PagingResults.java rename to core/src/main/java/org/alfresco/query/PagingResults.java diff --git a/src/main/java/org/alfresco/query/PermissionedResults.java b/core/src/main/java/org/alfresco/query/PermissionedResults.java similarity index 100% rename from src/main/java/org/alfresco/query/PermissionedResults.java rename to core/src/main/java/org/alfresco/query/PermissionedResults.java diff --git a/src/main/java/org/alfresco/scripts/ScriptException.java b/core/src/main/java/org/alfresco/scripts/ScriptException.java similarity index 100% rename from src/main/java/org/alfresco/scripts/ScriptException.java rename to core/src/main/java/org/alfresco/scripts/ScriptException.java diff --git a/src/main/java/org/alfresco/scripts/ScriptResourceHelper.java b/core/src/main/java/org/alfresco/scripts/ScriptResourceHelper.java similarity index 100% rename from src/main/java/org/alfresco/scripts/ScriptResourceHelper.java rename to core/src/main/java/org/alfresco/scripts/ScriptResourceHelper.java diff --git a/src/main/java/org/alfresco/scripts/ScriptResourceLoader.java b/core/src/main/java/org/alfresco/scripts/ScriptResourceLoader.java similarity index 100% rename from src/main/java/org/alfresco/scripts/ScriptResourceLoader.java rename to core/src/main/java/org/alfresco/scripts/ScriptResourceLoader.java diff --git a/src/main/java/org/alfresco/util/ArgumentHelper.java b/core/src/main/java/org/alfresco/util/ArgumentHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/ArgumentHelper.java rename to core/src/main/java/org/alfresco/util/ArgumentHelper.java diff --git a/src/main/java/org/alfresco/util/BridgeTable.java b/core/src/main/java/org/alfresco/util/BridgeTable.java similarity index 100% rename from src/main/java/org/alfresco/util/BridgeTable.java rename to core/src/main/java/org/alfresco/util/BridgeTable.java diff --git a/src/main/java/org/alfresco/util/CachingDateFormat.java b/core/src/main/java/org/alfresco/util/CachingDateFormat.java similarity index 100% rename from src/main/java/org/alfresco/util/CachingDateFormat.java rename to core/src/main/java/org/alfresco/util/CachingDateFormat.java diff --git a/src/main/java/org/alfresco/util/Content.java b/core/src/main/java/org/alfresco/util/Content.java similarity index 100% rename from src/main/java/org/alfresco/util/Content.java rename to core/src/main/java/org/alfresco/util/Content.java diff --git a/src/main/java/org/alfresco/util/Convert.java b/core/src/main/java/org/alfresco/util/Convert.java similarity index 100% rename from src/main/java/org/alfresco/util/Convert.java rename to core/src/main/java/org/alfresco/util/Convert.java diff --git a/src/main/java/org/alfresco/util/Debug.java b/core/src/main/java/org/alfresco/util/Debug.java similarity index 100% rename from src/main/java/org/alfresco/util/Debug.java rename to core/src/main/java/org/alfresco/util/Debug.java diff --git a/src/main/java/org/alfresco/util/Deleter.java b/core/src/main/java/org/alfresco/util/Deleter.java similarity index 100% rename from src/main/java/org/alfresco/util/Deleter.java rename to core/src/main/java/org/alfresco/util/Deleter.java diff --git a/src/main/java/org/alfresco/util/DynamicallySizedThreadPoolExecutor.java b/core/src/main/java/org/alfresco/util/DynamicallySizedThreadPoolExecutor.java similarity index 100% rename from src/main/java/org/alfresco/util/DynamicallySizedThreadPoolExecutor.java rename to core/src/main/java/org/alfresco/util/DynamicallySizedThreadPoolExecutor.java diff --git a/src/main/java/org/alfresco/util/EqualsHelper.java b/core/src/main/java/org/alfresco/util/EqualsHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/EqualsHelper.java rename to core/src/main/java/org/alfresco/util/EqualsHelper.java diff --git a/src/main/java/org/alfresco/util/ExpiringValueCache.java b/core/src/main/java/org/alfresco/util/ExpiringValueCache.java similarity index 100% rename from src/main/java/org/alfresco/util/ExpiringValueCache.java rename to core/src/main/java/org/alfresco/util/ExpiringValueCache.java diff --git a/src/main/java/org/alfresco/util/FileFilterMode.java b/core/src/main/java/org/alfresco/util/FileFilterMode.java similarity index 100% rename from src/main/java/org/alfresco/util/FileFilterMode.java rename to core/src/main/java/org/alfresco/util/FileFilterMode.java diff --git a/src/main/java/org/alfresco/util/GUID.java b/core/src/main/java/org/alfresco/util/GUID.java similarity index 100% rename from src/main/java/org/alfresco/util/GUID.java rename to core/src/main/java/org/alfresco/util/GUID.java diff --git a/src/main/java/org/alfresco/util/IPUtils.java b/core/src/main/java/org/alfresco/util/IPUtils.java similarity index 100% rename from src/main/java/org/alfresco/util/IPUtils.java rename to core/src/main/java/org/alfresco/util/IPUtils.java diff --git a/src/main/java/org/alfresco/util/ISO8601DateFormat.java b/core/src/main/java/org/alfresco/util/ISO8601DateFormat.java similarity index 100% rename from src/main/java/org/alfresco/util/ISO8601DateFormat.java rename to core/src/main/java/org/alfresco/util/ISO8601DateFormat.java diff --git a/src/main/java/org/alfresco/util/InputStreamContent.java b/core/src/main/java/org/alfresco/util/InputStreamContent.java similarity index 100% rename from src/main/java/org/alfresco/util/InputStreamContent.java rename to core/src/main/java/org/alfresco/util/InputStreamContent.java diff --git a/src/main/java/org/alfresco/util/JMXUtils.java b/core/src/main/java/org/alfresco/util/JMXUtils.java similarity index 100% rename from src/main/java/org/alfresco/util/JMXUtils.java rename to core/src/main/java/org/alfresco/util/JMXUtils.java diff --git a/src/main/java/org/alfresco/util/LockHelper.java b/core/src/main/java/org/alfresco/util/LockHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/LockHelper.java rename to core/src/main/java/org/alfresco/util/LockHelper.java diff --git a/src/main/java/org/alfresco/util/LogAdapter.java b/core/src/main/java/org/alfresco/util/LogAdapter.java similarity index 100% rename from src/main/java/org/alfresco/util/LogAdapter.java rename to core/src/main/java/org/alfresco/util/LogAdapter.java diff --git a/src/main/java/org/alfresco/util/LogTee.java b/core/src/main/java/org/alfresco/util/LogTee.java similarity index 100% rename from src/main/java/org/alfresco/util/LogTee.java rename to core/src/main/java/org/alfresco/util/LogTee.java diff --git a/src/main/java/org/alfresco/util/LogUtil.java b/core/src/main/java/org/alfresco/util/LogUtil.java similarity index 100% rename from src/main/java/org/alfresco/util/LogUtil.java rename to core/src/main/java/org/alfresco/util/LogUtil.java diff --git a/src/main/java/org/alfresco/util/MD5.java b/core/src/main/java/org/alfresco/util/MD5.java similarity index 100% rename from src/main/java/org/alfresco/util/MD5.java rename to core/src/main/java/org/alfresco/util/MD5.java diff --git a/src/main/java/org/alfresco/util/MaxSizeMap.java b/core/src/main/java/org/alfresco/util/MaxSizeMap.java similarity index 100% rename from src/main/java/org/alfresco/util/MaxSizeMap.java rename to core/src/main/java/org/alfresco/util/MaxSizeMap.java diff --git a/src/main/java/org/alfresco/util/OneToManyBiMap.java b/core/src/main/java/org/alfresco/util/OneToManyBiMap.java similarity index 100% rename from src/main/java/org/alfresco/util/OneToManyBiMap.java rename to core/src/main/java/org/alfresco/util/OneToManyBiMap.java diff --git a/src/main/java/org/alfresco/util/OneToManyHashBiMap.java b/core/src/main/java/org/alfresco/util/OneToManyHashBiMap.java similarity index 100% rename from src/main/java/org/alfresco/util/OneToManyHashBiMap.java rename to core/src/main/java/org/alfresco/util/OneToManyHashBiMap.java diff --git a/src/main/java/org/alfresco/util/OneToManyHashMap.java b/core/src/main/java/org/alfresco/util/OneToManyHashMap.java similarity index 100% rename from src/main/java/org/alfresco/util/OneToManyHashMap.java rename to core/src/main/java/org/alfresco/util/OneToManyHashMap.java diff --git a/src/main/java/org/alfresco/util/OneToManyMap.java b/core/src/main/java/org/alfresco/util/OneToManyMap.java similarity index 100% rename from src/main/java/org/alfresco/util/OneToManyMap.java rename to core/src/main/java/org/alfresco/util/OneToManyMap.java diff --git a/src/main/java/org/alfresco/util/PackageMarker.java b/core/src/main/java/org/alfresco/util/PackageMarker.java similarity index 100% rename from src/main/java/org/alfresco/util/PackageMarker.java rename to core/src/main/java/org/alfresco/util/PackageMarker.java diff --git a/src/main/java/org/alfresco/util/Pair.java b/core/src/main/java/org/alfresco/util/Pair.java similarity index 100% rename from src/main/java/org/alfresco/util/Pair.java rename to core/src/main/java/org/alfresco/util/Pair.java diff --git a/src/main/java/org/alfresco/util/ParameterCheck.java b/core/src/main/java/org/alfresco/util/ParameterCheck.java similarity index 100% rename from src/main/java/org/alfresco/util/ParameterCheck.java rename to core/src/main/java/org/alfresco/util/ParameterCheck.java diff --git a/src/main/java/org/alfresco/util/PathMapper.java b/core/src/main/java/org/alfresco/util/PathMapper.java similarity index 100% rename from src/main/java/org/alfresco/util/PathMapper.java rename to core/src/main/java/org/alfresco/util/PathMapper.java diff --git a/src/main/java/org/alfresco/util/PatternFilter.java b/core/src/main/java/org/alfresco/util/PatternFilter.java similarity index 100% rename from src/main/java/org/alfresco/util/PatternFilter.java rename to core/src/main/java/org/alfresco/util/PatternFilter.java diff --git a/src/main/java/org/alfresco/util/PropertyCheck.java b/core/src/main/java/org/alfresco/util/PropertyCheck.java similarity index 100% rename from src/main/java/org/alfresco/util/PropertyCheck.java rename to core/src/main/java/org/alfresco/util/PropertyCheck.java diff --git a/src/main/java/org/alfresco/util/ReadWriteLockExecuter.java b/core/src/main/java/org/alfresco/util/ReadWriteLockExecuter.java similarity index 100% rename from src/main/java/org/alfresco/util/ReadWriteLockExecuter.java rename to core/src/main/java/org/alfresco/util/ReadWriteLockExecuter.java diff --git a/src/main/java/org/alfresco/util/ReflectionHelper.java b/core/src/main/java/org/alfresco/util/ReflectionHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/ReflectionHelper.java rename to core/src/main/java/org/alfresco/util/ReflectionHelper.java diff --git a/src/main/java/org/alfresco/util/SchedulerStarterBean.java b/core/src/main/java/org/alfresco/util/SchedulerStarterBean.java similarity index 100% rename from src/main/java/org/alfresco/util/SchedulerStarterBean.java rename to core/src/main/java/org/alfresco/util/SchedulerStarterBean.java diff --git a/src/main/java/org/alfresco/util/SerializationUtils.java b/core/src/main/java/org/alfresco/util/SerializationUtils.java similarity index 100% rename from src/main/java/org/alfresco/util/SerializationUtils.java rename to core/src/main/java/org/alfresco/util/SerializationUtils.java diff --git a/src/main/java/org/alfresco/util/TempFileProvider.java b/core/src/main/java/org/alfresco/util/TempFileProvider.java similarity index 100% rename from src/main/java/org/alfresco/util/TempFileProvider.java rename to core/src/main/java/org/alfresco/util/TempFileProvider.java diff --git a/src/main/java/org/alfresco/util/TraceableThreadFactory.java b/core/src/main/java/org/alfresco/util/TraceableThreadFactory.java similarity index 100% rename from src/main/java/org/alfresco/util/TraceableThreadFactory.java rename to core/src/main/java/org/alfresco/util/TraceableThreadFactory.java diff --git a/src/main/java/org/alfresco/util/TriggerBeanSPI.java b/core/src/main/java/org/alfresco/util/TriggerBeanSPI.java similarity index 100% rename from src/main/java/org/alfresco/util/TriggerBeanSPI.java rename to core/src/main/java/org/alfresco/util/TriggerBeanSPI.java diff --git a/src/main/java/org/alfresco/util/Triple.java b/core/src/main/java/org/alfresco/util/Triple.java similarity index 100% rename from src/main/java/org/alfresco/util/Triple.java rename to core/src/main/java/org/alfresco/util/Triple.java diff --git a/src/main/java/org/alfresco/util/VersionNumber.java b/core/src/main/java/org/alfresco/util/VersionNumber.java similarity index 100% rename from src/main/java/org/alfresco/util/VersionNumber.java rename to core/src/main/java/org/alfresco/util/VersionNumber.java diff --git a/src/main/java/org/alfresco/util/VmShutdownListener.java b/core/src/main/java/org/alfresco/util/VmShutdownListener.java similarity index 100% rename from src/main/java/org/alfresco/util/VmShutdownListener.java rename to core/src/main/java/org/alfresco/util/VmShutdownListener.java diff --git a/src/main/java/org/alfresco/util/bean/BooleanBean.java b/core/src/main/java/org/alfresco/util/bean/BooleanBean.java similarity index 100% rename from src/main/java/org/alfresco/util/bean/BooleanBean.java rename to core/src/main/java/org/alfresco/util/bean/BooleanBean.java diff --git a/src/main/java/org/alfresco/util/bean/HierarchicalBeanLoader.java b/core/src/main/java/org/alfresco/util/bean/HierarchicalBeanLoader.java similarity index 100% rename from src/main/java/org/alfresco/util/bean/HierarchicalBeanLoader.java rename to core/src/main/java/org/alfresco/util/bean/HierarchicalBeanLoader.java diff --git a/src/main/java/org/alfresco/util/cache/AbstractAsynchronouslyRefreshedCache.java b/core/src/main/java/org/alfresco/util/cache/AbstractAsynchronouslyRefreshedCache.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/AbstractAsynchronouslyRefreshedCache.java rename to core/src/main/java/org/alfresco/util/cache/AbstractAsynchronouslyRefreshedCache.java diff --git a/src/main/java/org/alfresco/util/cache/AbstractRefreshableCacheEvent.java b/core/src/main/java/org/alfresco/util/cache/AbstractRefreshableCacheEvent.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/AbstractRefreshableCacheEvent.java rename to core/src/main/java/org/alfresco/util/cache/AbstractRefreshableCacheEvent.java diff --git a/src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCache.java b/core/src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCache.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCache.java rename to core/src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCache.java diff --git a/src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCacheRegistry.java b/core/src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCacheRegistry.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCacheRegistry.java rename to core/src/main/java/org/alfresco/util/cache/AsynchronouslyRefreshedCacheRegistry.java diff --git a/src/main/java/org/alfresco/util/cache/DefaultAsynchronouslyRefreshedCacheRegistry.java b/core/src/main/java/org/alfresco/util/cache/DefaultAsynchronouslyRefreshedCacheRegistry.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/DefaultAsynchronouslyRefreshedCacheRegistry.java rename to core/src/main/java/org/alfresco/util/cache/DefaultAsynchronouslyRefreshedCacheRegistry.java diff --git a/src/main/java/org/alfresco/util/cache/RefreshableCache.java b/core/src/main/java/org/alfresco/util/cache/RefreshableCache.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/RefreshableCache.java rename to core/src/main/java/org/alfresco/util/cache/RefreshableCache.java diff --git a/src/main/java/org/alfresco/util/cache/RefreshableCacheEvent.java b/core/src/main/java/org/alfresco/util/cache/RefreshableCacheEvent.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/RefreshableCacheEvent.java rename to core/src/main/java/org/alfresco/util/cache/RefreshableCacheEvent.java diff --git a/src/main/java/org/alfresco/util/cache/RefreshableCacheListener.java b/core/src/main/java/org/alfresco/util/cache/RefreshableCacheListener.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/RefreshableCacheListener.java rename to core/src/main/java/org/alfresco/util/cache/RefreshableCacheListener.java diff --git a/src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshEvent.java b/core/src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshEvent.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshEvent.java rename to core/src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshEvent.java diff --git a/src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshedEvent.java b/core/src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshedEvent.java similarity index 100% rename from src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshedEvent.java rename to core/src/main/java/org/alfresco/util/cache/RefreshableCacheRefreshedEvent.java diff --git a/src/main/java/org/alfresco/util/collections/CollectionUtils.java b/core/src/main/java/org/alfresco/util/collections/CollectionUtils.java similarity index 100% rename from src/main/java/org/alfresco/util/collections/CollectionUtils.java rename to core/src/main/java/org/alfresco/util/collections/CollectionUtils.java diff --git a/src/main/java/org/alfresco/util/collections/EntryTransformer.java b/core/src/main/java/org/alfresco/util/collections/EntryTransformer.java similarity index 100% rename from src/main/java/org/alfresco/util/collections/EntryTransformer.java rename to core/src/main/java/org/alfresco/util/collections/EntryTransformer.java diff --git a/src/main/java/org/alfresco/util/collections/Filter.java b/core/src/main/java/org/alfresco/util/collections/Filter.java similarity index 100% rename from src/main/java/org/alfresco/util/collections/Filter.java rename to core/src/main/java/org/alfresco/util/collections/Filter.java diff --git a/src/main/java/org/alfresco/util/collections/Function.java b/core/src/main/java/org/alfresco/util/collections/Function.java similarity index 100% rename from src/main/java/org/alfresco/util/collections/Function.java rename to core/src/main/java/org/alfresco/util/collections/Function.java diff --git a/src/main/java/org/alfresco/util/collections/JsonUtils.java b/core/src/main/java/org/alfresco/util/collections/JsonUtils.java similarity index 100% rename from src/main/java/org/alfresco/util/collections/JsonUtils.java rename to core/src/main/java/org/alfresco/util/collections/JsonUtils.java diff --git a/src/main/java/org/alfresco/util/exec/ExecParameterTokenizer.java b/core/src/main/java/org/alfresco/util/exec/ExecParameterTokenizer.java similarity index 100% rename from src/main/java/org/alfresco/util/exec/ExecParameterTokenizer.java rename to core/src/main/java/org/alfresco/util/exec/ExecParameterTokenizer.java diff --git a/src/main/java/org/alfresco/util/exec/RuntimeExec.java b/core/src/main/java/org/alfresco/util/exec/RuntimeExec.java similarity index 100% rename from src/main/java/org/alfresco/util/exec/RuntimeExec.java rename to core/src/main/java/org/alfresco/util/exec/RuntimeExec.java diff --git a/src/main/java/org/alfresco/util/exec/RuntimeExecBootstrapBean.java b/core/src/main/java/org/alfresco/util/exec/RuntimeExecBootstrapBean.java similarity index 100% rename from src/main/java/org/alfresco/util/exec/RuntimeExecBootstrapBean.java rename to core/src/main/java/org/alfresco/util/exec/RuntimeExecBootstrapBean.java diff --git a/src/main/java/org/alfresco/util/exec/RuntimeExecShutdownBean.java b/core/src/main/java/org/alfresco/util/exec/RuntimeExecShutdownBean.java similarity index 100% rename from src/main/java/org/alfresco/util/exec/RuntimeExecShutdownBean.java rename to core/src/main/java/org/alfresco/util/exec/RuntimeExecShutdownBean.java diff --git a/src/main/java/org/alfresco/util/log/NDC.java b/core/src/main/java/org/alfresco/util/log/NDC.java similarity index 100% rename from src/main/java/org/alfresco/util/log/NDC.java rename to core/src/main/java/org/alfresco/util/log/NDC.java diff --git a/src/main/java/org/alfresco/util/log/NDCDelegate.java b/core/src/main/java/org/alfresco/util/log/NDCDelegate.java similarity index 100% rename from src/main/java/org/alfresco/util/log/NDCDelegate.java rename to core/src/main/java/org/alfresco/util/log/NDCDelegate.java diff --git a/src/main/java/org/alfresco/util/log/log4j/Log4JNDC.java b/core/src/main/java/org/alfresco/util/log/log4j/Log4JNDC.java similarity index 100% rename from src/main/java/org/alfresco/util/log/log4j/Log4JNDC.java rename to core/src/main/java/org/alfresco/util/log/log4j/Log4JNDC.java diff --git a/src/main/java/org/alfresco/util/random/NormalDistributionHelper.java b/core/src/main/java/org/alfresco/util/random/NormalDistributionHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/random/NormalDistributionHelper.java rename to core/src/main/java/org/alfresco/util/random/NormalDistributionHelper.java diff --git a/src/main/java/org/alfresco/util/registry/NamedObjectRegistry.java b/core/src/main/java/org/alfresco/util/registry/NamedObjectRegistry.java similarity index 100% rename from src/main/java/org/alfresco/util/registry/NamedObjectRegistry.java rename to core/src/main/java/org/alfresco/util/registry/NamedObjectRegistry.java diff --git a/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java b/core/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java similarity index 100% rename from src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java rename to core/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java diff --git a/src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java b/core/src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java similarity index 100% rename from src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java rename to core/src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java diff --git a/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java b/core/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java similarity index 100% rename from src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java rename to core/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java diff --git a/src/main/java/org/alfresco/util/transaction/TransactionListener.java b/core/src/main/java/org/alfresco/util/transaction/TransactionListener.java similarity index 100% rename from src/main/java/org/alfresco/util/transaction/TransactionListener.java rename to core/src/main/java/org/alfresco/util/transaction/TransactionListener.java diff --git a/src/main/java/org/alfresco/util/transaction/TransactionListenerAdapter.java b/core/src/main/java/org/alfresco/util/transaction/TransactionListenerAdapter.java similarity index 100% rename from src/main/java/org/alfresco/util/transaction/TransactionListenerAdapter.java rename to core/src/main/java/org/alfresco/util/transaction/TransactionListenerAdapter.java diff --git a/src/main/java/org/alfresco/util/transaction/TransactionSupportUtil.java b/core/src/main/java/org/alfresco/util/transaction/TransactionSupportUtil.java similarity index 100% rename from src/main/java/org/alfresco/util/transaction/TransactionSupportUtil.java rename to core/src/main/java/org/alfresco/util/transaction/TransactionSupportUtil.java diff --git a/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java b/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java similarity index 100% rename from src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java rename to core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java diff --git a/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java b/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java similarity index 100% rename from src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java rename to core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java diff --git a/src/test/java/org/alfresco/config/SystemPropertiesSetterBeanTest.java b/core/src/test/java/org/alfresco/config/SystemPropertiesSetterBeanTest.java similarity index 100% rename from src/test/java/org/alfresco/config/SystemPropertiesSetterBeanTest.java rename to core/src/test/java/org/alfresco/config/SystemPropertiesSetterBeanTest.java diff --git a/src/test/java/org/alfresco/encryption/AlfrescoKeyStoreTest.java b/core/src/test/java/org/alfresco/encryption/AlfrescoKeyStoreTest.java similarity index 100% rename from src/test/java/org/alfresco/encryption/AlfrescoKeyStoreTest.java rename to core/src/test/java/org/alfresco/encryption/AlfrescoKeyStoreTest.java diff --git a/src/test/java/org/alfresco/encryption/EncryptingOutputStreamTest.java b/core/src/test/java/org/alfresco/encryption/EncryptingOutputStreamTest.java similarity index 100% rename from src/test/java/org/alfresco/encryption/EncryptingOutputStreamTest.java rename to core/src/test/java/org/alfresco/encryption/EncryptingOutputStreamTest.java diff --git a/src/test/java/org/alfresco/error/AlfrescoRuntimeExceptionTest.java b/core/src/test/java/org/alfresco/error/AlfrescoRuntimeExceptionTest.java similarity index 100% rename from src/test/java/org/alfresco/error/AlfrescoRuntimeExceptionTest.java rename to core/src/test/java/org/alfresco/error/AlfrescoRuntimeExceptionTest.java diff --git a/src/test/java/org/alfresco/query/CannedQueryTest.java b/core/src/test/java/org/alfresco/query/CannedQueryTest.java similarity index 100% rename from src/test/java/org/alfresco/query/CannedQueryTest.java rename to core/src/test/java/org/alfresco/query/CannedQueryTest.java diff --git a/src/test/java/org/alfresco/util/BaseTest.java b/core/src/test/java/org/alfresco/util/BaseTest.java similarity index 100% rename from src/test/java/org/alfresco/util/BaseTest.java rename to core/src/test/java/org/alfresco/util/BaseTest.java diff --git a/src/test/java/org/alfresco/util/BridgeTableTest.java b/core/src/test/java/org/alfresco/util/BridgeTableTest.java similarity index 100% rename from src/test/java/org/alfresco/util/BridgeTableTest.java rename to core/src/test/java/org/alfresco/util/BridgeTableTest.java diff --git a/src/test/java/org/alfresco/util/CachingDateFormatTest.java b/core/src/test/java/org/alfresco/util/CachingDateFormatTest.java similarity index 100% rename from src/test/java/org/alfresco/util/CachingDateFormatTest.java rename to core/src/test/java/org/alfresco/util/CachingDateFormatTest.java diff --git a/src/test/java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java b/core/src/test/java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java similarity index 100% rename from src/test/java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java rename to core/src/test/java/org/alfresco/util/DynamicallySizedThreadPoolExecutorTest.java diff --git a/src/test/java/org/alfresco/util/EqualsHelperTest.java b/core/src/test/java/org/alfresco/util/EqualsHelperTest.java similarity index 100% rename from src/test/java/org/alfresco/util/EqualsHelperTest.java rename to core/src/test/java/org/alfresco/util/EqualsHelperTest.java diff --git a/src/test/java/org/alfresco/util/GuidTest.java b/core/src/test/java/org/alfresco/util/GuidTest.java similarity index 100% rename from src/test/java/org/alfresco/util/GuidTest.java rename to core/src/test/java/org/alfresco/util/GuidTest.java diff --git a/src/test/java/org/alfresco/util/ISO8601DateFormatTest.java b/core/src/test/java/org/alfresco/util/ISO8601DateFormatTest.java similarity index 100% rename from src/test/java/org/alfresco/util/ISO8601DateFormatTest.java rename to core/src/test/java/org/alfresco/util/ISO8601DateFormatTest.java diff --git a/src/test/java/org/alfresco/util/LogAdapterTest.java b/core/src/test/java/org/alfresco/util/LogAdapterTest.java similarity index 100% rename from src/test/java/org/alfresco/util/LogAdapterTest.java rename to core/src/test/java/org/alfresco/util/LogAdapterTest.java diff --git a/src/test/java/org/alfresco/util/LogTeeTest.java b/core/src/test/java/org/alfresco/util/LogTeeTest.java similarity index 100% rename from src/test/java/org/alfresco/util/LogTeeTest.java rename to core/src/test/java/org/alfresco/util/LogTeeTest.java diff --git a/src/test/java/org/alfresco/util/PathMapperTest.java b/core/src/test/java/org/alfresco/util/PathMapperTest.java similarity index 100% rename from src/test/java/org/alfresco/util/PathMapperTest.java rename to core/src/test/java/org/alfresco/util/PathMapperTest.java diff --git a/src/test/java/org/alfresco/util/TempFileProviderTest.java b/core/src/test/java/org/alfresco/util/TempFileProviderTest.java similarity index 100% rename from src/test/java/org/alfresco/util/TempFileProviderTest.java rename to core/src/test/java/org/alfresco/util/TempFileProviderTest.java diff --git a/src/test/java/org/alfresco/util/VersionNumberTest.java b/core/src/test/java/org/alfresco/util/VersionNumberTest.java similarity index 100% rename from src/test/java/org/alfresco/util/VersionNumberTest.java rename to core/src/test/java/org/alfresco/util/VersionNumberTest.java diff --git a/src/test/java/org/alfresco/util/collections/CollectionUtilsTest.java b/core/src/test/java/org/alfresco/util/collections/CollectionUtilsTest.java similarity index 100% rename from src/test/java/org/alfresco/util/collections/CollectionUtilsTest.java rename to core/src/test/java/org/alfresco/util/collections/CollectionUtilsTest.java diff --git a/src/test/java/org/alfresco/util/exec/ExecParameterTokenizerTest.java b/core/src/test/java/org/alfresco/util/exec/ExecParameterTokenizerTest.java similarity index 100% rename from src/test/java/org/alfresco/util/exec/ExecParameterTokenizerTest.java rename to core/src/test/java/org/alfresco/util/exec/ExecParameterTokenizerTest.java diff --git a/src/test/java/org/alfresco/util/exec/RuntimeExecBeansTest.java b/core/src/test/java/org/alfresco/util/exec/RuntimeExecBeansTest.java similarity index 100% rename from src/test/java/org/alfresco/util/exec/RuntimeExecBeansTest.java rename to core/src/test/java/org/alfresco/util/exec/RuntimeExecBeansTest.java diff --git a/src/test/java/org/alfresco/util/exec/RuntimeExecTest.java b/core/src/test/java/org/alfresco/util/exec/RuntimeExecTest.java similarity index 100% rename from src/test/java/org/alfresco/util/exec/RuntimeExecTest.java rename to core/src/test/java/org/alfresco/util/exec/RuntimeExecTest.java diff --git a/src/test/java/org/alfresco/util/random/NormalDistributionHelperTest.java b/core/src/test/java/org/alfresco/util/random/NormalDistributionHelperTest.java similarity index 100% rename from src/test/java/org/alfresco/util/random/NormalDistributionHelperTest.java rename to core/src/test/java/org/alfresco/util/random/NormalDistributionHelperTest.java diff --git a/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java b/core/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java similarity index 100% rename from src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java rename to core/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java diff --git a/src/test/java/org/alfresco/util/testing/category/DBTests.java b/core/src/test/java/org/alfresco/util/testing/category/DBTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/DBTests.java rename to core/src/test/java/org/alfresco/util/testing/category/DBTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/DebugTests.java b/core/src/test/java/org/alfresco/util/testing/category/DebugTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/DebugTests.java rename to core/src/test/java/org/alfresco/util/testing/category/DebugTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/LuceneTests.java b/core/src/test/java/org/alfresco/util/testing/category/LuceneTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/LuceneTests.java rename to core/src/test/java/org/alfresco/util/testing/category/LuceneTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/NeverRunsTests.java b/core/src/test/java/org/alfresco/util/testing/category/NeverRunsTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/NeverRunsTests.java rename to core/src/test/java/org/alfresco/util/testing/category/NeverRunsTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/NonBuildTests.java b/core/src/test/java/org/alfresco/util/testing/category/NonBuildTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/NonBuildTests.java rename to core/src/test/java/org/alfresco/util/testing/category/NonBuildTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/PerformanceTests.java b/core/src/test/java/org/alfresco/util/testing/category/PerformanceTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/PerformanceTests.java rename to core/src/test/java/org/alfresco/util/testing/category/PerformanceTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/RedundantTests.java b/core/src/test/java/org/alfresco/util/testing/category/RedundantTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/RedundantTests.java rename to core/src/test/java/org/alfresco/util/testing/category/RedundantTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/SanityTests.java b/core/src/test/java/org/alfresco/util/testing/category/SanityTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/SanityTests.java rename to core/src/test/java/org/alfresco/util/testing/category/SanityTests.java diff --git a/src/test/java/org/alfresco/util/testing/category/SlowTests.java b/core/src/test/java/org/alfresco/util/testing/category/SlowTests.java similarity index 100% rename from src/test/java/org/alfresco/util/testing/category/SlowTests.java rename to core/src/test/java/org/alfresco/util/testing/category/SlowTests.java diff --git a/src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java b/core/src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java similarity index 100% rename from src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java rename to core/src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java diff --git a/src/test/resources/config-areas.xml b/core/src/test/resources/config-areas.xml similarity index 100% rename from src/test/resources/config-areas.xml rename to core/src/test/resources/config-areas.xml diff --git a/src/test/resources/config-multi.xml b/core/src/test/resources/config-multi.xml similarity index 100% rename from src/test/resources/config-multi.xml rename to core/src/test/resources/config-multi.xml diff --git a/src/test/resources/config-props.properties b/core/src/test/resources/config-props.properties similarity index 100% rename from src/test/resources/config-props.properties rename to core/src/test/resources/config-props.properties diff --git a/src/test/resources/config-props.xml b/core/src/test/resources/config-props.xml similarity index 100% rename from src/test/resources/config-props.xml rename to core/src/test/resources/config-props.xml diff --git a/src/test/resources/config-replace.xml b/core/src/test/resources/config-replace.xml similarity index 100% rename from src/test/resources/config-replace.xml rename to core/src/test/resources/config-replace.xml diff --git a/src/test/resources/config.xml b/core/src/test/resources/config.xml similarity index 100% rename from src/test/resources/config.xml rename to core/src/test/resources/config.xml diff --git a/src/test/resources/keystore-tests/empty-alias-metadata.properties b/core/src/test/resources/keystore-tests/empty-alias-metadata.properties similarity index 100% rename from src/test/resources/keystore-tests/empty-alias-metadata.properties rename to core/src/test/resources/keystore-tests/empty-alias-metadata.properties diff --git a/src/test/resources/keystore-tests/ks-test-1.jks b/core/src/test/resources/keystore-tests/ks-test-1.jks similarity index 100% rename from src/test/resources/keystore-tests/ks-test-1.jks rename to core/src/test/resources/keystore-tests/ks-test-1.jks diff --git a/src/test/resources/keystore-tests/ks-test-2.jks b/core/src/test/resources/keystore-tests/ks-test-2.jks similarity index 100% rename from src/test/resources/keystore-tests/ks-test-2.jks rename to core/src/test/resources/keystore-tests/ks-test-2.jks diff --git a/src/test/resources/keystore-tests/ks1-metadata.properties b/core/src/test/resources/keystore-tests/ks1-metadata.properties similarity index 100% rename from src/test/resources/keystore-tests/ks1-metadata.properties rename to core/src/test/resources/keystore-tests/ks1-metadata.properties diff --git a/src/test/resources/keystore-tests/passwords.txt b/core/src/test/resources/keystore-tests/passwords.txt similarity index 100% rename from src/test/resources/keystore-tests/passwords.txt rename to core/src/test/resources/keystore-tests/passwords.txt diff --git a/src/test/resources/keystore-tests/wrong-alias-metadata.properties b/core/src/test/resources/keystore-tests/wrong-alias-metadata.properties similarity index 100% rename from src/test/resources/keystore-tests/wrong-alias-metadata.properties rename to core/src/test/resources/keystore-tests/wrong-alias-metadata.properties diff --git a/src/test/resources/keystore-tests/wrong-key-password-metadata.properties b/core/src/test/resources/keystore-tests/wrong-key-password-metadata.properties similarity index 100% rename from src/test/resources/keystore-tests/wrong-key-password-metadata.properties rename to core/src/test/resources/keystore-tests/wrong-key-password-metadata.properties diff --git a/src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties b/core/src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties similarity index 100% rename from src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties rename to core/src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties diff --git a/src/test/resources/org/alfresco/i18n/testMessages.properties b/core/src/test/resources/org/alfresco/i18n/testMessages.properties similarity index 100% rename from src/test/resources/org/alfresco/i18n/testMessages.properties rename to core/src/test/resources/org/alfresco/i18n/testMessages.properties diff --git a/src/test/resources/org/alfresco/i18n/testMessages_fr_FR.properties b/core/src/test/resources/org/alfresco/i18n/testMessages_fr_FR.properties similarity index 100% rename from src/test/resources/org/alfresco/i18n/testMessages_fr_FR.properties rename to core/src/test/resources/org/alfresco/i18n/testMessages_fr_FR.properties diff --git a/src/test/resources/org/alfresco/util/exec/RuntimeExecBeansTest-context.xml b/core/src/test/resources/org/alfresco/util/exec/RuntimeExecBeansTest-context.xml similarity index 100% rename from src/test/resources/org/alfresco/util/exec/RuntimeExecBeansTest-context.xml rename to core/src/test/resources/org/alfresco/util/exec/RuntimeExecBeansTest-context.xml diff --git a/src/test/resources/resource-loader/java.util.AbstractCollection/file.txt b/core/src/test/resources/resource-loader/java.util.AbstractCollection/file.txt similarity index 100% rename from src/test/resources/resource-loader/java.util.AbstractCollection/file.txt rename to core/src/test/resources/resource-loader/java.util.AbstractCollection/file.txt diff --git a/src/test/resources/resource-loader/java.util.AbstractList/file.txt b/core/src/test/resources/resource-loader/java.util.AbstractList/file.txt similarity index 100% rename from src/test/resources/resource-loader/java.util.AbstractList/file.txt rename to core/src/test/resources/resource-loader/java.util.AbstractList/file.txt diff --git a/src/test/resources/resource-loader/java.util.TreeSet/file.txt b/core/src/test/resources/resource-loader/java.util.TreeSet/file.txt similarity index 100% rename from src/test/resources/resource-loader/java.util.TreeSet/file.txt rename to core/src/test/resources/resource-loader/java.util.TreeSet/file.txt diff --git a/src/test/resources/test-config-forms-basic-override.xml b/core/src/test/resources/test-config-forms-basic-override.xml similarity index 100% rename from src/test/resources/test-config-forms-basic-override.xml rename to core/src/test/resources/test-config-forms-basic-override.xml diff --git a/src/test/resources/test-config-forms-basic.xml b/core/src/test/resources/test-config-forms-basic.xml similarity index 100% rename from src/test/resources/test-config-forms-basic.xml rename to core/src/test/resources/test-config-forms-basic.xml diff --git a/src/test/resources/test-config-forms-negative.xml b/core/src/test/resources/test-config-forms-negative.xml similarity index 100% rename from src/test/resources/test-config-forms-negative.xml rename to core/src/test/resources/test-config-forms-negative.xml diff --git a/src/test/resources/test-config-forms.xml b/core/src/test/resources/test-config-forms.xml similarity index 100% rename from src/test/resources/test-config-forms.xml rename to core/src/test/resources/test-config-forms.xml