Add tosca-controlloop directory for TOSCA-POC dev

The module structure is:
./tosca-controlloop              (maven module)
./tosca-controlloop/common       (maven module, could be moved to policy-common)
./tosca-controlloop/design       (maven module, control loop design time component)
./tosca-controlloop/models       (maven module, should be moved to policy-models)
./tosca-controlloop/participants (maven modue for control loop participants)
./tosca-controlloop/runtime      (maven module, control loop run time component)

This patch also updates the repo to the current status of the master
branch

Issue-ID: POLICY-2971
Change-Id: I98c7e25f592cc7d9783d5daff3e9e3ad2e7b5214
Signed-off-by: liamfallon <liam.fallon@est.tech>

40 files changed, 1269 insertions, 320 deletions

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index b5e43be92..a884cfc49 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,10 +1,10 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "5.1.5-SNAPSHOT",
+    "version" : "6.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:38837",
+  "host" : "localhost:39481",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
@@ -988,33 +988,30 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "boolean" : {
-          "type" : "boolean"
-        },
-        "number" : {
-          "type" : "boolean"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
         },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
         },
+        "boolean" : {
+          "type" : "boolean"
+        },
+        "number" : {
+          "type" : "boolean"
+        },
         "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "asString" : {
+          "type" : "string"
         },
-        "asDouble" : {
+        "asFloat" : {
           "type" : "number",
-          "format" : "double"
+          "format" : "float"
         },
         "asByte" : {
           "type" : "string",
@@ -1033,32 +1030,35 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "string" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonPrimitive" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
         }
       }
     },
@@ -1137,24 +1137,9 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
         },
         "asLong" : {
           "type" : "integer",
@@ -1164,29 +1149,41 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "jsonArray" : {
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "asString" : {
+          "type" : "string"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "jsonObject" : {
           "type" : "boolean"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "jsonNull" : {
+          "type" : "boolean"
         },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
         },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
         "asCharacter" : {
           "type" : "string"
         },
@@ -1199,6 +1196,9 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         }
       },
       "x-className" : {
@@ -1335,24 +1335,9 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
         },
         "asLong" : {
           "type" : "integer",
@@ -1362,29 +1347,41 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "jsonArray" : {
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "asString" : {
+          "type" : "string"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "jsonObject" : {
           "type" : "boolean"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "jsonNull" : {
+          "type" : "boolean"
         },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
         },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
         "asCharacter" : {
           "type" : "string"
         },
@@ -1397,6 +1394,9 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         }
       }
     },
@@ -1406,12 +1406,9 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
         },
         "asLong" : {
           "type" : "integer",
@@ -1421,12 +1418,12 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "asString" : {
+          "type" : "string"
         },
-        "asDouble" : {
+        "asFloat" : {
           "type" : "number",
-          "format" : "double"
+          "format" : "float"
         },
         "asByte" : {
           "type" : "string",
@@ -1445,29 +1442,32 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonPrimitive" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
         }
       },
       "x-className" : {
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 2502cf1e8..c3de4c5fe 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20201211130920+01'00')
-/ModDate (D:20201211130920+01'00')
+/CreationDate (D:20210106171942+01'00')
+/ModDate (D:20210106171942+01'00')
 >>
 endobj
 2 0 obj
@@ -6791,7 +6791,7 @@ ET
 BT
 85.136384765625 660.036 Td
 /F1.0 10.5 Tf
-[<203a20352e312e352d534e415053484f> 20.01953125 <54>] TJ
+[<203a20362e302e302d534e415053484f> 20.01953125 <54>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -6824,7 +6824,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3338383337> Tj
+<203a206c6f63616c686f73743a3339343831> Tj
 ET
 
 0.000 0.000 0.000 SCN
diff --git a/extra/docker/clamp/docker-compose.yml b/extra/docker/clamp/docker-compose.yml
index 3a06212ae..f4f5b2bdd 100644
--- a/extra/docker/clamp/docker-compose.yml
+++ b/extra/docker/clamp/docker-compose.yml
@@ -2,9 +2,9 @@ version: '3.1'
 
 services:
   clamp-frontend:
-    image: onap/clamp-frontend
+    image: onap/policy-clamp-frontend
     depends_on:
-      - clamp-backend
+      - policy-clamp-backend
     ports:
       - "2443:2443"
   db:
@@ -19,7 +19,7 @@ services:
       - "3306:3306"
 
   clamp-backend:
-    image: onap/clamp-backend
+    image: onap/policy-clamp-backend
     depends_on:
       - db
       - third-party-proxy
diff --git a/pom.xml b/pom.xml
index 879bb36bc..99f8c05ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ONAP CLAMP
+  ONAP POLICY-CLAMP
   ================================================================================
-  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2021 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,10 +24,10 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.onap.clamp</groupId>
-	<artifactId>clds</artifactId>
+	<groupId>org.onap.policy</groupId>
+	<artifactId>clamp</artifactId>
 	<version>6.0.0-SNAPSHOT</version>
-	<name>clamp</name>
+	<name>policy-clamp</name>
 
 
     <parent>
@@ -38,19 +38,19 @@
     </parent>
 
 	<description>
-	       This is the MAVEN project that builds everything for ONAP CLAMP.
+	       This is the MAVEN project that builds everything for ONAP POLICY-CLAMP.
 	       Docker engine is normally requires to perfom all possible tasks (including integration tests)
 
            It can build:
-           - The ONAP CLAMP JAR that contains CLAMP back-end code.
+           - The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code.
            - The DOCKER images for:
-                * CLAMP backend (Java Spring)
-                * CLAMP frontend (Javscript React)
+                * POLICY-CLAMP backend (Java Spring)
+                * POLICY-CLAMP frontend (Javscript React)
 
            It can test:
-            - The CLAMP backend, JAVA unit testing
-            - The CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python)
-            - The CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React)
+            - The POLICY-CLAMP backend, JAVA unit testing
+            - The POLICY-CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python)
+            - The POLICY-CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React)
 
            The test coverage for dev's can be found after a "clean install" build in:
             - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged)
