Migrate files from sli-plugins

Migrate sli-plugins repo into new
directory "plugins".

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

diff --git a/LICENSE.txt b/plugins/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to plugins/LICENSE.txt

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

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

diff --git a/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml
similarity index 100%
rename from features/ccsdk-gr-toolkit/pom.xml
rename to plugins/features/ccsdk-gr-toolkit/pom.xml

diff --git a/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml
similarity index 100%
rename from features/ccsdk-properties-node/pom.xml
rename to plugins/features/ccsdk-properties-node/pom.xml

diff --git a/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml
similarity index 100%
rename from features/ccsdk-restapi-call-node/pom.xml
rename to plugins/features/ccsdk-restapi-call-node/pom.xml

diff --git a/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml
similarity index 100%
rename from features/ccsdk-restconf-client/pom.xml
rename to plugins/features/ccsdk-restconf-client/pom.xml

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

diff --git a/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml
similarity index 100%
rename from features/ccsdk-sshapi-call-node/pom.xml
rename to plugins/features/ccsdk-sshapi-call-node/pom.xml

diff --git a/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml
similarity index 100%
rename from features/ccsdk-template-node/pom.xml
rename to plugins/features/ccsdk-template-node/pom.xml

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

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

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

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

diff --git a/features/installer/src/main/resources/scripts/install-feature.sh b/plugins/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 plugins/features/installer/src/main/resources/scripts/install-feature.sh

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

diff --git a/grToolkit/.gitignore b/plugins/grToolkit/.gitignore
similarity index 100%
rename from grToolkit/.gitignore
rename to plugins/grToolkit/.gitignore

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

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

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

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

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

diff --git a/grToolkit/model/.gitignore b/plugins/grToolkit/model/.gitignore
similarity index 100%
rename from grToolkit/model/.gitignore
rename to plugins/grToolkit/model/.gitignore

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

diff --git a/grToolkit/model/scripts/python/yang2props.py b/plugins/grToolkit/model/scripts/python/yang2props.py
similarity index 100%
rename from grToolkit/model/scripts/python/yang2props.py
rename to plugins/grToolkit/model/scripts/python/yang2props.py

diff --git a/grToolkit/model/src/main/yang/gr-toolkit.yang b/plugins/grToolkit/model/src/main/yang/gr-toolkit.yang
similarity index 100%
rename from grToolkit/model/src/main/yang/gr-toolkit.yang
rename to plugins/grToolkit/model/src/main/yang/gr-toolkit.yang

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

diff --git a/grToolkit/provider/.gitignore b/plugins/grToolkit/provider/.gitignore
similarity index 100%
rename from grToolkit/provider/.gitignore
rename to plugins/grToolkit/provider/.gitignore

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

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManager.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManager.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManager.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManager.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponse.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponse.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponse.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponse.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealth.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealth.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealth.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealth.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterActor.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterActor.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterActor.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterActor.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealth.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealth.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealth.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealth.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealth.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealth.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealth.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealth.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatus.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatus.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatus.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatus.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/Health.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/Health.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/Health.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/Health.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilder.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilder.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilder.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilder.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/PropertyKeys.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/PropertyKeys.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/PropertyKeys.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/PropertyKeys.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealth.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealth.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealth.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealth.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/HealthResolver.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/HealthResolver.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/HealthResolver.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/HealthResolver.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ShardResolver.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ShardResolver.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ShardResolver.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ShardResolver.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolver.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolver.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolver.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolver.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolver.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolver.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolver.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolver.java

diff --git a/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolver.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolver.java
similarity index 100%
rename from grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolver.java
rename to plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolver.java

diff --git a/grToolkit/provider/src/main/resources/gr-toolkit.properties b/plugins/grToolkit/provider/src/main/resources/gr-toolkit.properties
similarity index 100%
rename from grToolkit/provider/src/main/resources/gr-toolkit.properties
rename to plugins/grToolkit/provider/src/main/resources/gr-toolkit.properties

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

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionManagerTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/connection/ConnectionResponseTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/AdminHealthTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/ClusterHealthTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/DatabaseHealthTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/FailoverStatusTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/HealthTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/MemberBuilderTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/data/SiteHealthTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SingleNodeHealthResolverTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/SixNodeHealthResolverTest.java

diff --git a/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java
similarity index 100%
rename from grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java
rename to plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/resolver/ThreeNodeHealthResolverTest.java

diff --git a/grToolkit/provider/src/test/resources/akka.conf b/plugins/grToolkit/provider/src/test/resources/akka.conf
similarity index 100%
rename from grToolkit/provider/src/test/resources/akka.conf
rename to plugins/grToolkit/provider/src/test/resources/akka.conf

diff --git a/grToolkit/provider/src/test/resources/gr-toolkit.properties b/plugins/grToolkit/provider/src/test/resources/gr-toolkit.properties
similarity index 100%
rename from grToolkit/provider/src/test/resources/gr-toolkit.properties
rename to plugins/grToolkit/provider/src/test/resources/gr-toolkit.properties

diff --git a/grToolkit/provider/src/test/resources/single/akka.conf b/plugins/grToolkit/provider/src/test/resources/single/akka.conf
similarity index 100%
rename from grToolkit/provider/src/test/resources/single/akka.conf
rename to plugins/grToolkit/provider/src/test/resources/single/akka.conf

