Migrate sli-core files

Migrate sli-core repo files into new
directory "core".

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

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/artifacts/pom.xml b/core/artifacts/pom.xml
similarity index 100%
rename from artifacts/pom.xml
rename to core/artifacts/pom.xml

diff --git a/dblib/.gitignore b/core/dblib/.gitignore
similarity index 100%
rename from dblib/.gitignore
rename to core/dblib/.gitignore

diff --git a/dblib/README.md b/core/dblib/README.md
similarity index 100%
rename from dblib/README.md
rename to core/dblib/README.md

diff --git a/dblib/installer/pom.xml b/core/dblib/installer/pom.xml
similarity index 100%
rename from dblib/installer/pom.xml
rename to core/dblib/installer/pom.xml

diff --git a/dblib/installer/src/assembly/assemble_installer_zip.xml b/core/dblib/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from dblib/installer/src/assembly/assemble_installer_zip.xml
rename to core/dblib/installer/src/assembly/assemble_installer_zip.xml

diff --git a/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from dblib/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/dblib/installer/src/main/resources/scripts/install-feature.sh b/core/dblib/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from dblib/installer/src/main/resources/scripts/install-feature.sh
rename to core/dblib/installer/src/main/resources/scripts/install-feature.sh

diff --git a/dblib/pom.xml b/core/dblib/pom.xml
similarity index 100%
rename from dblib/pom.xml
rename to core/dblib/pom.xml

diff --git a/dblib/provider/pom.xml b/core/dblib/provider/pom.xml
similarity index 100%
rename from dblib/provider/pom.xml
rename to core/dblib/provider/pom.xml

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSource.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceFactory.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceFactory.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceFactory.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceFactory.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBConfigException.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBConfigException.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBConfigException.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBConfigException.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibConnection.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibConnection.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibConnection.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibConnection.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibException.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibException.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibException.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLibException.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationException.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationException.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationException.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationException.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsException.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsException.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsException.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsException.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/TerminatingConfiguration.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/TerminatingConfiguration.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/TerminatingConfiguration.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/TerminatingConfiguration.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/JdbcDBCachedDataSource.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/PollingWorker.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/PollingWorker.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/PollingWorker.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/PollingWorker.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitor.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitor.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitor.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitor.java

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java
similarity index 100%
rename from dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java
rename to core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java

diff --git a/dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml b/core/dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml
similarity index 100%
rename from dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml
rename to core/dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml

diff --git a/dblib/provider/src/main/resources/dblib.properties b/core/dblib/provider/src/main/resources/dblib.properties
similarity index 100%
rename from dblib/provider/src/main/resources/dblib.properties
rename to core/dblib/provider/src/main/resources/dblib.properties

diff --git a/dblib/provider/src/main/resources/org/opendaylight/blueprint/dblib-blueprint.xml b/core/dblib/provider/src/main/resources/org/opendaylight/blueprint/dblib-blueprint.xml
similarity index 100%
rename from dblib/provider/src/main/resources/org/opendaylight/blueprint/dblib-blueprint.xml
rename to core/dblib/provider/src/main/resources/org/opendaylight/blueprint/dblib-blueprint.xml

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/CachedDataSourceTest.java

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DBConfigExceptionTest.java

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/DblibConfigurationExceptionTest.java

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/NoAvailableConnectionsExceptionTest.java

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSourceTest.java

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager.java

diff --git a/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java b/core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java
similarity index 100%
rename from dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java
rename to core/dblib/provider/src/test/java/org/onap/ccsdk/sli/core/dblib/TestDBResourceManager2.java

diff --git a/dblib/provider/src/test/resources/dblib.properties b/core/dblib/provider/src/test/resources/dblib.properties
similarity index 100%
rename from dblib/provider/src/test/resources/dblib.properties
rename to core/dblib/provider/src/test/resources/dblib.properties

diff --git a/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml
similarity index 100%
rename from features/ccsdk-dblib/pom.xml
rename to core/features/ccsdk-dblib/pom.xml

diff --git a/features/ccsdk-dblib/src/main/feature/feature.xml b/core/features/ccsdk-dblib/src/main/feature/feature.xml
similarity index 100%
rename from features/ccsdk-dblib/src/main/feature/feature.xml
rename to core/features/ccsdk-dblib/src/main/feature/feature.xml

diff --git a/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml
similarity index 100%
rename from features/ccsdk-filters/pom.xml
rename to core/features/ccsdk-filters/pom.xml

diff --git a/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml
similarity index 100%
rename from features/ccsdk-sli-core-all/pom.xml
rename to core/features/ccsdk-sli-core-all/pom.xml

diff --git a/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml
similarity index 100%
rename from features/ccsdk-sli/pom.xml
rename to core/features/ccsdk-sli/pom.xml

diff --git a/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml
similarity index 100%
rename from features/ccsdk-sliPluginUtils/pom.xml
rename to core/features/ccsdk-sliPluginUtils/pom.xml

diff --git a/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml
similarity index 100%
rename from features/ccsdk-sliapi/pom.xml
rename to core/features/ccsdk-sliapi/pom.xml

diff --git a/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml
similarity index 100%
rename from features/ccsdk-slicore-utils/pom.xml
rename to core/features/ccsdk-slicore-utils/pom.xml

diff --git a/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml
similarity index 100%
rename from features/features-sli-core/pom.xml
rename to core/features/features-sli-core/pom.xml

diff --git a/features/installer/pom.xml b/core/features/installer/pom.xml
similarity index 100%
rename from features/installer/pom.xml
rename to core/features/installer/pom.xml

diff --git a/features/installer/src/assembly/assemble_installer_zip.xml b/core/features/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from features/installer/src/assembly/assemble_installer_zip.xml
rename to core/features/installer/src/assembly/assemble_installer_zip.xml