@@ -62,7 +62,7 @@
             - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it does not require a DOCKER engine
             - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images
 
-           To start CLAMP (Build it before):
+           To start POLICY-CLAMP (Build it before):
             - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml
             - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh
             - Use your IDE to use the Jar or start NVM/NPM
@@ -83,7 +83,6 @@
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/jacoco-html-xml-reports/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<sonar.log.level>DEBUG</sonar.log.level>
 		<sonar.nodejs.executable>${project.build.directory}/${ui.react.src}/node/node</sonar.nodejs.executable>
@@ -163,17 +162,17 @@
 	<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
-			<name>Clamp Release Repository</name>
+			<name>ONAP Release Repository</name>
 			<url>https://nexus.onap.org/content/repositories/releases/</url>
 		</repository>
 		<snapshotRepository>
 			<id>ecomp-snapshots</id>
-			<name>Clamp Snapshot Repository</name>
+			<name>ONAP Snapshot Repository</name>
 			<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 		</snapshotRepository>
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
+			<url>dav:https://nexus.onap.org/content/sites/site/org/onap/policy/clamp/${project.version}</url>
 		</site>
 	</distributionManagement>
 
@@ -545,7 +544,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>clamp</finalName>
+		<finalName>policy-clamp-backend</finalName>
 
 		<testResources>
 			<testResource>
@@ -664,7 +663,7 @@
 						</goals>
 						<configuration>
 							<packages>
-								<param>org.onap.clamp</param>
+								<param>org.onap.policy.clamp</param>
 							</packages>
 							<dialects>
 								<param>MARIADB53</param>
@@ -827,7 +826,7 @@
 						<configuration>
 							<artifacts>
 								<artifact>
-									<file>${project.build.directory}/clamp-classes.jar</file>
+									<file>${project.build.directory}/policy-clamp-backend-classes.jar</file>
 									<type>jar</type>
 									<classifier>classes</classifier>
 								</artifact>
@@ -983,8 +982,8 @@
 							</run>
 						</image>
 						<image>
-							<name>onap/clamp-backend</name>
-							<alias>onap-clamp-backend</alias>
+							<name>onap/policy-clamp-backend</name>
+							<alias>onap-policy-clamp-backend</alias>
 							<run>
 								<skip>true</skip>
 							</run>
@@ -1000,13 +999,13 @@
 								<dockerFile>backend/Dockerfile</dockerFile>
 								<assembly>
 									<descriptor>backend/backend-files.xml</descriptor>
-									<name>onap-clamp-backend</name>
+									<name>onap-policy-clamp-backend</name>
 								</assembly>
 							</build>
 						</image>
 						<image>
-							<name>onap/clamp-frontend</name>
-							<alias>onap-clamp-frontend</alias>
+							<name>onap/policy-clamp-frontend</name>
+							<alias>onap-policy-clamp-frontend</alias>
 							<run>
 								<skip>true</skip>
 							</run>
@@ -1022,7 +1021,7 @@
 								<dockerFile>frontend/Dockerfile</dockerFile>
 								<assembly>
 									<descriptor>frontend/frontend-files.xml</descriptor>
-									<name>onap-clamp-frontend</name>
+									<name>onap-policy-clamp-frontend</name>
 								</assembly>
 							</build>
 						</image>
@@ -1069,7 +1068,7 @@
 					<dumpOnExit>true</dumpOnExit>
 					<append>true</append>
 					<includes>