diff --git a/grToolkit/provider/src/test/resources/single/cluster.json b/plugins/grToolkit/provider/src/test/resources/single/cluster.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/single/cluster.json
rename to plugins/grToolkit/provider/src/test/resources/single/cluster.json

diff --git a/grToolkit/provider/src/test/resources/single/default-config.json b/plugins/grToolkit/provider/src/test/resources/single/default-config.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/single/default-config.json
rename to plugins/grToolkit/provider/src/test/resources/single/default-config.json

diff --git a/grToolkit/provider/src/test/resources/single/default-operational.json b/plugins/grToolkit/provider/src/test/resources/single/default-operational.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/single/default-operational.json
rename to plugins/grToolkit/provider/src/test/resources/single/default-operational.json

diff --git a/grToolkit/provider/src/test/resources/single/gr-toolkit.properties b/plugins/grToolkit/provider/src/test/resources/single/gr-toolkit.properties
similarity index 100%
rename from grToolkit/provider/src/test/resources/single/gr-toolkit.properties
rename to plugins/grToolkit/provider/src/test/resources/single/gr-toolkit.properties

diff --git a/grToolkit/provider/src/test/resources/single/shard-manager.json b/plugins/grToolkit/provider/src/test/resources/single/shard-manager.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/single/shard-manager.json
rename to plugins/grToolkit/provider/src/test/resources/single/shard-manager.json

diff --git a/grToolkit/provider/src/test/resources/six/akka.conf b/plugins/grToolkit/provider/src/test/resources/six/akka.conf
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/akka.conf
rename to plugins/grToolkit/provider/src/test/resources/six/akka.conf

diff --git a/grToolkit/provider/src/test/resources/six/cluster.json b/plugins/grToolkit/provider/src/test/resources/six/cluster.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/cluster.json
rename to plugins/grToolkit/provider/src/test/resources/six/cluster.json

diff --git a/grToolkit/provider/src/test/resources/six/component-health.json b/plugins/grToolkit/provider/src/test/resources/six/component-health.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/component-health.json
rename to plugins/grToolkit/provider/src/test/resources/six/component-health.json

diff --git a/grToolkit/provider/src/test/resources/six/default-config.json b/plugins/grToolkit/provider/src/test/resources/six/default-config.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/default-config.json
rename to plugins/grToolkit/provider/src/test/resources/six/default-config.json

diff --git a/grToolkit/provider/src/test/resources/six/default-operational.json b/plugins/grToolkit/provider/src/test/resources/six/default-operational.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/default-operational.json
rename to plugins/grToolkit/provider/src/test/resources/six/default-operational.json

diff --git a/grToolkit/provider/src/test/resources/six/gr-toolkit.properties b/plugins/grToolkit/provider/src/test/resources/six/gr-toolkit.properties
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/gr-toolkit.properties
rename to plugins/grToolkit/provider/src/test/resources/six/gr-toolkit.properties

diff --git a/grToolkit/provider/src/test/resources/six/shard-manager.json b/plugins/grToolkit/provider/src/test/resources/six/shard-manager.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/shard-manager.json
rename to plugins/grToolkit/provider/src/test/resources/six/shard-manager.json

diff --git a/grToolkit/provider/src/test/resources/six/site-identifier.json b/plugins/grToolkit/provider/src/test/resources/six/site-identifier.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/six/site-identifier.json
rename to plugins/grToolkit/provider/src/test/resources/six/site-identifier.json

diff --git a/grToolkit/provider/src/test/resources/three/akka.conf b/plugins/grToolkit/provider/src/test/resources/three/akka.conf
similarity index 100%
rename from grToolkit/provider/src/test/resources/three/akka.conf
rename to plugins/grToolkit/provider/src/test/resources/three/akka.conf

diff --git a/grToolkit/provider/src/test/resources/three/cluster.json b/plugins/grToolkit/provider/src/test/resources/three/cluster.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/three/cluster.json
rename to plugins/grToolkit/provider/src/test/resources/three/cluster.json

diff --git a/grToolkit/provider/src/test/resources/three/default-config.json b/plugins/grToolkit/provider/src/test/resources/three/default-config.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/three/default-config.json
rename to plugins/grToolkit/provider/src/test/resources/three/default-config.json

diff --git a/grToolkit/provider/src/test/resources/three/default-operational.json b/plugins/grToolkit/provider/src/test/resources/three/default-operational.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/three/default-operational.json
rename to plugins/grToolkit/provider/src/test/resources/three/default-operational.json

diff --git a/grToolkit/provider/src/test/resources/three/gr-toolkit.properties b/plugins/grToolkit/provider/src/test/resources/three/gr-toolkit.properties
similarity index 100%
rename from grToolkit/provider/src/test/resources/three/gr-toolkit.properties
rename to plugins/grToolkit/provider/src/test/resources/three/gr-toolkit.properties

diff --git a/grToolkit/provider/src/test/resources/three/shard-manager.json b/plugins/grToolkit/provider/src/test/resources/three/shard-manager.json
similarity index 100%
rename from grToolkit/provider/src/test/resources/three/shard-manager.json
rename to plugins/grToolkit/provider/src/test/resources/three/shard-manager.json

diff --git a/properties-node/.gitignore b/plugins/properties-node/.gitignore
similarity index 100%
rename from properties-node/.gitignore
rename to plugins/properties-node/.gitignore