diff --git a/features/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/features/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from features/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/features/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/features/installer/src/main/resources/scripts/install-feature.sh b/core/features/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from features/installer/src/main/resources/scripts/install-feature.sh
rename to core/features/installer/src/main/resources/scripts/install-feature.sh

diff --git a/features/pom.xml b/core/features/pom.xml
similarity index 100%
rename from features/pom.xml
rename to core/features/pom.xml

diff --git a/filters/.gitignore b/core/filters/.gitignore
similarity index 100%
rename from filters/.gitignore
rename to core/filters/.gitignore

diff --git a/filters/.sonar/checkstyle.xml b/core/filters/.sonar/checkstyle.xml
similarity index 100%
rename from filters/.sonar/checkstyle.xml
rename to core/filters/.sonar/checkstyle.xml

diff --git a/filters/.sonar/pmd.xml b/core/filters/.sonar/pmd.xml
similarity index 100%
rename from filters/.sonar/pmd.xml
rename to core/filters/.sonar/pmd.xml

diff --git a/filters/README b/core/filters/README
similarity index 100%
rename from filters/README
rename to core/filters/README

diff --git a/filters/installer/pom.xml b/core/filters/installer/pom.xml
similarity index 100%
rename from filters/installer/pom.xml
rename to core/filters/installer/pom.xml

diff --git a/filters/installer/src/assembly/assemble_installer_zip.xml b/core/filters/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from filters/installer/src/assembly/assemble_installer_zip.xml
rename to core/filters/installer/src/assembly/assemble_installer_zip.xml

diff --git a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/filters/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from filters/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/filters/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/filters/installer/src/main/resources/scripts/install-feature.sh b/core/filters/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from filters/installer/src/main/resources/scripts/install-feature.sh
rename to core/filters/installer/src/main/resources/scripts/install-feature.sh

diff --git a/filters/pom.xml b/core/filters/pom.xml
similarity index 100%
rename from filters/pom.xml
rename to core/filters/pom.xml

diff --git a/filters/provider/pom.xml b/core/filters/provider/pom.xml
similarity index 100%
rename from filters/provider/pom.xml
rename to core/filters/provider/pom.xml

diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java b/core/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java
similarity index 100%
rename from filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java
rename to core/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java

diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java b/core/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java
similarity index 100%
rename from filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java
rename to core/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java

diff --git a/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java b/core/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java
similarity index 100%
rename from filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java
rename to core/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java

diff --git a/releases/0.5.0.yaml b/core/releases/0.5.0.yaml
similarity index 100%
rename from releases/0.5.0.yaml
rename to core/releases/0.5.0.yaml

diff --git a/releases/0.5.1.yaml b/core/releases/0.5.1.yaml
similarity index 100%
rename from releases/0.5.1.yaml
rename to core/releases/0.5.1.yaml

diff --git a/releases/0.5.2.yaml b/core/releases/0.5.2.yaml
similarity index 100%
rename from releases/0.5.2.yaml
rename to core/releases/0.5.2.yaml

diff --git a/releases/0.6.0.yaml b/core/releases/0.6.0.yaml
similarity index 100%
rename from releases/0.6.0.yaml
rename to core/releases/0.6.0.yaml

diff --git a/releases/0.6.1.yaml b/core/releases/0.6.1.yaml
similarity index 100%
rename from releases/0.6.1.yaml
rename to core/releases/0.6.1.yaml

diff --git a/releases/0.7.0.yaml b/core/releases/0.7.0.yaml
similarity index 100%
rename from releases/0.7.0.yaml
rename to core/releases/0.7.0.yaml

diff --git a/releases/0.7.1.yaml b/core/releases/0.7.1.yaml
similarity index 100%
rename from releases/0.7.1.yaml
rename to core/releases/0.7.1.yaml

diff --git a/releases/1.0.0.yaml b/core/releases/1.0.0.yaml
similarity index 100%
rename from releases/1.0.0.yaml
rename to core/releases/1.0.0.yaml

diff --git a/releases/1.0.1.yaml b/core/releases/1.0.1.yaml
similarity index 100%
rename from releases/1.0.1.yaml
rename to core/releases/1.0.1.yaml

diff --git a/releases/1.1.0.yaml b/core/releases/1.1.0.yaml
similarity index 100%
rename from releases/1.1.0.yaml
rename to core/releases/1.1.0.yaml

diff --git a/sli/.gitignore b/core/sli/.gitignore
similarity index 100%
rename from sli/.gitignore
rename to core/sli/.gitignore

diff --git a/sli/common/pom.xml b/core/sli/common/pom.xml
similarity index 100%
rename from sli/common/pom.xml
rename to core/sli/common/pom.xml