-						<include>org/onap/clamp/**</include>
+						<include>org/onap/policy/clamp/**</include>
 					</includes>
 				</configuration>
 				<executions>
@@ -1094,6 +1093,8 @@
 							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
 							<propertyName>failsafeArgLine</propertyName>
 							<!-- <append>true</append> -->
+							<!-- Need to overwrite the policy integration parent flag -->
+							<skip>false</skip>
 						</configuration>
 					</execution>
 					<execution>
diff --git a/releases/4.1.0.yaml b/releases/4.1.0.yaml
deleted file mode 100644
index f71e3f935..000000000
--- a/releases/4.1.0.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '4.1.0'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/81/'
\ No newline at end of file
diff --git a/releases/4.1.1.yaml b/releases/4.1.1.yaml
deleted file mode 100644
index 38cafe669..000000000
--- a/releases/4.1.1.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '4.1.1'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/118/'
\ No newline at end of file
diff --git a/releases/4.1.2-container.yaml b/releases/4.1.2-container.yaml
deleted file mode 100644
index 9eae7d7cf..000000000
--- a/releases/4.1.2-container.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '4.1.2'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/121/'
-ref: 9fb87912f025e85b26c238d286d87e0e1c9c767a
-containers:
-    - name: 'clamp-backend'
-      version: '4.1-STAGING-20190916T192828Z'
-    - name: 'clamp-frontend'
-      version: '4.1-STAGING-20190916T192828Z'
-    - name: 'clamp-dashboard-logstash'
-      version: '4.1-STAGING-20190916T192828Z'
-    - name: 'clamp-dashboard-kibana'
-      version: '4.1-STAGING-20190916T192828Z'
diff --git a/releases/4.1.2.yaml b/releases/4.1.2.yaml
deleted file mode 100644
index 845a675f7..000000000
--- a/releases/4.1.2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '4.1.2'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/133/'
\ No newline at end of file
diff --git a/releases/4.1.3-container.yaml b/releases/4.1.3-container.yaml
deleted file mode 100644
index 3c8e3333d..000000000
--- a/releases/4.1.3-container.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '4.1.3'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/156/'
-ref: 13ab11a844d840025d153f7eac9109fbbe1c6b08
-containers:
-    - name: 'clamp-backend'
-      version: '4.1-STAGING-20191011T120231Z'
-    - name: 'clamp-frontend'
-      version: '4.1-STAGING-20191011T120231Z'
-    - name: 'clamp-dashboard-logstash'
-      version: '4.1-STAGING-20191011T120231Z'
-    - name: 'clamp-dashboard-kibana'
-      version: '4.1-STAGING-20191011T120231Z'
\ No newline at end of file
diff --git a/releases/4.1.3.yaml b/releases/4.1.3.yaml
deleted file mode 100644
index e7295a1e3..000000000
--- a/releases/4.1.3.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '4.1.3'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/168/'
diff --git a/releases/5.0.0-container.yaml b/releases/5.0.0-container.yaml
deleted file mode 100644
index 8755d9d88..000000000
--- a/releases/5.0.0-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.0'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/348/'
-ref: a55638c236911d95ea0123a32321fcd9ed663fec
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200325T162914Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200325T162914Z'
\ No newline at end of file
diff --git a/releases/5.0.0.yaml b/releases/5.0.0.yaml
deleted file mode 100644
index f7e201b8b..000000000
--- a/releases/5.0.0.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.0'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/359/'
diff --git a/releases/5.0.1-container.yaml b/releases/5.0.1-container.yaml
deleted file mode 100644
index 1b3efa5c8..000000000
--- a/releases/5.0.1-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.1'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/358/'
-ref: 1f613808ed283069fe6d0eaa55420c6166e88782
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200330T104105Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200330T104105Z'
\ No newline at end of file
diff --git a/releases/5.0.1.yaml b/releases/5.0.1.yaml
deleted file mode 100644
index a8274da60..000000000
--- a/releases/5.0.1.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.1'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/369/'
diff --git a/releases/5.0.2-container.yaml b/releases/5.0.2-container.yaml
deleted file mode 100644
index a81ac8234..000000000
--- a/releases/5.0.2-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.2'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/366/'
-ref: 847bc29e6bdcb987a7aabdc50c3a9609a65e2696
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200402T141610Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200402T141610Z'
\ No newline at end of file
diff --git a/releases/5.0.2.yaml b/releases/5.0.2.yaml
deleted file mode 100644
index 326dfb182..000000000
--- a/releases/5.0.2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.2'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/377/'
diff --git a/releases/5.0.3-container.yaml b/releases/5.0.3-container.yaml
deleted file mode 100644
index bda152288..000000000
--- a/releases/5.0.3-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.3'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/369/'
-ref: cd46825cbd3a4ee82442ecc2873edd44cf4f4ccc
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200403T163216Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200403T163216Z'
\ No newline at end of file
diff --git a/releases/5.0.3.yaml b/releases/5.0.3.yaml
deleted file mode 100644
index c1e547132..000000000
--- a/releases/5.0.3.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.3'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/380/'
diff --git a/releases/5.0.4-container.yaml b/releases/5.0.4-container.yaml
deleted file mode 100644
index 94e8afaa1..000000000
--- a/releases/5.0.4-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.4'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/389/'
-ref: 9698b59ab5eab72437d8a0f501b21da22b302df3
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200420T122047Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200420T122047Z'
\ No newline at end of file
diff --git a/releases/5.0.4.yaml b/releases/5.0.4.yaml
deleted file mode 100644
index 335c79c77..000000000
--- a/releases/5.0.4.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.4'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/400/'
diff --git a/releases/5.0.5-container.yaml b/releases/5.0.5-container.yaml
deleted file mode 100644
index a808f11a9..000000000
--- a/releases/5.0.5-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.5'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/393/'
-ref: 6c42be8a5b9a90c3a2c2907174d4264cf5606ac4
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200423T085725Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200423T085725Z'
\ No newline at end of file
diff --git a/releases/5.0.5.yaml b/releases/5.0.5.yaml
deleted file mode 100644
index 8c6002412..000000000
--- a/releases/5.0.5.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.5'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/404/'
diff --git a/releases/5.0.6-container.yaml b/releases/5.0.6-container.yaml
deleted file mode 100644
index 640b407a2..000000000
--- a/releases/5.0.6-container.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-distribution_type: 'container'
-container_release_tag: '5.0.6'
-project: 'clamp'
-log_dir: 'clamp-maven-docker-stage-master/401/'
-ref: 975dccc51b43b5a4019c45f448e63a110e3bd603
-containers:
-    - name: 'clamp-backend'
-      version: '5.0-STAGING-20200429T150857Z'
-    - name: 'clamp-frontend'
-      version: '5.0-STAGING-20200429T150857Z'
\ No newline at end of file
diff --git a/releases/5.0.6.yaml b/releases/5.0.6.yaml
deleted file mode 100644
index a85a8440d..000000000
--- a/releases/5.0.6.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-distribution_type: 'maven'
-version: '5.0.6'
-project: 'clamp'
-log_dir: 'clamp-maven-stage-master/412/'
diff --git a/releases/6.0.0-container.yaml b/releases/6.0.0-container.yaml
new file mode 100644
index 000000000..da51a64fa
--- /dev/null
+++ b/releases/6.0.0-container.yaml
@@ -0,0 +1,10 @@
+distribution_type: 'container'
+container_release_tag: '6.0.0'
+project: 'policy-clamp'
+log_dir: 'policy-clamp-maven-docker-stage-master/13/'
+ref: cc026b95671b60d39bfcba5e63b60ba8f3944b70
+containers:
+  - name: 'policy-clamp-backend'
+    version: '6.0-STAGING-20210114T192452Z'
+  - name: 'policy-clamp-frontend'
+    version: '6.0-STAGING-20210114T192452Z'
\ No newline at end of file
diff --git a/releases/6.0.0.yaml b/releases/6.0.0.yaml
new file mode 100644
index 000000000..81ff597a8
--- /dev/null
+++ b/releases/6.0.0.yaml
@@ -0,0 +1,5 @@
+distribution_type: 'maven'
+version: '6.0.0'
+project: 'policy-clamp'
+tag_release: false
+log_dir: 'policy-clamp-maven-stage-master/13/'
\ No newline at end of file
diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile
index 8712f1934..63268d805 100644
--- a/src/main/docker/backend/Dockerfile
+++ b/src/main/docker/backend/Dockerfile
@@ -24,7 +24,7 @@
 FROM onap/integration-java11:7.1.0

 

 MAINTAINER "The Onap Team"

-LABEL Description="This image contains alpine, openjdk 11 and clamp"

+LABEL Description="This image contains alpine, openjdk 11 and policy clamp"

 

 ARG http_proxy

 ARG https_proxy

@@ -32,14 +32,16 @@ ENV HTTP_PROXY=$http_proxy
 ENV HTTPS_PROXY=$https_proxy

 ENV http_proxy=$HTTP_PROXY

 ENV https_proxy=$HTTPS_PROXY

+

 USER root

-RUN mkdir /opt/clamp

-RUN chown -R onap:onap /opt/clamp

 

-VOLUME /opt/clamp/config

+RUN mkdir -p /opt/policy/clamp && \

+    chown -R onap:onap /opt/policy/clamp

+

+VOLUME /opt/policy/clamp/config

 

-COPY --chown=onap:onap onap-clamp-backend/clamp.jar /opt/clamp/app.jar

+COPY --chown=onap:onap onap-policy-clamp-backend/policy-clamp-backend.jar /opt/policy/clamp/policy-clamp-backend.jar

 

 USER onap

-WORKDIR /opt/clamp/

-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75","-jar" ,"./app.jar"]
\ No newline at end of file
+WORKDIR /opt/policy/clamp/

+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"]
\ No newline at end of file
diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile
index 660fb8240..e67495350 100644
--- a/src/main/docker/frontend/Dockerfile
+++ b/src/main/docker/frontend/Dockerfile
@@ -25,9 +25,9 @@
 FROM node:12.10.0-alpine as build

 WORKDIR /app

 #ENV PATH /app/node_modules/.bin:$PATH

-COPY onap-clamp-frontend/ /app/

-RUN npm install --silent

-RUN npm run build

+COPY onap-policy-clamp-frontend/ /app/

+RUN npm install --silent && \

+    npm run build

 

 FROM nginx:1.17.0-alpine

 

@@ -41,14 +41,17 @@ ENV HTTPS_PROXY=$https_proxy
 ENV http_proxy=$HTTP_PROXY

 ENV https_proxy=$HTTPS_PROXY

 

-RUN addgroup onap && adduser -D -G onap clamp

-RUN mkdir /var/log/onap

-RUN chmod a+rwx /var/log/onap

+RUN addgroup onap && \

+    adduser -D -G onap clamp && \

+    mkdir /var/log/onap && \

+    chmod a+rwx /var/log/onap

 

 COPY --from=build /app/build /usr/share/nginx/html

 COPY --from=build /app/ssl /etc/ssl

-RUN rm /etc/nginx/conf.d/default.conf

-RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log

+

+RUN rm /etc/nginx/conf.d/default.conf && \

+    ln -sf /dev/stdout /var/log/nginx/access.log && \

+    ln -sf /dev/stderr /var/log/nginx/error.log

 

 COPY nginx/nginx.conf /etc/nginx/nginx.conf

 COPY nginx/default.conf /etc/nginx/conf.d/default.conf

@@ -58,8 +61,8 @@ WORKDIR /app
 RUN chown -R clamp:onap /app && chmod -R 755 /app && \

         chown -R clamp:onap /var/cache/nginx && \

         chown -R clamp:onap /var/log/nginx && \

-        chown -R clamp:onap /etc/nginx/conf.d

-RUN touch /var/run/nginx.pid && \

+        chown -R clamp:onap /etc/nginx/conf.d && \

+        touch /var/run/nginx.pid && \

         chown -R clamp:onap /var/run/nginx.pid

 

 USER clamp

diff --git a/src/main/resources/boot-message.txt b/src/main/resources/boot-message.txt
index ef1478b93..b0d68e04c 100644
--- a/src/main/resources/boot-message.txt
+++ b/src/main/resources/boot-message.txt
@@ -1,12 +1,21 @@
 
- ____ ____ ____ ____ _________ ____ ____ ____ ____ ____ ____
-||O |||N |||A |||P |||       |||G |||u |||i |||l |||i |||n ||
-||__|||__|||__|||__|||_______|||__|||__|||__|||__|||__|||__||
-|/__\|/__\|/__\|/__\|/_______\|/__\|/__\|/__\|/__\|/__\|/__\|
-            _________ ____ ____ ____ ____ ____
-           ||       |||C |||L |||A |||M |||P ||
-           ||_______|||__|||__|||__|||__|||__||
-           |/_______\|/__\|/__\|/__\|/__\|/__\|
+  ___   ____    ____  ____       __ __   ___   ____    ___   _      __ __  _      __ __
+ /   \ |    \  /    T|    \     |  T  T /   \ |    \  /   \ | T    |  T  T| T    |  T  T
+Y     Y|  _  YY  o  ||  o  )    |  l  |Y     Y|  _  YY     Y| |    |  |  || |    |  |  |
+|  O  ||  |  ||     ||   _/     |  _  ||  O  ||  |  ||  O  || l___ |  |  || l___ |  |  |
+|     ||  |  ||  _  ||  |       |  |  ||     ||  |  ||     ||     T|  :  ||     T|  :  |
+l     !|  |  ||  |  ||  |       |  |  |l     !|  |  |l     !|     |l     ||     |l     |
+ \___/ l__j__jl__j__jl__j       l__j__j \___/ l__j__j \___/ l_____j \__,_jl_____j \__,_j
+
+ ____    ___   _      ____    __  __ __            __  _       ____  ___ ___  ____
+|    \  /   \ | T    l    j  /  ]|  T  T          /  ]| T     /    T|   T   T|    \
+|  o  )Y     Y| |     |  T  /  / |  |  | _____   /  / | |    Y  o  || _   _ ||  o  )
+|   _/ |  O  || l___  |  | /  /  |  ~  ||     | /  /  | l___ |     ||  \_/  ||   _/
+|  |   |     ||     T |  |/   \_ l___, |l_____j/   \_ |     T|  _  ||   |   ||  |
+|  |   l     !|     | j  l\     ||     !       \     ||     ||  |  ||   |   ||  |
+l__j    \___/ l_____j|____j\____jl____/         \____jl_____jl__j__jl___j___jl__j
+
+
 
 
    :: Starting ::                    
\ No newline at end of file
diff --git a/src/main/resources/logback-default.xml b/src/main/resources/logback-default.xml
index e263a13fc..5397eab04 100644
--- a/src/main/resources/logback-default.xml
+++ b/src/main/resources/logback-default.xml
@@ -261,7 +261,7 @@
 
 	<!-- CLAMP related loggers -->
 	<logger
-		name="org.onap.clamp"
+		name="org.onap.policy.clamp"
 		level="DEBUG">
 		<appender-ref ref="ERROR" />
 		<appender-ref ref="DEBUG" />
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index c47cab31c..97a8982a9 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -64,7 +64,7 @@
 
     <!-- CLDS related loggers -->
     <logger
-        name="org.onap.clamp"
+        name="org.onap.policy.clamp"
         level="DEBUG">
         <appender-ref ref="STDOUT" />
     </logger>
diff --git a/tosca-controlloop/common/pom.xml b/tosca-controlloop/common/pom.xml
new file mode 100755
index 000000000..ad69440ea
--- /dev/null
+++ b/tosca-controlloop/common/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>controlloop</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>controlloop-common</artifactId>
+    <name>${project.artifactId}</name>
+</project>
diff --git a/tosca-controlloop/design/pom.xml b/tosca-controlloop/design/pom.xml
new file mode 100755
index 000000000..a3a09626a
--- /dev/null
+++ b/tosca-controlloop/design/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>controlloop</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>controlloop-design</artifactId>
+    <name>${project.artifactId}</name>
+</project>
diff --git a/tosca-controlloop/models/pom.xml b/tosca-controlloop/models/pom.xml
new file mode 100755
index 000000000..45e479849
--- /dev/null
+++ b/tosca-controlloop/models/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>controlloop</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>controlloop-models</artifactId>
+    <name>${project.artifactId}</name>
+</project>
diff --git a/tosca-controlloop/participants/pom.xml b/tosca-controlloop/participants/pom.xml
new file mode 100644
index 000000000..b84aa1599
--- /dev/null
+++ b/tosca-controlloop/participants/pom.xml
@@ -0,0 +1,125 @@
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>controlloop</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>controlloop-participants</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Participants instantiate/terminate components like ONAP Policy Framewora, DCAE etc.</description>
+
+    <properties>
+        <encoding>UTF-8</encoding>
+        <file.encoding>UTF-8</file.encoding>
+        <version.commons-cli>1.4</version.commons-cli>
+        <version.policy.common>1.8.0-SNAPSHOT</version.policy.common>
+        <version.policy.models>2.4.0-SNAPSHOT</version.policy.models>
+        <version.jgroups>4.1.5.Final</version.jgroups>
+        <version.commons-codec>20041127.091804</version.commons-codec>
+        <sonar.javascript.lcov.reportPaths>${project.basedir}/target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
+    </properties>
+
+    <dependencies>
+        <!--design dependencies -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils</artifactId>
+            <version>${version.policy.common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils-test</artifactId>
+            <version>${version.policy.common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>common-parameters</artifactId>
+            <version>${version.policy.common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+            <version>${version.policy.common}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jgroups</groupId>
+            <artifactId>jgroups</artifactId>
+            <version>${version.jgroups}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.models</groupId>
+            <artifactId>policy-models-pdp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>${version.policy.models}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+            <artifactId>dmaapClient</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--test dependencies -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tosca-controlloop/pom.xml b/tosca-controlloop/pom.xml
new file mode 100755
index 000000000..a328c03ee
--- /dev/null
+++ b/tosca-controlloop/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>clamp</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>controlloop</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>common</module>
+        <module>models</module>
+        <module>design</module>
+        <module>runtime</module>
+        <module>participants</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>common-parameters</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils-test</artifactId>
+            <version>${policy.common.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>gson</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.models</groupId>
+            <artifactId>policy-models-provider</artifactId>
+            <version>${policy.models.version}</version>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <resources>
+            <!-- Output the version of the control loop system -->
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/version.txt</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>**/version.txt</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+</project>
diff --git a/tosca-controlloop/postman/clamp-collection.json b/tosca-controlloop/postman/clamp-collection.json
new file mode 100644
index 000000000..34112b73e
--- /dev/null
+++ b/tosca-controlloop/postman/clamp-collection.json
@@ -0,0 +1,686 @@
+{
+    "info": {
+        "_postman_id": "05831254-6fad-419f-b10e-ff21cbbd365a",
+        "name": "Policy Framework Administration API",
+        "description": "This collection lists all the Administration API's supported by ONAP Policy Framework. These API's are used to perform administrative operations for managing policies, groups, statistics & health information for all registered PDP engines.",
+        "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+    },
+    "item": [
+        {
+            "name": "PAP healthcheck",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/healthcheck",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "healthcheck"
+                    ]
+                },
+                "description": "This is an API to fetch current healthcheck information for the policy-pap component."
+            },
+            "response": []
+        },
+        {
+            "name": "Policy Consolidated healthcheck",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "value": "application/json",
+                        "type": "text"
+                    },
+                    {
+                        "key": "Accept",
+                        "value": "application/json",
+                        "type": "text"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/components/healthcheck",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "components",
+                        "healthcheck"
+                    ]
+                },
+                "description": "This is an API to fetch current healthcheck information for all the policy framework components."
+            },
+            "response": []
+        },
+        {
+            "name": "PdpGroup Query",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps"
+                    ]
+                },
+                "description": "This is an API to fetch details of all PdpGroups currently available in Policy DB."
+            },
+            "response": []
+        },
+        {
+            "name": "PdpGroup State Change",
+            "request": {
+                "method": "PUT",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "value": "application/json",
+                        "type": "text"
+                    },
+                    {
+                        "key": "Accept",
+                        "value": "application/json",
+                        "type": "text"
+                    }
+                ],
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/groups/defaultGroup?state=ACTIVE",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "groups",
+                        "defaultGroup"
+                    ],
+                    "query": [
+                        {
+                            "key": "state",
+                            "value": "ACTIVE"
+                        }
+                    ]
+                },
+                "description": "This is an API to change the current state of a PdpGroup (example - \"defaultGroup\") resulting in changing state of all the PDP instances registered with the PdpGroup. As of now, the allowed states are ACTIVE and PASSIVE."
+            },
+            "response": []
+        },
+        {
+            "name": "Simple Deploy Policy",
+            "request": {
+                "method": "POST",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": "{\r\n  \"policies\" : [\r\n    {\r\n      \"policy-id\": \"operational.modifyconfig\",\r\n      \"policy-version\": \"1.0.0\"\r\n    }\r\n    ]\r\n}"
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/policies",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "policies"
+                    ]
+                },
+                "description": "This is an API to deploy one or more policies in all available & matching PdpGroups in Policy DB. The match is done based on supported policy types in the PdpSunGroup and the policy type referred by the given policy."
+            },
+            "response": []
+        },
+        {
+            "name": "Simple Undeploy Policy",
+            "request": {
+                "method": "DELETE",
+                "header": [
+                    {
+                        "key": "Accept",
+                        "value": "application/json",
+                        "type": "text"
+                    },
+                    {
+                        "key": "Content-Type",
+                        "value": "application/json",
+                        "type": "text"
+                    }
+                ],
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/policies/operational.modifyconfig",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "policies",
+                        "operational.modifyconfig"
+                    ]
+                },
+                "description": "This is an API to undeploy one or more policies from all PdpGroups in Policy DB."
+            },
+            "response": []
+        },
+        {
+            "name": "Create/Update PdpGroup",
+            "request": {
+                "method": "POST",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": "{\n    \"groups\": [\n        {\n            \"name\": \"SampleGroup\",\n            \"pdpGroupState\": \"ACTIVE\",\n            \"properties\": {},\n            \"pdpSubgroups\": [\n                {\n                    \"pdpType\": \"apex\",\n                    \"desiredInstanceCount\": 2,\n                    \"properties\": {},\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.operational.common.Apex\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": []\n                },\n                {\n                    \"pdpType\": \"xacml\",\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.monitoring.*\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": []\n                }\n            ]\n        }\n    ]\n}"
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/groups/batch",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "groups",
+                        "batch"
+                    ]
+                },
+                "description": "This is a generic API to create/update PdpGroups in Policy DB. However, the supportedPolicyTypes field of PdpSubGroup cannot be changed once created."
+            },
+            "response": []
+        },
+        {
+            "name": "PDPGroup Deploy Policy",
+            "request": {
+                "method": "POST",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": "{\n    \"groups\": [\n        {\n            \"name\": \"defaultGroup\",\n            \"deploymentSubgroups\": [\n                {\n                    \"pdpType\": \"drools\",\n                    \"action\": \"POST\",\n                    \"policies\": [\n                        {\n                            \"name\": \"operational.modifyconfig\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ]\n                }\n            ]\n        }\n    ]\n}"
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/deployments/batch",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "deployments",
+                        "batch"
+                    ]
+                },
+                "description": "This is an API to deploy one or more policies to the specified PdpGroup, resulting in deployment of policies to all registered PDP instances of that specified PdpGroup."
+            },
+            "response": []
+        },
+        {
+            "name": "PDPGroup Undeploy Policy",
+            "request": {
+                "method": "POST",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": "{\n    \"groups\": [\n        {\n            \"name\": \"defaultGroup\",\n            \"deploymentSubgroups\": [\n                {\n                    \"pdpType\": \"drools\",\n                    \"action\": \"DELETE\",\n                    \"policies\": [\n                        {\n                            \"name\": \"operational.modifyconfig\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ]\n                }\n            ]\n        }\n    ]\n}"
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/deployments/batch",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "deployments",
+                        "batch"
+                    ]
+                },
+                "description": "This is an API to undeploy one or more policies from the specified PdpGroup, resulting in removal of policies from all registered PDP instances of that specified PdpGroup."
+            },
+            "response": []
+        },
+        {
+            "name": "Fetch Policy deployment Status",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/policies/deployed/operational.modifyconfig",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "policies",
+                        "deployed",
+                        "operational.modifyconfig"
+                    ]
+                },
+                "description": "This is an API to fetch status of a specific deployed policy in the registered PDP instances."
+            },
+            "response": []
+        },
+        {
+            "name": "Fetch All Policy deployment Status",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/policies/deployed",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "policies",
+                        "deployed"
+                    ]
+                },
+                "description": "This is a generic API to fetch status of all deployed policies in the registered PDP instances."
+            },
+            "response": []
+        },
+        {
+            "name": "Fetch All PDPs Statistics",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "value": "application/json",
+                        "type": "text"
+                    },
+                    {
+                        "key": "Accept",
+                        "value": "application/json",
+                        "type": "text"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/statistics",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "statistics"
+                    ]
+                },
+                "description": "This is an API to fetch current statistics information for the all registered PDP instances."
+            },
+            "response": []
+        },
+        {
+            "name": "Fetch PdpGroup Statistics",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/statistics/defaultGroup",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "statistics",
+                        "defaultGroup"
+                    ]
+                },
+                "description": "This is an API to fetch current statistics information for the all registered PDP instances of the specified PdpGroup (example - \"defaultGroup\")."
+            },
+            "response": []
+        },
+        {
+            "name": "Fetch PdpSubGroup Statistics",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/statistics/defaultGroup/apex",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "statistics",
+                        "defaultGroup",
+                        "apex"
+                    ]
+                },
+                "description": "This is an API to fetch current statistics information for the all registered PDP instances of the specified PdpGroup (example - \"defaultGroup\") & PdpSubgroup (example - \"apex\")."
+            },
+            "response": []
+        },
+        {
+            "name": "Fetch PDP Statistics",
+            "protocolProfileBehavior": {
+                "disableBodyPruning": true
+            },
+            "request": {
+                "method": "GET",
+                "header": [
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "body": {
+                    "mode": "raw",
+                    "raw": ""
+                },
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/statistics/defaultGroup/apex/dev-policy-apex-pdp-0",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "statistics",
+                        "defaultGroup",
+                        "apex",
+                        "dev-policy-apex-pdp-0"
+                    ]
+                },
+                "description": "This is an API to fetch current statistics information for the specified PDP instance (example - \"dev-policy-apex-pdp-0\") of the specified PdpGroup (example - \"defaultGroup\") & PdpSubgroup (example - \"apex\")."
+            },
+            "response": []
+        },
+        {
+            "name": "Delete PdpGroup",
+            "request": {
+                "method": "DELETE",
+                "header": [
+                    {
+                        "key": "Accept",
+                        "type": "text",
+                        "value": "application/json"
+                    },
+                    {
+                        "key": "Content-Type",
+                        "type": "text",
+                        "value": "application/json"
+                    }
+                ],
+                "url": {
+                    "raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps/groups/SampleGroup",
+                    "host": [
+                        "{{POLICY-PAP-URL}}"
+                    ],
+                    "path": [
+                        "policy",
+                        "pap",
+                        "v1",
+                        "pdps",
+                        "groups",
+                        "SampleGroup"
+                    ]
+                },
+                "description": "This is an API to delete a specific PdpGroup (example - \"SampleGroup\") currently available in Policy DB, resulting in removing all the PDP instances registered with the group."
+            },
+            "response": []
+        }
+    ],
+    "auth": {
+        "type": "basic",
+        "basic": [
+            {
+                "key": "password",
+                "value": "{{PASSWORD}}",
+                "type": "string"
+            },
+            {
+                "key": "username",
+                "value": "{{USER}}",
+                "type": "string"
+            }
+        ]
+    },
+    "event": [
+        {
+            "listen": "prerequest",
+            "script": {
+                "id": "d6987a6d-a224-4288-a7bd-4c1c209a2637",
+                "type": "text/javascript",
+                "exec": [
+                    ""
+                ]
+            }
+        },
+        {
+            "listen": "test",
+            "script": {
+                "id": "731a9aab-e8f2-4dc6-941c-ac7e142c5177",
+                "type": "text/javascript",
+                "exec": [
+                    ""
+                ]
+            }
+        }
+    ],
+    "variable": [
+        {
+            "id": "bc82ca5c-f667-4118-9da1-e78a9b532b91",
+            "key": "USER",
+            "value": "healthcheck",
+            "type": "string"
+        },
+        {
+            "id": "1c2733ff-2507-49e8-ba07-b0f85ea97914",
+            "key": "PASSWORD",
+            "value": "zb!XztG34",
+            "type": "string"
+        }
+    ],
+    "protocolProfileBehavior": {}
+}
\ No newline at end of file
diff --git a/tosca-controlloop/runtime/pom.xml b/tosca-controlloop/runtime/pom.xml
new file mode 100644
index 000000000..d3bfd3925
--- /dev/null
+++ b/tosca-controlloop/runtime/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>controlloop</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>controlloop-runtime</artifactId>
+    <name>${project.artifactId}</name>
+    
+    <dependencies>
+      <dependency>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>controlloop-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>controlloop-models</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ui-react-lib/package.json b/ui-react-lib/package.json
index 39cf63a5b..b1efe2f8e 100755
--- a/ui-react-lib/package.json
+++ b/ui-react-lib/package.json
@@ -1,8 +1,8 @@
 {
-	"name": "onap-clamp-ui-lib",
+	"name": "onap-policy-clamp-ui-lib",
 	"version": "${project.version}",
-	"description": "ONAP CLAMP UI Reactjs Component Library",
-	"author": "ONAP Clamp Team",
+	"description": "ONAP Policy Clamp UI Library",
+	"author": "ONAP Policy Team",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "${npm.publish.url}"
diff --git a/ui-react/package.json b/ui-react/package.json
index 883a44165..232096926 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -1,8 +1,8 @@
 {
-	"name": "onap-clamp-ui",
+	"name": "onap-policy-clamp-ui",
 	"version": "${project.version}",
-	"description": "ONAP Clamp Loop Designer UI",
-	"author": "ONAP Clamp Team",
+	"description": "ONAP Policy Clamp UI",
+	"author": "ONAP Policy Team",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "${npm.publish.url}"