diff --git a/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml
similarity index 100%
rename from properties-node/installer/pom.xml
rename to plugins/properties-node/installer/pom.xml

diff --git a/properties-node/installer/src/assembly/assemble_installer_zip.xml b/plugins/properties-node/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from properties-node/installer/src/assembly/assemble_installer_zip.xml
rename to plugins/properties-node/installer/src/assembly/assemble_installer_zip.xml

diff --git a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/plugins/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to plugins/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml

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

diff --git a/properties-node/pom.xml b/plugins/properties-node/pom.xml
similarity index 100%
rename from properties-node/pom.xml
rename to plugins/properties-node/pom.xml

diff --git a/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml
similarity index 100%
rename from properties-node/provider/pom.xml
rename to plugins/properties-node/provider/pom.xml

diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java b/plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java
similarity index 100%
rename from properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java
rename to plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java

diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java b/plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java
similarity index 100%
rename from properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java
rename to plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java

diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java b/plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
similarity index 100%
rename from properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
rename to plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java

diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java b/plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
similarity index 100%
rename from properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
rename to plugins/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java

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

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

diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java
similarity index 100%
rename from properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java
rename to plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java

diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
similarity index 100%
rename from properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java
rename to plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java

diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java b/plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java
similarity index 100%
rename from properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java
rename to plugins/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java

diff --git a/properties-node/provider/src/test/resources/invalidlength.xml b/plugins/properties-node/provider/src/test/resources/invalidlength.xml
similarity index 100%
rename from properties-node/provider/src/test/resources/invalidlength.xml
rename to plugins/properties-node/provider/src/test/resources/invalidlength.xml

diff --git a/properties-node/provider/src/test/resources/test b/plugins/properties-node/provider/src/test/resources/test
similarity index 100%
rename from properties-node/provider/src/test/resources/test
rename to plugins/properties-node/provider/src/test/resources/test

diff --git a/properties-node/provider/src/test/resources/test-invalid.json b/plugins/properties-node/provider/src/test/resources/test-invalid.json
similarity index 100%
rename from properties-node/provider/src/test/resources/test-invalid.json
rename to plugins/properties-node/provider/src/test/resources/test-invalid.json

diff --git a/properties-node/provider/src/test/resources/test-invalid.xml b/plugins/properties-node/provider/src/test/resources/test-invalid.xml
similarity index 100%
rename from properties-node/provider/src/test/resources/test-invalid.xml
rename to plugins/properties-node/provider/src/test/resources/test-invalid.xml

diff --git a/properties-node/provider/src/test/resources/test.json b/plugins/properties-node/provider/src/test/resources/test.json
similarity index 100%
rename from properties-node/provider/src/test/resources/test.json
rename to plugins/properties-node/provider/src/test/resources/test.json

diff --git a/properties-node/provider/src/test/resources/test.txt b/plugins/properties-node/provider/src/test/resources/test.txt
similarity index 100%
rename from properties-node/provider/src/test/resources/test.txt
rename to plugins/properties-node/provider/src/test/resources/test.txt

diff --git a/properties-node/provider/src/test/resources/test.xml b/plugins/properties-node/provider/src/test/resources/test.xml
similarity index 100%
rename from properties-node/provider/src/test/resources/test.xml
rename to plugins/properties-node/provider/src/test/resources/test.xml

diff --git a/properties-node/provider/src/test/resources/test3.xml b/plugins/properties-node/provider/src/test/resources/test3.xml
similarity index 100%
rename from properties-node/provider/src/test/resources/test3.xml
rename to plugins/properties-node/provider/src/test/resources/test3.xml

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

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

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

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

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

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

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

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

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

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

diff --git a/restapi-call-node/.gitignore b/plugins/restapi-call-node/.gitignore
similarity index 100%
rename from restapi-call-node/.gitignore
rename to plugins/restapi-call-node/.gitignore

diff --git a/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml
similarity index 100%
rename from restapi-call-node/installer/pom.xml
rename to plugins/restapi-call-node/installer/pom.xml

diff --git a/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml b/plugins/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from restapi-call-node/installer/src/assembly/assemble_installer_zip.xml
rename to plugins/restapi-call-node/installer/src/assembly/assemble_installer_zip.xml

diff --git a/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/plugins/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to plugins/restapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh b/plugins/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from restapi-call-node/installer/src/main/resources/scripts/install-feature.sh
rename to plugins/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh

diff --git a/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml
similarity index 100%
rename from restapi-call-node/pom.xml
rename to plugins/restapi-call-node/pom.xml

diff --git a/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml
similarity index 100%
rename from restapi-call-node/provider/pom.xml
rename to plugins/restapi-call-node/provider/pom.xml

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/AuthType.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/AuthType.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/AuthType.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/AuthType.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Format.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpMethod.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/HttpResponse.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/Parameters.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/PartnerDetails.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/PartnerDetails.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/PartnerDetails.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/PartnerDetails.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryException.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicy.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
similarity index 100%
rename from restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
rename to plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java

diff --git a/restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml b/plugins/restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml
rename to plugins/restapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/restapi-call-node-blueprint.xml

diff --git a/restapi-call-node/provider/src/main/resources/actokentemplate.json b/plugins/restapi-call-node/provider/src/main/resources/actokentemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/actokentemplate.json
rename to plugins/restapi-call-node/provider/src/main/resources/actokentemplate.json