diff --git a/sli/common/src/main/antlr4/org/onap/ccsdk/sli/core/sli/ExprGrammar.g4 b/core/sli/common/src/main/antlr4/org/onap/ccsdk/sli/core/sli/ExprGrammar.g4
similarity index 100%
rename from sli/common/src/main/antlr4/org/onap/ccsdk/sli/core/sli/ExprGrammar.g4
rename to core/sli/common/src/main/antlr4/org/onap/ccsdk/sli/core/sli/ExprGrammar.g4

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ActivationEntry.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ActivationEntry.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ActivationEntry.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ActivationEntry.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/BreakNodeException.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/BreakNodeException.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/BreakNodeException.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/BreakNodeException.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CommonConstants.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CommonConstants.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CommonConstants.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CommonConstants.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ConfigurationException.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ConfigurationException.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ConfigurationException.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ConfigurationException.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/DuplicateValueException.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/DuplicateValueException.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/DuplicateValueException.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/DuplicateValueException.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ErrorLogger.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ErrorLogger.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ErrorLogger.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ErrorLogger.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ExitNodeException.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ExitNodeException.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ExitNodeException.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/ExitNodeException.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MessageWriter.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MessageWriter.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MessageWriter.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MessageWriter.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SecurePrinter.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SecurePrinter.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SecurePrinter.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SecurePrinter.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAdaptor.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAdaptor.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAdaptor.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAdaptor.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicAtom.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicBinaryExpression.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicBinaryExpression.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicBinaryExpression.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicBinaryExpression.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicConstants.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicConstants.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicConstants.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicConstants.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicCrawler.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicException.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicException.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicException.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicException.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprParserErrorListener.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprParserErrorListener.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprParserErrorListener.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprParserErrorListener.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpression.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionFactory.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionFactory.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionFactory.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionFactory.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicFunctionCall.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicFunctionCall.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicFunctionCall.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicFunctionCall.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicGraph.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicGraph.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicGraph.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicGraph.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJavaPlugin.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicNode.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserException.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserException.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserException.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserException.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicRecorder.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicRecorder.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicRecorder.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicRecorder.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicResource.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStore.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStore.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStore.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStore.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicVariableTerm.java b/core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicVariableTerm.java
similarity index 100%
rename from sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicVariableTerm.java
rename to core/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicVariableTerm.java

diff --git a/sli/common/src/main/resources/svclogic.xsd b/core/sli/common/src/main/resources/svclogic.xsd
similarity index 100%
rename from sli/common/src/main/resources/svclogic.xsd
rename to core/sli/common/src/main/resources/svclogic.xsd

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ConfigurationExceptionTestt.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ConfigurationExceptionTestt.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ConfigurationExceptionTestt.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ConfigurationExceptionTestt.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/DuplicatevalueExceptionTest.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/DuplicatevalueExceptionTest.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/DuplicatevalueExceptionTest.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/DuplicatevalueExceptionTest.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ErrorLoggerTest.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ErrorLoggerTest.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ErrorLoggerTest.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ErrorLoggerTest.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ExitNodeExceptionTest.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ExitNodeExceptionTest.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ExitNodeExceptionTest.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ExitNodeExceptionTest.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/ITCaseSvcLogicParser.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicContextTest.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicExpressionParserTest.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserExceptionTest.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserExceptionTest.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserExceptionTest.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/SvcLogicParserExceptionTest.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java

diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestSvcLogicLoader.java b/core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestSvcLogicLoader.java
similarity index 100%
rename from sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestSvcLogicLoader.java
rename to core/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestSvcLogicLoader.java

diff --git a/sli/common/src/test/resources/2dArray.json b/core/sli/common/src/test/resources/2dArray.json
similarity index 100%
rename from sli/common/src/test/resources/2dArray.json
rename to core/sli/common/src/test/resources/2dArray.json

diff --git a/sli/common/src/test/resources/3dArray.json b/core/sli/common/src/test/resources/3dArray.json
similarity index 100%
rename from sli/common/src/test/resources/3dArray.json
rename to core/sli/common/src/test/resources/3dArray.json

diff --git a/sli/common/src/test/resources/ArrayMenu.json b/core/sli/common/src/test/resources/ArrayMenu.json
similarity index 100%
rename from sli/common/src/test/resources/ArrayMenu.json
rename to core/sli/common/src/test/resources/ArrayMenu.json

diff --git a/sli/common/src/test/resources/EmbeddedEscapedJson.json b/core/sli/common/src/test/resources/EmbeddedEscapedJson.json
similarity index 100%
rename from sli/common/src/test/resources/EmbeddedEscapedJson.json
rename to core/sli/common/src/test/resources/EmbeddedEscapedJson.json

diff --git a/sli/common/src/test/resources/EscapedJson.json b/core/sli/common/src/test/resources/EscapedJson.json
similarity index 100%
rename from sli/common/src/test/resources/EscapedJson.json
rename to core/sli/common/src/test/resources/EscapedJson.json

diff --git a/sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml b/core/sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml
similarity index 100%
rename from sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml
rename to core/sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml

diff --git a/sli/common/src/test/resources/EvcPortSvcLogic_v100.xml b/core/sli/common/src/test/resources/EvcPortSvcLogic_v100.xml
similarity index 100%
rename from sli/common/src/test/resources/EvcPortSvcLogic_v100.xml
rename to core/sli/common/src/test/resources/EvcPortSvcLogic_v100.xml

diff --git a/sli/common/src/test/resources/JsonObject.json b/core/sli/common/src/test/resources/JsonObject.json
similarity index 100%
rename from sli/common/src/test/resources/JsonObject.json
rename to core/sli/common/src/test/resources/JsonObject.json

diff --git a/sli/common/src/test/resources/ObjectMenu.json b/core/sli/common/src/test/resources/ObjectMenu.json
similarity index 100%
rename from sli/common/src/test/resources/ObjectMenu.json
rename to core/sli/common/src/test/resources/ObjectMenu.json

diff --git a/sli/common/src/test/resources/QuotedValues.json b/core/sli/common/src/test/resources/QuotedValues.json
similarity index 100%
rename from sli/common/src/test/resources/QuotedValues.json
rename to core/sli/common/src/test/resources/QuotedValues.json

diff --git a/sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml b/core/sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml
similarity index 100%
rename from sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml
rename to core/sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml

diff --git a/sli/common/src/test/resources/Widget.json b/core/sli/common/src/test/resources/Widget.json
similarity index 100%
rename from sli/common/src/test/resources/Widget.json
rename to core/sli/common/src/test/resources/Widget.json