diff --git a/restapi-call-node/provider/src/main/resources/default-ueb-message.json b/plugins/restapi-call-node/provider/src/main/resources/default-ueb-message.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/default-ueb-message.json
rename to plugins/restapi-call-node/provider/src/main/resources/default-ueb-message.json

diff --git a/restapi-call-node/provider/src/main/resources/get-multicast-data.json b/plugins/restapi-call-node/provider/src/main/resources/get-multicast-data.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/get-multicast-data.json
rename to plugins/restapi-call-node/provider/src/main/resources/get-multicast-data.json

diff --git a/restapi-call-node/provider/src/main/resources/l2-dci-connects-template.json b/plugins/restapi-call-node/provider/src/main/resources/l2-dci-connects-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/l2-dci-connects-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/l2-dci-connects-template.json

diff --git a/restapi-call-node/provider/src/main/resources/l3-dci-connects-template.json b/plugins/restapi-call-node/provider/src/main/resources/l3-dci-connects-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/l3-dci-connects-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/l3-dci-connects-template.json

diff --git a/restapi-call-node/provider/src/main/resources/l3smsitetemplate.json b/plugins/restapi-call-node/provider/src/main/resources/l3smsitetemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/l3smsitetemplate.json
rename to plugins/restapi-call-node/provider/src/main/resources/l3smsitetemplate.json

diff --git a/restapi-call-node/provider/src/main/resources/l3smvpntemplate.json b/plugins/restapi-call-node/provider/src/main/resources/l3smvpntemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/l3smvpntemplate.json
rename to plugins/restapi-call-node/provider/src/main/resources/l3smvpntemplate.json

diff --git a/restapi-call-node/provider/src/main/resources/l3smvrftemplate.json b/plugins/restapi-call-node/provider/src/main/resources/l3smvrftemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/l3smvrftemplate.json
rename to plugins/restapi-call-node/provider/src/main/resources/l3smvrftemplate.json

diff --git a/restapi-call-node/provider/src/main/resources/northbound-api-template.json b/plugins/restapi-call-node/provider/src/main/resources/northbound-api-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/northbound-api-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/northbound-api-template.json

diff --git a/restapi-call-node/provider/src/main/resources/northbound-api-template.xml b/plugins/restapi-call-node/provider/src/main/resources/northbound-api-template.xml
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/northbound-api-template.xml
rename to plugins/restapi-call-node/provider/src/main/resources/northbound-api-template.xml

diff --git a/restapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/restapi-call-node-blueprint.xml b/plugins/restapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/restapi-call-node-blueprint.xml
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/restapi-call-node-blueprint.xml
rename to plugins/restapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/restapi-call-node-blueprint.xml

diff --git a/restapi-call-node/provider/src/main/resources/service-configuration-notification-northbound-template.json b/plugins/restapi-call-node/provider/src/main/resources/service-configuration-notification-northbound-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/service-configuration-notification-northbound-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/service-configuration-notification-northbound-template.json

diff --git a/restapi-call-node/provider/src/main/resources/sptn-l3vpn-template.json b/plugins/restapi-call-node/provider/src/main/resources/sptn-l3vpn-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/sptn-l3vpn-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/sptn-l3vpn-template.json

diff --git a/restapi-call-node/provider/src/main/resources/update-vpe-data-with-apply-group.json b/plugins/restapi-call-node/provider/src/main/resources/update-vpe-data-with-apply-group.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/update-vpe-data-with-apply-group.json
rename to plugins/restapi-call-node/provider/src/main/resources/update-vpe-data-with-apply-group.json

diff --git a/restapi-call-node/provider/src/main/resources/vnf-information-update.json b/plugins/restapi-call-node/provider/src/main/resources/vnf-information-update.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/vnf-information-update.json
rename to plugins/restapi-call-node/provider/src/main/resources/vnf-information-update.json

diff --git a/restapi-call-node/provider/src/main/resources/vpn-allocation-request.json b/plugins/restapi-call-node/provider/src/main/resources/vpn-allocation-request.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/vpn-allocation-request.json
rename to plugins/restapi-call-node/provider/src/main/resources/vpn-allocation-request.json

diff --git a/restapi-call-node/provider/src/main/resources/vpn-information-update.json b/plugins/restapi-call-node/provider/src/main/resources/vpn-information-update.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/vpn-information-update.json
rename to plugins/restapi-call-node/provider/src/main/resources/vpn-information-update.json

diff --git a/restapi-call-node/provider/src/main/resources/vrf-service-configuration-information-template.json b/plugins/restapi-call-node/provider/src/main/resources/vrf-service-configuration-information-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/vrf-service-configuration-information-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/vrf-service-configuration-information-template.json

diff --git a/restapi-call-node/provider/src/main/resources/vrf-update-vlan-status-template.json b/plugins/restapi-call-node/provider/src/main/resources/vrf-update-vlan-status-template.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/vrf-update-vlan-status-template.json
rename to plugins/restapi-call-node/provider/src/main/resources/vrf-update-vlan-status-template.json

diff --git a/restapi-call-node/provider/src/main/resources/vrf-update.json b/plugins/restapi-call-node/provider/src/main/resources/vrf-update.json
similarity index 100%
rename from restapi-call-node/provider/src/main/resources/vrf-update.json
rename to plugins/restapi-call-node/provider/src/main/resources/vrf-update.json

diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java
similarity index 100%
rename from restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java
rename to plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MockCookieAuthServer.java

diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java
similarity index 100%
rename from restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java
rename to plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/MultipartServerMock.java

diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
similarity index 100%
rename from restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
rename to plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java

diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
similarity index 100%
rename from restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
rename to plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java

diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
similarity index 100%
rename from restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
rename to plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java

diff --git a/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
similarity index 100%
rename from restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
rename to plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java

diff --git a/restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java b/plugins/restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
similarity index 100%
rename from restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java
rename to plugins/restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java

diff --git a/restapi-call-node/provider/src/test/resources/1dArray.json b/plugins/restapi-call-node/provider/src/test/resources/1dArray.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/1dArray.json
rename to plugins/restapi-call-node/provider/src/test/resources/1dArray.json

diff --git a/restapi-call-node/provider/src/test/resources/2dArray.json b/plugins/restapi-call-node/provider/src/test/resources/2dArray.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/2dArray.json
rename to plugins/restapi-call-node/provider/src/test/resources/2dArray.json

diff --git a/restapi-call-node/provider/src/test/resources/3dArray.json b/plugins/restapi-call-node/provider/src/test/resources/3dArray.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/3dArray.json
rename to plugins/restapi-call-node/provider/src/test/resources/3dArray.json

diff --git a/restapi-call-node/provider/src/test/resources/ArrayMenu.json b/plugins/restapi-call-node/provider/src/test/resources/ArrayMenu.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/ArrayMenu.json
rename to plugins/restapi-call-node/provider/src/test/resources/ArrayMenu.json

diff --git a/restapi-call-node/provider/src/test/resources/EmbeddedEscapedJson.json b/plugins/restapi-call-node/provider/src/test/resources/EmbeddedEscapedJson.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/EmbeddedEscapedJson.json
rename to plugins/restapi-call-node/provider/src/test/resources/EmbeddedEscapedJson.json

diff --git a/restapi-call-node/provider/src/test/resources/EscapedJson.json b/plugins/restapi-call-node/provider/src/test/resources/EscapedJson.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/EscapedJson.json
rename to plugins/restapi-call-node/provider/src/test/resources/EscapedJson.json

diff --git a/restapi-call-node/provider/src/test/resources/ObjectMenu.json b/plugins/restapi-call-node/provider/src/test/resources/ObjectMenu.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/ObjectMenu.json
rename to plugins/restapi-call-node/provider/src/test/resources/ObjectMenu.json

diff --git a/restapi-call-node/provider/src/test/resources/Widget.json b/plugins/restapi-call-node/provider/src/test/resources/Widget.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/Widget.json
rename to plugins/restapi-call-node/provider/src/test/resources/Widget.json

diff --git a/restapi-call-node/provider/src/test/resources/actokentemplate.json b/plugins/restapi-call-node/provider/src/test/resources/actokentemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/actokentemplate.json
rename to plugins/restapi-call-node/provider/src/test/resources/actokentemplate.json

diff --git a/restapi-call-node/provider/src/test/resources/invalidlength.xml b/plugins/restapi-call-node/provider/src/test/resources/invalidlength.xml
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/invalidlength.xml
rename to plugins/restapi-call-node/provider/src/test/resources/invalidlength.xml

diff --git a/restapi-call-node/provider/src/test/resources/l2-dci-connects-template.json b/plugins/restapi-call-node/provider/src/test/resources/l2-dci-connects-template.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/l2-dci-connects-template.json
rename to plugins/restapi-call-node/provider/src/test/resources/l2-dci-connects-template.json

diff --git a/restapi-call-node/provider/src/test/resources/l3-dci-connects-template.json b/plugins/restapi-call-node/provider/src/test/resources/l3-dci-connects-template.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/l3-dci-connects-template.json
rename to plugins/restapi-call-node/provider/src/test/resources/l3-dci-connects-template.json

diff --git a/restapi-call-node/provider/src/test/resources/l3smsitetemplate.json b/plugins/restapi-call-node/provider/src/test/resources/l3smsitetemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/l3smsitetemplate.json
rename to plugins/restapi-call-node/provider/src/test/resources/l3smsitetemplate.json

diff --git a/restapi-call-node/provider/src/test/resources/l3smvpntemplate.json b/plugins/restapi-call-node/provider/src/test/resources/l3smvpntemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/l3smvpntemplate.json
rename to plugins/restapi-call-node/provider/src/test/resources/l3smvpntemplate.json

diff --git a/restapi-call-node/provider/src/test/resources/l3smvrftemplate.json b/plugins/restapi-call-node/provider/src/test/resources/l3smvrftemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/l3smvrftemplate.json
rename to plugins/restapi-call-node/provider/src/test/resources/l3smvrftemplate.json

diff --git a/restapi-call-node/provider/src/test/resources/partners.json b/plugins/restapi-call-node/provider/src/test/resources/partners.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/partners.json
rename to plugins/restapi-call-node/provider/src/test/resources/partners.json

diff --git a/restapi-call-node/provider/src/test/resources/sdwan-site.json b/plugins/restapi-call-node/provider/src/test/resources/sdwan-site.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/sdwan-site.json
rename to plugins/restapi-call-node/provider/src/test/resources/sdwan-site.json