diff --git a/sli/common/src/test/resources/bad_neutron_logic_v11.xml b/core/sli/common/src/test/resources/bad_neutron_logic_v11.xml
similarity index 100%
rename from sli/common/src/test/resources/bad_neutron_logic_v11.xml
rename to core/sli/common/src/test/resources/bad_neutron_logic_v11.xml

diff --git a/sli/common/src/test/resources/dblib.properties b/core/sli/common/src/test/resources/dblib.properties
similarity index 100%
rename from sli/common/src/test/resources/dblib.properties
rename to core/sli/common/src/test/resources/dblib.properties

diff --git a/sli/common/src/test/resources/expression.tests b/core/sli/common/src/test/resources/expression.tests
similarity index 100%
rename from sli/common/src/test/resources/expression.tests
rename to core/sli/common/src/test/resources/expression.tests

diff --git a/sli/common/src/test/resources/graphs/sliapi/graph.versions b/core/sli/common/src/test/resources/graphs/sliapi/graph.versions
similarity index 100%
rename from sli/common/src/test/resources/graphs/sliapi/graph.versions
rename to core/sli/common/src/test/resources/graphs/sliapi/graph.versions

diff --git a/sli/common/src/test/resources/graphs/sliapi/sli_healthcheck.xml b/core/sli/common/src/test/resources/graphs/sliapi/sli_healthcheck.xml
similarity index 100%
rename from sli/common/src/test/resources/graphs/sliapi/sli_healthcheck.xml
rename to core/sli/common/src/test/resources/graphs/sliapi/sli_healthcheck.xml

diff --git a/sli/common/src/test/resources/l3sdn_logic_v10.xml b/core/sli/common/src/test/resources/l3sdn_logic_v10.xml
similarity index 100%
rename from sli/common/src/test/resources/l3sdn_logic_v10.xml
rename to core/sli/common/src/test/resources/l3sdn_logic_v10.xml

diff --git a/sli/common/src/test/resources/log4j2.properties b/core/sli/common/src/test/resources/log4j2.properties
similarity index 100%
rename from sli/common/src/test/resources/log4j2.properties
rename to core/sli/common/src/test/resources/log4j2.properties

diff --git a/sli/common/src/test/resources/mergetest.xml b/core/sli/common/src/test/resources/mergetest.xml
similarity index 100%
rename from sli/common/src/test/resources/mergetest.xml
rename to core/sli/common/src/test/resources/mergetest.xml

diff --git a/sli/common/src/test/resources/neutron_logic_v10.xml b/core/sli/common/src/test/resources/neutron_logic_v10.xml
similarity index 100%
rename from sli/common/src/test/resources/neutron_logic_v10.xml
rename to core/sli/common/src/test/resources/neutron_logic_v10.xml

diff --git a/sli/common/src/test/resources/nonsense.xml b/core/sli/common/src/test/resources/nonsense.xml
similarity index 100%
rename from sli/common/src/test/resources/nonsense.xml
rename to core/sli/common/src/test/resources/nonsense.xml

diff --git a/sli/common/src/test/resources/parser-bad.tests b/core/sli/common/src/test/resources/parser-bad.tests
similarity index 100%
rename from sli/common/src/test/resources/parser-bad.tests
rename to core/sli/common/src/test/resources/parser-bad.tests

diff --git a/sli/common/src/test/resources/parser-good.tests b/core/sli/common/src/test/resources/parser-good.tests
similarity index 100%
rename from sli/common/src/test/resources/parser-good.tests
rename to core/sli/common/src/test/resources/parser-good.tests

diff --git a/sli/common/src/test/resources/simplelogger.properties b/core/sli/common/src/test/resources/simplelogger.properties
similarity index 100%
rename from sli/common/src/test/resources/simplelogger.properties
rename to core/sli/common/src/test/resources/simplelogger.properties

diff --git a/sli/common/src/test/resources/svclogic.properties b/core/sli/common/src/test/resources/svclogic.properties
similarity index 100%
rename from sli/common/src/test/resources/svclogic.properties
rename to core/sli/common/src/test/resources/svclogic.properties

diff --git a/sli/common/src/test/resources/svclogic.sh b/core/sli/common/src/test/resources/svclogic.sh
similarity index 100%
rename from sli/common/src/test/resources/svclogic.sh
rename to core/sli/common/src/test/resources/svclogic.sh

diff --git a/sli/installer/pom.xml b/core/sli/installer/pom.xml
similarity index 100%
rename from sli/installer/pom.xml
rename to core/sli/installer/pom.xml

diff --git a/sli/installer/src/assembly/assemble_installer_zip.xml b/core/sli/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from sli/installer/src/assembly/assemble_installer_zip.xml
rename to core/sli/installer/src/assembly/assemble_installer_zip.xml

diff --git a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/sli/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from sli/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/sli/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/sli/installer/src/main/resources/scripts/install-feature.sh b/core/sli/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from sli/installer/src/main/resources/scripts/install-feature.sh
rename to core/sli/installer/src/main/resources/scripts/install-feature.sh

diff --git a/sli/model/pom.xml b/core/sli/model/pom.xml
similarity index 100%
rename from sli/model/pom.xml
rename to core/sli/model/pom.xml

diff --git a/sli/model/src/main/yang/sliapi.yang b/core/sli/model/src/main/yang/sliapi.yang
similarity index 100%
rename from sli/model/src/main/yang/sliapi.yang
rename to core/sli/model/src/main/yang/sliapi.yang

diff --git a/sli/model/src/main/yang/test-model@2019-07-23.yang b/core/sli/model/src/main/yang/test-model@2019-07-23.yang
similarity index 100%
rename from sli/model/src/main/yang/test-model@2019-07-23.yang
rename to core/sli/model/src/main/yang/test-model@2019-07-23.yang

diff --git a/sli/pom.xml b/core/sli/pom.xml
similarity index 100%
rename from sli/pom.xml
rename to core/sli/pom.xml

diff --git a/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml
similarity index 100%
rename from sli/provider-base/pom.xml
rename to core/sli/provider-base/pom.xml

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/AbstractSvcLogicNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/AbstractSvcLogicNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/AbstractSvcLogicNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/AbstractSvcLogicNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BreakNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BreakNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BreakNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BreakNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ConfigureNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ConfigureNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ConfigureNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ConfigureNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/DeleteNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/DeleteNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/DeleteNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/DeleteNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExistsNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExistsNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExistsNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExistsNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExitNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExitNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExitNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ExitNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ForNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ForNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ForNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ForNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/GetResourceNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/GetResourceNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/GetResourceNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/GetResourceNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolver.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolver.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolver.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolver.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStore.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStore.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStore.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStore.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/IsAvailableNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/IsAvailableNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/IsAvailableNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/IsAvailableNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/NotifyNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/NotifyNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/NotifyNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/NotifyNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/RecordNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/RecordNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/RecordNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/RecordNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReleaseNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReleaseNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReleaseNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReleaseNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReserveNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReserveNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReserveNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReserveNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReturnNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReturnNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReturnNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/ReturnNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SaveNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SaveNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SaveNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SaveNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicPropertiesProvider.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicPropertiesProvider.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicPropertiesProvider.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicPropertiesProvider.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicResolver.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicResolver.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicResolver.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicResolver.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceBase.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceBase.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceBase.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceBase.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SwitchNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SwitchNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SwitchNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SwitchNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/UpdateNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/UpdateNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/UpdateNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/UpdateNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/WhileNodeExecutor.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/WhileNodeExecutor.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/WhileNodeExecutor.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/WhileNodeExecutor.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java

diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/Slf4jRecorder.java b/core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/Slf4jRecorder.java
similarity index 100%
rename from sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/Slf4jRecorder.java
rename to core/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/Slf4jRecorder.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/BadPlugin.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/BadPlugin.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/BadPlugin.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/BadPlugin.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutorTest.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutorTest.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutorTest.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/ExecuteNodeExecutorTest.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/GraphTests.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/GraphTests.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/GraphTests.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/GraphTests.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolverTest.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolverTest.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolverTest.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/HashMapResolverTest.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStoreTest.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStoreTest.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStoreTest.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/InMemorySvcLogicStoreTest.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/LunchSelectorPlugin.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/LunchSelectorPlugin.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/LunchSelectorPlugin.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/LunchSelectorPlugin.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/PluginTest.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/PluginTest.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/PluginTest.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/PluginTest.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutorTest.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutorTest.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutorTest.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SetNodeExecutorTest.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolverTest.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolverTest.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolverTest.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolverTest.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestFileRecorder.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestFileRecorder.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestFileRecorder.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestFileRecorder.java

diff --git a/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestSlf4jRecorder.java b/core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestSlf4jRecorder.java
similarity index 100%
rename from sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestSlf4jRecorder.java
rename to core/sli/provider-base/src/test/java/org/onap/ccsdk/sli/core/sli/recording/TestSlf4jRecorder.java

diff --git a/sli/provider-base/src/test/resources/breakGraph.xml b/core/sli/provider-base/src/test/resources/breakGraph.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/breakGraph.xml
rename to core/sli/provider-base/src/test/resources/breakGraph.xml

diff --git a/sli/provider-base/src/test/resources/clearMultipleArrayValues.xml b/core/sli/provider-base/src/test/resources/clearMultipleArrayValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/clearMultipleArrayValues.xml
rename to core/sli/provider-base/src/test/resources/clearMultipleArrayValues.xml

diff --git a/sli/provider-base/src/test/resources/clearNestedSubArrayValues.xml b/core/sli/provider-base/src/test/resources/clearNestedSubArrayValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/clearNestedSubArrayValues.xml
rename to core/sli/provider-base/src/test/resources/clearNestedSubArrayValues.xml

diff --git a/sli/provider-base/src/test/resources/clearSingleArrayValues.xml b/core/sli/provider-base/src/test/resources/clearSingleArrayValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/clearSingleArrayValues.xml
rename to core/sli/provider-base/src/test/resources/clearSingleArrayValues.xml

diff --git a/sli/provider-base/src/test/resources/clearSingleSubArrayValues.xml b/core/sli/provider-base/src/test/resources/clearSingleSubArrayValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/clearSingleSubArrayValues.xml
rename to core/sli/provider-base/src/test/resources/clearSingleSubArrayValues.xml

diff --git a/sli/provider-base/src/test/resources/clearSubArrayValues.xml b/core/sli/provider-base/src/test/resources/clearSubArrayValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/clearSubArrayValues.xml
rename to core/sli/provider-base/src/test/resources/clearSubArrayValues.xml

diff --git a/sli/provider-base/src/test/resources/clearValues.xml b/core/sli/provider-base/src/test/resources/clearValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/clearValues.xml
rename to core/sli/provider-base/src/test/resources/clearValues.xml

diff --git a/sli/provider-base/src/test/resources/copyValues.xml b/core/sli/provider-base/src/test/resources/copyValues.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/copyValues.xml
rename to core/sli/provider-base/src/test/resources/copyValues.xml

diff --git a/sli/provider-base/src/test/resources/expression.tests b/core/sli/provider-base/src/test/resources/expression.tests
similarity index 100%
rename from sli/provider-base/src/test/resources/expression.tests
rename to core/sli/provider-base/src/test/resources/expression.tests

diff --git a/sli/provider-base/src/test/resources/expressions.xml b/core/sli/provider-base/src/test/resources/expressions.xml
similarity index 100%
rename from sli/provider-base/src/test/resources/expressions.xml
rename to core/sli/provider-base/src/test/resources/expressions.xml