diff --git a/restapi-call-node/provider/src/test/resources/sdwan-vpn-topology.json b/plugins/restapi-call-node/provider/src/test/resources/sdwan-vpn-topology.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/sdwan-vpn-topology.json
rename to plugins/restapi-call-node/provider/src/test/resources/sdwan-vpn-topology.json

diff --git a/restapi-call-node/provider/src/test/resources/test-template.json b/plugins/restapi-call-node/provider/src/test/resources/test-template.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/test-template.json
rename to plugins/restapi-call-node/provider/src/test/resources/test-template.json

diff --git a/restapi-call-node/provider/src/test/resources/test.json b/plugins/restapi-call-node/provider/src/test/resources/test.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/test.json
rename to plugins/restapi-call-node/provider/src/test/resources/test.json

diff --git a/restapi-call-node/provider/src/test/resources/test.xml b/plugins/restapi-call-node/provider/src/test/resources/test.xml
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/test.xml
rename to plugins/restapi-call-node/provider/src/test/resources/test.xml

diff --git a/restapi-call-node/provider/src/test/resources/test3.xml b/plugins/restapi-call-node/provider/src/test/resources/test3.xml
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/test3.xml
rename to plugins/restapi-call-node/provider/src/test/resources/test3.xml

diff --git a/restapi-call-node/provider/src/test/resources/testEmbeddedTemplate.json b/plugins/restapi-call-node/provider/src/test/resources/testEmbeddedTemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/testEmbeddedTemplate.json
rename to plugins/restapi-call-node/provider/src/test/resources/testEmbeddedTemplate.json

diff --git a/restapi-call-node/provider/src/test/resources/testMultiLineEmbeddedTemplate.json b/plugins/restapi-call-node/provider/src/test/resources/testMultiLineEmbeddedTemplate.json
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/testMultiLineEmbeddedTemplate.json
rename to plugins/restapi-call-node/provider/src/test/resources/testMultiLineEmbeddedTemplate.json

diff --git a/restapi-call-node/provider/src/test/resources/test_file.txt b/plugins/restapi-call-node/provider/src/test/resources/test_file.txt
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/test_file.txt
rename to plugins/restapi-call-node/provider/src/test/resources/test_file.txt

diff --git a/restapi-call-node/provider/src/test/resources/ueb.properties b/plugins/restapi-call-node/provider/src/test/resources/ueb.properties
similarity index 100%
rename from restapi-call-node/provider/src/test/resources/ueb.properties
rename to plugins/restapi-call-node/provider/src/test/resources/ueb.properties

diff --git a/restconf-client/.gitignore b/plugins/restconf-client/.gitignore
similarity index 100%
rename from restconf-client/.gitignore
rename to plugins/restconf-client/.gitignore

diff --git a/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
similarity index 100%
rename from restconf-client/installer/pom.xml
rename to plugins/restconf-client/installer/pom.xml

diff --git a/restconf-client/installer/src/assembly/assemble_installer_zip.xml b/plugins/restconf-client/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from restconf-client/installer/src/assembly/assemble_installer_zip.xml
rename to plugins/restconf-client/installer/src/assembly/assemble_installer_zip.xml

diff --git a/restconf-client/installer/src/assembly/assemble_mvnrepo_zip.xml b/plugins/restconf-client/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from restconf-client/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to plugins/restconf-client/installer/src/assembly/assemble_mvnrepo_zip.xml

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

diff --git a/restconf-client/pom.xml b/plugins/restconf-client/pom.xml
similarity index 100%
rename from restconf-client/pom.xml
rename to plugins/restconf-client/pom.xml

diff --git a/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml
similarity index 100%
rename from restconf-client/provider/pom.xml
rename to plugins/restconf-client/provider/pom.xml

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/AdditionalHeaderWebTarget.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/AdditionalHeaderWebTarget.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/AdditionalHeaderWebTarget.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/AdditionalHeaderWebTarget.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventHandler.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventHandler.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventHandler.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventHandler.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/RestconfDiscoveryNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/RestconfDiscoveryNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/RestconfDiscoveryNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/RestconfDiscoveryNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SubscriptionInfo.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SubscriptionInfo.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SubscriptionInfo.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SubscriptionInfo.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicDiscoveryPlugin.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicDiscoveryPlugin.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicDiscoveryPlugin.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicDiscoveryPlugin.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicGraphInfo.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicGraphInfo.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicGraphInfo.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SvcLogicGraphInfo.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Annotation.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Annotation.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Annotation.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Annotation.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormat.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormat.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormat.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormat.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializer.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializer.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializer.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializer.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerContext.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerContext.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerContext.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerContext.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonWalker.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonWalker.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonWalker.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultJsonWalker.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlWalker.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlWalker.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlWalker.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DefaultXmlWalker.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfListenerFactory.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfListenerFactory.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfListenerFactory.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfListenerFactory.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerFactory.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerFactory.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerFactory.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerFactory.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonSerializer.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonSerializer.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonSerializer.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonSerializer.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonWalker.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonWalker.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonWalker.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/JsonWalker.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Listener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Listener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Listener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/Listener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeJsonListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeJsonListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeJsonListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeJsonListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/SerializerHelper.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/SerializerHelper.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/SerializerHelper.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/SerializerHelper.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlNodeType.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlNodeType.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlNodeType.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlNodeType.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlSerializer.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlSerializer.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlSerializer.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlSerializer.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlWalker.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlWalker.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlWalker.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/XmlWalker.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/YangParameters.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/YangParameters.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/YangParameters.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/YangParameters.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DataNodeChild.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DataNodeChild.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DataNodeChild.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DataNodeChild.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeWalker.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeWalker.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeWalker.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeWalker.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/HolderNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/HolderNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/HolderNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/HolderNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderChild.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderChild.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderChild.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderChild.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafListHolderNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/LeafNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderChild.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderChild.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderChild.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderChild.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/ListHolderNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MultiInstanceNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MultiInstanceNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MultiInstanceNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MultiInstanceNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeChild.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeChild.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeChild.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeChild.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeType.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeType.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeType.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/NodeType.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeListener.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeListener.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeSerializer.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeSerializer.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeSerializer.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeSerializer.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeWalker.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeWalker.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeWalker.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesNodeWalker.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SchemaPathHolder.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SchemaPathHolder.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SchemaPathHolder.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SchemaPathHolder.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SingleInstanceNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SingleInstanceNode.java
similarity index 100%
rename from restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SingleInstanceNode.java
rename to plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/SingleInstanceNode.java

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

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

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SseServerMock.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SseServerMock.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SseServerMock.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/SseServerMock.java

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatUtilsTest.java

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationUtilsTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationUtilsTest.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationUtilsTest.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationUtilsTest.java

diff --git a/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java
similarity index 100%
rename from restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java
rename to plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java

diff --git a/restconf-client/provider/src/test/resources/yang/execution-service.yang b/plugins/restconf-client/provider/src/test/resources/yang/execution-service.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/execution-service.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/execution-service.yang

diff --git a/restconf-client/provider/src/test/resources/yang/identity-test.yang b/plugins/restconf-client/provider/src/test/resources/yang/identity-test.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/identity-test.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/identity-test.yang

diff --git a/restconf-client/provider/src/test/resources/yang/identity-types-second.yang b/plugins/restconf-client/provider/src/test/resources/yang/identity-types-second.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/identity-types-second.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/identity-types-second.yang

diff --git a/restconf-client/provider/src/test/resources/yang/identity-types.yang b/plugins/restconf-client/provider/src/test/resources/yang/identity-types.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/identity-types.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/identity-types.yang

diff --git a/restconf-client/provider/src/test/resources/yang/test-augment.yang b/plugins/restconf-client/provider/src/test/resources/yang/test-augment.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/test-augment.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/test-augment.yang

diff --git a/restconf-client/provider/src/test/resources/yang/test-yang.yang b/plugins/restconf-client/provider/src/test/resources/yang/test-yang.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/test-yang.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/test-yang.yang

diff --git a/restconf-client/provider/src/test/resources/yang/test_augment_1_for_module.yang b/plugins/restconf-client/provider/src/test/resources/yang/test_augment_1_for_module.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/test_augment_1_for_module.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/test_augment_1_for_module.yang

diff --git a/restconf-client/provider/src/test/resources/yang/test_name_of_the_module.yang b/plugins/restconf-client/provider/src/test/resources/yang/test_name_of_the_module.yang
similarity index 100%
rename from restconf-client/provider/src/test/resources/yang/test_name_of_the_module.yang
rename to plugins/restconf-client/provider/src/test/resources/yang/test_name_of_the_module.yang

diff --git a/sshapi-call-node/.gitignore b/plugins/sshapi-call-node/.gitignore
similarity index 100%
rename from sshapi-call-node/.gitignore
rename to plugins/sshapi-call-node/.gitignore

diff --git a/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml
similarity index 100%
rename from sshapi-call-node/installer/pom.xml
rename to plugins/sshapi-call-node/installer/pom.xml

diff --git a/sshapi-call-node/installer/src/assembly/assemble_installer_zip.xml b/plugins/sshapi-call-node/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from sshapi-call-node/installer/src/assembly/assemble_installer_zip.xml
rename to plugins/sshapi-call-node/installer/src/assembly/assemble_installer_zip.xml

diff --git a/sshapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/plugins/sshapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from sshapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to plugins/sshapi-call-node/installer/src/assembly/assemble_mvnrepo_zip.xml

diff --git a/sshapi-call-node/installer/src/main/resources/scripts/install-feature.sh b/plugins/sshapi-call-node/installer/src/main/resources/scripts/install-feature.sh
similarity index 100%
rename from sshapi-call-node/installer/src/main/resources/scripts/install-feature.sh
rename to plugins/sshapi-call-node/installer/src/main/resources/scripts/install-feature.sh

diff --git a/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml
similarity index 100%
rename from sshapi-call-node/pom.xml
rename to plugins/sshapi-call-node/pom.xml

diff --git a/sshapi-call-node/provider/ReadMe.md b/plugins/sshapi-call-node/provider/ReadMe.md
similarity index 100%
rename from sshapi-call-node/provider/ReadMe.md
rename to plugins/sshapi-call-node/provider/ReadMe.md

diff --git a/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml
similarity index 100%
rename from sshapi-call-node/provider/pom.xml
rename to plugins/sshapi-call-node/provider/pom.xml

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/AuthType.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/AuthType.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/AuthType.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/AuthType.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Format.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Format.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Format.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Format.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Parameters.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Parameters.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Parameters.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/Parameters.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlJsonUtil.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlJsonUtil.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlJsonUtil.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlJsonUtil.java

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlParser.java b/plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlParser.java
similarity index 100%
rename from sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlParser.java
rename to plugins/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/XmlParser.java