diff --git a/sli/provider-base/src/test/resources/simplelogger.properties b/core/sli/provider-base/src/test/resources/simplelogger.properties
similarity index 100%
rename from sli/provider-base/src/test/resources/simplelogger.properties
rename to core/sli/provider-base/src/test/resources/simplelogger.properties

diff --git a/sli/provider/pom.xml b/core/sli/provider/pom.xml
similarity index 100%
rename from sli/provider/pom.xml
rename to core/sli/provider/pom.xml

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
similarity index 100%
rename from sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
rename to core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToProp.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToProp.java
similarity index 100%
rename from sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToProp.java
rename to core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToProp.java

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java
similarity index 100%
rename from sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java
rename to core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicClassResolver.java

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java
similarity index 100%
rename from sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java
rename to core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
similarity index 100%
rename from sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
rename to core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
similarity index 100%
rename from sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
rename to core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java

diff --git a/sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml b/core/sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml
similarity index 100%
rename from sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml
rename to core/sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml

diff --git a/sli/provider/src/main/resources/org/opendaylight/blueprint/sli-blueprint.xml b/core/sli/provider/src/main/resources/org/opendaylight/blueprint/sli-blueprint.xml
similarity index 100%
rename from sli/provider/src/main/resources/org/opendaylight/blueprint/sli-blueprint.xml
rename to core/sli/provider/src/main/resources/org/opendaylight/blueprint/sli-blueprint.xml

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
similarity index 100%
rename from sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
rename to core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
similarity index 100%
rename from sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
rename to core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
similarity index 100%
rename from sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
rename to core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java
similarity index 100%
rename from sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java
rename to core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java

diff --git a/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/CosModelType.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/CosModelType.java
similarity index 100%
rename from sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/CosModelType.java
rename to core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/CosModelType.java

diff --git a/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObject.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObject.java
similarity index 100%
rename from sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObject.java
rename to core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObject.java

diff --git a/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java
similarity index 100%
rename from sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java
rename to core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java

diff --git a/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/WrapperObj.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/WrapperObj.java
similarity index 100%
rename from sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/WrapperObj.java
rename to core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/WrapperObj.java

diff --git a/sli/provider/src/test/resources/EnumerationMapping.properties b/core/sli/provider/src/test/resources/EnumerationMapping.properties
similarity index 100%
rename from sli/provider/src/test/resources/EnumerationMapping.properties
rename to core/sli/provider/src/test/resources/EnumerationMapping.properties

diff --git a/sli/provider/src/test/resources/executor.tests b/core/sli/provider/src/test/resources/executor.tests
similarity index 100%
rename from sli/provider/src/test/resources/executor.tests
rename to core/sli/provider/src/test/resources/executor.tests

diff --git a/sli/provider/src/test/resources/l3sdn.properties b/core/sli/provider/src/test/resources/l3sdn.properties
similarity index 100%
rename from sli/provider/src/test/resources/l3sdn.properties
rename to core/sli/provider/src/test/resources/l3sdn.properties

diff --git a/sli/provider/src/test/resources/l3sdn_logic_v10.xml b/core/sli/provider/src/test/resources/l3sdn_logic_v10.xml
similarity index 100%
rename from sli/provider/src/test/resources/l3sdn_logic_v10.xml
rename to core/sli/provider/src/test/resources/l3sdn_logic_v10.xml

diff --git a/sli/provider/src/test/resources/l3vpnyang/ietf-l3vpn-svc-part@2017-09-21.yang b/core/sli/provider/src/test/resources/l3vpnyang/ietf-l3vpn-svc-part@2017-09-21.yang
similarity index 100%
rename from sli/provider/src/test/resources/l3vpnyang/ietf-l3vpn-svc-part@2017-09-21.yang
rename to core/sli/provider/src/test/resources/l3vpnyang/ietf-l3vpn-svc-part@2017-09-21.yang

diff --git a/sli/provider/src/test/resources/simplelogger.properties b/core/sli/provider/src/test/resources/simplelogger.properties
similarity index 100%
rename from sli/provider/src/test/resources/simplelogger.properties
rename to core/sli/provider/src/test/resources/simplelogger.properties

diff --git a/sli/provider/src/test/resources/svclogic.properties b/core/sli/provider/src/test/resources/svclogic.properties
similarity index 100%
rename from sli/provider/src/test/resources/svclogic.properties
rename to core/sli/provider/src/test/resources/svclogic.properties

diff --git a/sliPluginUtils/.gitignore b/core/sliPluginUtils/.gitignore
similarity index 100%
rename from sliPluginUtils/.gitignore
rename to core/sliPluginUtils/.gitignore

diff --git a/sliPluginUtils/.sonar/checkstyle.xml b/core/sliPluginUtils/.sonar/checkstyle.xml
similarity index 100%
rename from sliPluginUtils/.sonar/checkstyle.xml
rename to core/sliPluginUtils/.sonar/checkstyle.xml

diff --git a/sliPluginUtils/.sonar/pmd.xml b/core/sliPluginUtils/.sonar/pmd.xml
similarity index 100%
rename from sliPluginUtils/.sonar/pmd.xml
rename to core/sliPluginUtils/.sonar/pmd.xml

diff --git a/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml
similarity index 100%
rename from sliPluginUtils/installer/pom.xml
rename to core/sliPluginUtils/installer/pom.xml

diff --git a/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml b/core/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml
rename to core/sliPluginUtils/installer/src/assembly/assemble_installer_zip.xml

diff --git a/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh b/core/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
rename to core/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh

diff --git a/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml
similarity index 100%
rename from sliPluginUtils/pom.xml
rename to core/sliPluginUtils/pom.xml