diff --git a/sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-context.xml b/plugins/sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-context.xml
similarity index 100%
rename from sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-context.xml
rename to plugins/sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-context.xml

diff --git a/sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-osgi-context.xml b/plugins/sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-osgi-context.xml
similarity index 100%
rename from sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-osgi-context.xml
rename to plugins/sshapi-call-node/provider/src/main/resources/META-INF/spring/sshapi-call-node-osgi-context.xml

diff --git a/sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml b/plugins/sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml
similarity index 100%
rename from sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml
rename to plugins/sshapi-call-node/provider/src/main/resources/OSGI-INF/blueprint/sshapi-call-node-blueprint.xml

diff --git a/sshapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/sshapi-call-node-blueprint.xml b/plugins/sshapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/sshapi-call-node-blueprint.xml
similarity index 100%
rename from sshapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/sshapi-call-node-blueprint.xml
rename to plugins/sshapi-call-node/provider/src/main/resources/org/opendaylight/blueprint/sshapi-call-node-blueprint.xml

diff --git a/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java b/plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
similarity index 100%
rename from sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java
rename to plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestJsonParser.java

diff --git a/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestSshApiCallNode.java b/plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestSshApiCallNode.java
similarity index 100%
rename from sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestSshApiCallNode.java
rename to plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestSshApiCallNode.java

diff --git a/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java b/plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
similarity index 100%
rename from sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java
rename to plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlJsonUtil.java

diff --git a/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java b/plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
similarity index 100%
rename from sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java
rename to plugins/sshapi-call-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/restapicall/TestXmlParser.java

diff --git a/sshapi-call-node/provider/src/test/resources/invalidlength.xml b/plugins/sshapi-call-node/provider/src/test/resources/invalidlength.xml
similarity index 100%
rename from sshapi-call-node/provider/src/test/resources/invalidlength.xml
rename to plugins/sshapi-call-node/provider/src/test/resources/invalidlength.xml

diff --git a/sshapi-call-node/provider/src/test/resources/test-template.json b/plugins/sshapi-call-node/provider/src/test/resources/test-template.json
similarity index 100%
rename from sshapi-call-node/provider/src/test/resources/test-template.json
rename to plugins/sshapi-call-node/provider/src/test/resources/test-template.json

diff --git a/sshapi-call-node/provider/src/test/resources/test.json b/plugins/sshapi-call-node/provider/src/test/resources/test.json
similarity index 100%
rename from sshapi-call-node/provider/src/test/resources/test.json
rename to plugins/sshapi-call-node/provider/src/test/resources/test.json

diff --git a/sshapi-call-node/provider/src/test/resources/test.xml b/plugins/sshapi-call-node/provider/src/test/resources/test.xml
similarity index 100%
rename from sshapi-call-node/provider/src/test/resources/test.xml
rename to plugins/sshapi-call-node/provider/src/test/resources/test.xml

diff --git a/sshapi-call-node/provider/src/test/resources/test3.xml b/plugins/sshapi-call-node/provider/src/test/resources/test3.xml
similarity index 100%
rename from sshapi-call-node/provider/src/test/resources/test3.xml
rename to plugins/sshapi-call-node/provider/src/test/resources/test3.xml

diff --git a/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml
similarity index 100%
rename from template-node/installer/pom.xml
rename to plugins/template-node/installer/pom.xml

diff --git a/template-node/installer/src/assembly/assemble_installer_zip.xml b/plugins/template-node/installer/src/assembly/assemble_installer_zip.xml
similarity index 100%
rename from template-node/installer/src/assembly/assemble_installer_zip.xml
rename to plugins/template-node/installer/src/assembly/assemble_installer_zip.xml

diff --git a/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/plugins/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml
similarity index 100%
rename from template-node/installer/src/assembly/assemble_mvnrepo_zip.xml
rename to plugins/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml

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

diff --git a/template-node/pom.xml b/plugins/template-node/pom.xml
similarity index 100%
rename from template-node/pom.xml
rename to plugins/template-node/pom.xml

diff --git a/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml
similarity index 100%
rename from template-node/provider/pom.xml
rename to plugins/template-node/provider/pom.xml

diff --git a/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java b/plugins/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java
similarity index 100%
rename from template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java
rename to plugins/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java

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

diff --git a/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/MockTemplateNode.java b/plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/MockTemplateNode.java
similarity index 100%
rename from template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/MockTemplateNode.java
rename to plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/MockTemplateNode.java

diff --git a/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java b/plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java
similarity index 100%
rename from template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java
rename to plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java

diff --git a/template-node/provider/src/test/resources/basic.vtl b/plugins/template-node/provider/src/test/resources/basic.vtl
similarity index 100%
rename from template-node/provider/src/test/resources/basic.vtl
rename to plugins/template-node/provider/src/test/resources/basic.vtl

diff --git a/template-node/provider/src/test/resources/template-node.properties b/plugins/template-node/provider/src/test/resources/template-node.properties
similarity index 100%
rename from template-node/provider/src/test/resources/template-node.properties
rename to plugins/template-node/provider/src/test/resources/template-node.properties