diff --git a/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml
similarity index 100%
rename from sliPluginUtils/provider/pom.xml
rename to core/sliPluginUtils/provider/pom.xml

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java b/core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java
similarity index 100%
rename from sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java
rename to core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils.java

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtils.java b/core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtils.java
similarity index 100%
rename from sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtils.java
rename to core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtils.java

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextList.java b/core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextList.java
similarity index 100%
rename from sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextList.java
rename to core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextList.java

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java b/core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java
similarity index 100%
rename from sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java
rename to core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/YesNo.java b/core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/YesNo.java
similarity index 100%
rename from sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/YesNo.java
rename to core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/YesNo.java

diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/package-info.java b/core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/package-info.java
similarity index 100%
rename from sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/package-info.java
rename to core/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/commondatastructures/package-info.java

diff --git a/sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml b/core/sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml
similarity index 100%
rename from sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml
rename to core/sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml

diff --git a/sliPluginUtils/provider/src/main/resources/org/opendaylight/blueprint/slipluginutils-blueprint.xml b/core/sliPluginUtils/provider/src/main/resources/org/opendaylight/blueprint/slipluginutils-blueprint.xml
similarity index 100%
rename from sliPluginUtils/provider/src/main/resources/org/opendaylight/blueprint/slipluginutils-blueprint.xml
rename to core/sliPluginUtils/provider/src/main/resources/org/opendaylight/blueprint/slipluginutils-blueprint.xml

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java b/core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java
similarity index 100%
rename from sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java
rename to core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_StaticFunctionsTest.java

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_checkParametersTest.java b/core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_checkParametersTest.java
similarity index 100%
rename from sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_checkParametersTest.java
rename to core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_checkParametersTest.java

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java b/core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
similarity index 100%
rename from sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
rename to core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortListTest.java b/core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortListTest.java
similarity index 100%
rename from sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortListTest.java
rename to core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortListTest.java

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtilsTest.java b/core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtilsTest.java
similarity index 100%
rename from sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtilsTest.java
rename to core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliStringUtilsTest.java

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextListTest.java b/core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextListTest.java
similarity index 100%
rename from sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextListTest.java
rename to core/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextListTest.java

diff --git a/sliPluginUtils/provider/src/test/resources/2dArray.json b/core/sliPluginUtils/provider/src/test/resources/2dArray.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/2dArray.json
rename to core/sliPluginUtils/provider/src/test/resources/2dArray.json

diff --git a/sliPluginUtils/provider/src/test/resources/3dArray.json b/core/sliPluginUtils/provider/src/test/resources/3dArray.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/3dArray.json
rename to core/sliPluginUtils/provider/src/test/resources/3dArray.json

diff --git a/sliPluginUtils/provider/src/test/resources/ArrayMenu.json b/core/sliPluginUtils/provider/src/test/resources/ArrayMenu.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/ArrayMenu.json
rename to core/sliPluginUtils/provider/src/test/resources/ArrayMenu.json

diff --git a/sliPluginUtils/provider/src/test/resources/EmbeddedEscapedJson.json b/core/sliPluginUtils/provider/src/test/resources/EmbeddedEscapedJson.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/EmbeddedEscapedJson.json
rename to core/sliPluginUtils/provider/src/test/resources/EmbeddedEscapedJson.json

diff --git a/sliPluginUtils/provider/src/test/resources/EscapedJson.json b/core/sliPluginUtils/provider/src/test/resources/EscapedJson.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/EscapedJson.json
rename to core/sliPluginUtils/provider/src/test/resources/EscapedJson.json

diff --git a/sliPluginUtils/provider/src/test/resources/JsonObject.json b/core/sliPluginUtils/provider/src/test/resources/JsonObject.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/JsonObject.json
rename to core/sliPluginUtils/provider/src/test/resources/JsonObject.json

diff --git a/sliPluginUtils/provider/src/test/resources/ObjectMenu.json b/core/sliPluginUtils/provider/src/test/resources/ObjectMenu.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/ObjectMenu.json
rename to core/sliPluginUtils/provider/src/test/resources/ObjectMenu.json

diff --git a/sliPluginUtils/provider/src/test/resources/Widget.json b/core/sliPluginUtils/provider/src/test/resources/Widget.json
similarity index 100%
rename from sliPluginUtils/provider/src/test/resources/Widget.json
rename to core/sliPluginUtils/provider/src/test/resources/Widget.json

diff --git a/sliapi/.gitignore b/core/sliapi/.gitignore
similarity index 100%
rename from sliapi/.gitignore
rename to core/sliapi/.gitignore

diff --git a/sliapi/README.txt b/core/sliapi/README.txt
similarity index 100%
rename from sliapi/README.txt
rename to core/sliapi/README.txt

diff --git a/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml
similarity index 100%
rename from sliapi/installer/pom.xml
rename to core/sliapi/installer/pom.xml

diff --git a/sliapi/installer/src/assembly/assemble_installer_zip.xml b/core/sliapi/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from sliapi/installer/src/assembly/assemble_installer_zip.xml
rename to core/sliapi/installer/src/assembly/assemble_installer_zip.xml

diff --git a/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/sliapi/installer/src/main/resources/scripts/install-feature.sh b/core/sliapi/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from sliapi/installer/src/main/resources/scripts/install-feature.sh
rename to core/sliapi/installer/src/main/resources/scripts/install-feature.sh

diff --git a/sliapi/model/pom.xml b/core/sliapi/model/pom.xml
similarity index 100%
rename from sliapi/model/pom.xml
rename to core/sliapi/model/pom.xml

diff --git a/sliapi/model/src/main/resources/sli-api.20161110.yaml b/core/sliapi/model/src/main/resources/sli-api.20161110.yaml
similarity index 100%
rename from sliapi/model/src/main/resources/sli-api.20161110.yaml
rename to core/sliapi/model/src/main/resources/sli-api.20161110.yaml

diff --git a/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml
similarity index 100%
rename from sliapi/model/swagger/pom.xml
rename to core/sliapi/model/swagger/pom.xml

diff --git a/sliapi/model/swagger/src/main/json/sliapi.json b/core/sliapi/model/swagger/src/main/json/sliapi.json
similarity index 100%
rename from sliapi/model/swagger/src/main/json/sliapi.json
rename to core/sliapi/model/swagger/src/main/json/sliapi.json

diff --git a/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml
similarity index 100%
rename from sliapi/model/swagger/src/main/yaml/sliapi.yaml
rename to core/sliapi/model/swagger/src/main/yaml/sliapi.yaml

diff --git a/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml
similarity index 100%
rename from sliapi/model/yang/pom.xml
rename to core/sliapi/model/yang/pom.xml

diff --git a/sliapi/model/yang/src/main/resources/sli-api.20161110.json b/core/sliapi/model/yang/src/main/resources/sli-api.20161110.json
similarity index 100%
rename from sliapi/model/yang/src/main/resources/sli-api.20161110.json
rename to core/sliapi/model/yang/src/main/resources/sli-api.20161110.json

diff --git a/sliapi/model/yang/src/main/resources/sli-api.20161110.yaml b/core/sliapi/model/yang/src/main/resources/sli-api.20161110.yaml
similarity index 100%
rename from sliapi/model/yang/src/main/resources/sli-api.20161110.yaml
rename to core/sliapi/model/yang/src/main/resources/sli-api.20161110.yaml

diff --git a/sliapi/model/yang/src/main/yang/sliapi.yang b/core/sliapi/model/yang/src/main/yang/sliapi.yang
similarity index 100%
rename from sliapi/model/yang/src/main/yang/sliapi.yang
rename to core/sliapi/model/yang/src/main/yang/sliapi.yang

diff --git a/sliapi/pom.xml b/core/sliapi/pom.xml
similarity index 100%
rename from sliapi/pom.xml
rename to core/sliapi/pom.xml

diff --git a/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml
similarity index 100%
rename from sliapi/provider/pom.xml
rename to core/sliapi/provider/pom.xml

diff --git a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelper.java b/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelper.java
similarity index 100%
rename from sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelper.java
rename to core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelper.java

diff --git a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java b/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
similarity index 100%
rename from sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
rename to core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java

diff --git a/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml b/core/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml
similarity index 100%
rename from sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml
rename to core/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml

diff --git a/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml b/core/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
similarity index 100%
rename from sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
rename to core/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml

diff --git a/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelperTest.java b/core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelperTest.java
similarity index 100%
rename from sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelperTest.java
rename to core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/SliapiHelperTest.java

diff --git a/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java b/core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
similarity index 100%
rename from sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
rename to core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java

diff --git a/sliapi/provider/src/test/resources/simplelogger.properties b/core/sliapi/provider/src/test/resources/simplelogger.properties
similarity index 100%
rename from sliapi/provider/src/test/resources/simplelogger.properties
rename to core/sliapi/provider/src/test/resources/simplelogger.properties

diff --git a/sliapi/provider/src/test/resources/sli_healthcheck.xml b/core/sliapi/provider/src/test/resources/sli_healthcheck.xml
similarity index 100%
rename from sliapi/provider/src/test/resources/sli_healthcheck.xml
rename to core/sliapi/provider/src/test/resources/sli_healthcheck.xml

diff --git a/sliapi/provider/src/test/resources/svclogic.properties b/core/sliapi/provider/src/test/resources/svclogic.properties
similarity index 100%
rename from sliapi/provider/src/test/resources/svclogic.properties
rename to core/sliapi/provider/src/test/resources/svclogic.properties

diff --git a/src/site/apt/nodes.apt b/core/src/site/apt/nodes.apt
similarity index 100%
rename from src/site/apt/nodes.apt
rename to core/src/site/apt/nodes.apt

diff --git a/src/site/site.xml b/core/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to core/src/site/site.xml

diff --git a/utils/installer/pom.xml b/core/utils/installer/pom.xml
similarity index 100%
rename from utils/installer/pom.xml
rename to core/utils/installer/pom.xml

diff --git a/utils/installer/src/assembly/assemble_installer_zip.xml b/core/utils/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from utils/installer/src/assembly/assemble_installer_zip.xml
rename to core/utils/installer/src/assembly/assemble_installer_zip.xml

diff --git a/utils/installer/src/assembly/assemble_mvnrepo_zip.xml b/core/utils/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from utils/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to core/utils/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/utils/installer/src/main/resources/scripts/install-feature.sh b/core/utils/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from utils/installer/src/main/resources/scripts/install-feature.sh
rename to core/utils/installer/src/main/resources/scripts/install-feature.sh

diff --git a/utils/pom.xml b/core/utils/pom.xml
similarity index 100%
rename from utils/pom.xml
rename to core/utils/pom.xml

diff --git a/utils/provider/pom.xml b/core/utils/provider/pom.xml
similarity index 100%
rename from utils/provider/pom.xml
rename to core/utils/provider/pom.xml

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PathValidator.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PathValidator.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PathValidator.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PathValidator.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java

diff --git a/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java
similarity index 100%
rename from utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java
rename to core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/BundleContexFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/BundleContexFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/BundleContexFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/BundleContexFileResolverTest.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/CoreDefaultFileResolverTest.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/common/SdncConfigEnvVarFileResolverTest.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java

diff --git a/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java b/core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java
similarity index 100%
rename from utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java
rename to core/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java