Change the java package name

Rename java package name to org.onap.policy.clamp instead of org.onap.clamp

Issue-ID: POLICY-2922
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ic3255b90fd52a7b2689ae7a55f55ee7841abebac
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

209 files changed, 2446 insertions, 2444 deletions

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 1c6dde16b..b5e43be92 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,16 +1,16 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "5.1.3-SNAPSHOT",
+    "version" : "5.1.5-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:8443",
+  "host" : "localhost:38837",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/clampInformation" : {
       "get" : {
-        "operationId" : "route34",
+        "operationId" : "route106",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,13 +20,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route34"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route106"
       }
     },
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route19",
+        "operationId" : "route91",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -36,11 +36,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route19"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route91"
       },
       "put" : {
-        "operationId" : "route22",
+        "operationId" : "route94",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -59,13 +59,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route94"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
       "get" : {
-        "operationId" : "route21",
+        "operationId" : "route93",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "dictionaryName",
@@ -81,13 +81,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route21"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route93"
       }
     },
     "/v2/dictionary/{name}" : {
       "put" : {
-        "operationId" : "route23",
+        "operationId" : "route95",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -111,11 +111,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route23"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route95"
       },
       "delete" : {
-        "operationId" : "route24",
+        "operationId" : "route96",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -126,13 +126,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route24"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route96"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
       "delete" : {
-        "operationId" : "route25",
+        "operationId" : "route97",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -148,13 +148,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route97"
       }
     },
     "/v2/dictionary/secondary/names" : {
       "get" : {
-        "operationId" : "route20",
+        "operationId" : "route92",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -167,13 +167,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route92"
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route3",
+        "operationId" : "route75",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -189,13 +189,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route3"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route75"
       }
     },
     "/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : {
       "put" : {
-        "operationId" : "route16",
+        "operationId" : "route88",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -221,13 +221,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route16"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route88"
       }
     },
     "/v2/loop/create/{loopName}?templateName={templateName}" : {
       "post" : {
-        "operationId" : "route18",
+        "operationId" : "route90",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -244,13 +244,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route18"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route90"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route14",
+        "operationId" : "route86",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -260,13 +260,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route14"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route86"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route7",
+        "operationId" : "route79",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -282,13 +282,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route7"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route79"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route2",
+        "operationId" : "route74",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -301,13 +301,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route2"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route74"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route15",
+        "operationId" : "route87",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -323,13 +323,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route15"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route87"
       }
     },
     "/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}" : {
       "put" : {
-        "operationId" : "route8",
+        "operationId" : "route80",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -350,13 +350,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route8"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route80"
       }
     },
     "/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}" : {
       "put" : {
-        "operationId" : "route9",
+        "operationId" : "route81",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -377,13 +377,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route9"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route81"
       }
     },
     "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" : {
       "put" : {
-        "operationId" : "route17",
+        "operationId" : "route89",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -414,13 +414,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route17"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route89"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route12",
+        "operationId" : "route84",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -436,13 +436,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route12"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route84"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route11",
+        "operationId" : "route83",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -458,13 +458,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route11"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route83"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route13",
+        "operationId" : "route85",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -480,13 +480,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route13"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route85"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route10",
+        "operationId" : "route82",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -502,13 +502,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route10"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route82"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route4",
+        "operationId" : "route76",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -532,13 +532,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route4"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route76"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route6",
+        "operationId" : "route78",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -562,13 +562,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route6"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route78"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route5",
+        "operationId" : "route77",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -592,13 +592,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route5"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route77"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route26",
+        "operationId" : "route98",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -608,11 +608,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route98"
       },
       "post" : {
-        "operationId" : "route29",
+        "operationId" : "route101",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -631,13 +631,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route101"
       }
     },
     "/v2/policyToscaModels/{policyModelType}/{policyModelVersion}" : {
       "get" : {
-        "operationId" : "route27",
+        "operationId" : "route99",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "policyModelType",
@@ -658,11 +658,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route27"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route99"
       },
       "put" : {
-        "operationId" : "route30",
+        "operationId" : "route102",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -691,13 +691,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route102"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}" : {
       "get" : {
-        "operationId" : "route28",
+        "operationId" : "route100",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "policyModelType",
@@ -718,13 +718,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route28"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route100"
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route31",
+        "operationId" : "route103",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -734,13 +734,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route31"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route103"
       }
     },
     "/v2/templates/{templateName}" : {
       "get" : {
-        "operationId" : "route32",
+        "operationId" : "route104",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -756,13 +756,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route32"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route104"
       }
     },
     "/v2/templates/names" : {
       "get" : {
-        "operationId" : "route33",
+        "operationId" : "route105",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -775,13 +775,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route33"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route105"
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route35",
+        "operationId" : "route107",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -791,19 +791,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route35"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route107"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route36",
+        "operationId" : "route108",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route36"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route108"
       }
     }
   },
@@ -826,7 +826,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.clds.model.ClampInformation"
+        "format" : "org.onap.policy.clamp.clds.model.ClampInformation"
       }
     },
     "Dictionary" : {
@@ -866,7 +866,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.tosca.Dictionary"
+        "format" : "org.onap.policy.clamp.tosca.Dictionary"
       }
     },
     "DictionaryElement" : {
@@ -979,7 +979,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.loop.Loop"
+        "format" : "org.onap.policy.clamp.loop.Loop"
       }
     },
     "JsonPrimitive" : {
@@ -988,18 +988,6 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
         "boolean" : {
           "type" : "boolean"
         },
@@ -1009,22 +997,24 @@
         "asString" : {
           "type" : "string"
         },
-        "asBigDecimal" : {
-          "type" : "number"
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "asShort" : {
+        "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
         },
         "asByte" : {
           "type" : "string",
@@ -1033,32 +1023,42 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "string" : {
-          "type" : "boolean"
+        "asBigDecimal" : {
+          "type" : "number"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "asBigInteger" : {
+          "type" : "integer"
         },
-        "jsonObject" : {
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "string" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "jsonPrimitive" : {
           "type" : "boolean"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         }
       }
     },
@@ -1128,7 +1128,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.policy.microservice.MicroServicePolicy"
+        "format" : "org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
       }
     },
     "JsonObject" : {
@@ -1137,46 +1137,51 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "asString" : {
+          "type" : "string"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "jsonObject" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asBigDecimal" : {
-          "type" : "number"
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "asShort" : {
+        "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1185,20 +1190,15 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asBigDecimal" : {
+          "type" : "number"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "asBigInteger" : {
+          "type" : "integer"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         }
       },
       "x-className" : {
@@ -1248,7 +1248,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.loop.template.PolicyModel"
+        "format" : "org.onap.policy.clamp.loop.template.PolicyModel"
       }
     },
     "Service" : {
@@ -1335,46 +1335,51 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "asString" : {
+          "type" : "string"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "jsonObject" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asBigDecimal" : {
-          "type" : "number"
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "asShort" : {
+        "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1383,20 +1388,15 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asBigDecimal" : {
+          "type" : "number"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
+        "asBigInteger" : {
+          "type" : "integer"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         }
       }
     },
@@ -1406,37 +1406,27 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asString" : {
+          "type" : "string"
         },
-        "asDouble" : {
+        "asFloat" : {
           "type" : "number",
-          "format" : "double"
+          "format" : "float"
         },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "asBigDecimal" : {
-          "type" : "number"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
+        "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asFloat" : {
+        "asDouble" : {
           "type" : "number",
-          "format" : "float"
+          "format" : "double"
         },
         "asByte" : {
           "type" : "string",
@@ -1445,29 +1435,39 @@
         "asCharacter" : {
           "type" : "string"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "asBigDecimal" : {
+          "type" : "number"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "jsonPrimitive" : {
           "type" : "boolean"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         }
       },
       "x-className" : {
@@ -1565,7 +1565,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.loop.template.LoopTemplate"
+        "format" : "org.onap.policy.clamp.loop.template.LoopTemplate"
       }
     },
     "ExternalComponentState" : {
@@ -1646,7 +1646,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.clds.model.CldsHealthCheck"
+        "format" : "org.onap.policy.clamp.clds.model.CldsHealthCheck"
       }
     }
   }
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 02b3dc4cc..2502cf1e8 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:20201009181937+02'00')
-/ModDate (D:20201009181937+02'00')
+/CreationDate (D:20201211130920+01'00')
+/ModDate (D:20201211130920+01'00')
 >>
 endobj
 2 0 obj
@@ -23,7 +23,7 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 38
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 29 0 R 45 0 R 61 0 R 75 0 R 87 0 R 98 0 R 110 0 R 123 0 R 134 0 R 144 0 R 159 0 R 173 0 R 186 0 R 199 0 R 214 0 R 225 0 R 238 0 R 247 0 R 254 0 R 260 0 R 267 0 R 273 0 R 281 0 R 288 0 R 296 0 R 304 0 R 311 0 R 318 0 R 326 0 R 336 0 R 343 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 29 0 R 45 0 R 61 0 R 75 0 R 87 0 R 98 0 R 110 0 R 123 0 R 133 0 R 144 0 R 160 0 R 174 0 R 187 0 R 200 0 R 214 0 R 225 0 R 237 0 R 247 0 R 254 0 R 260 0 R 267 0 R 273 0 R 281 0 R 288 0 R 296 0 R 304 0 R 311 0 R 318 0 R 326 0 R 336 0 R 343 0 R]
 >>
 endobj
 4 0 obj
@@ -6746,7 +6746,7 @@ endobj
 >>
 endobj
 19 0 obj
-<< /Length 2377
+<< /Length 2379
 >>
 stream
 q
@@ -6791,7 +6791,7 @@ ET
 BT
 85.136384765625 660.036 Td
 /F1.0 10.5 Tf
-[<203a20352e312e332d534e415053484f> 20.01953125 <54>] TJ
+[<203a20352e312e352d534e415053484f> 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
-<203a206c6f63616c686f73743a38343433> Tj
+<203a206c6f63616c686f73743a3338383337> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6939,7 +6939,7 @@ endobj
 >>
 endobj
 23 0 obj
-<< /Kids [56 0 R 258 0 R 320 0 R 155 0 R 242 0 R 90 0 R 152 0 R 221 0 R 57 0 R 201 0 R 125 0 R 236 0 R 84 0 R 206 0 R]
+<< /Kids [56 0 R 258 0 R 320 0 R 156 0 R 241 0 R 90 0 R 153 0 R 221 0 R 57 0 R 150 0 R 210 0 R 243 0 R 84 0 R 140 0 R]
 >>
 endobj
 24 0 obj
@@ -9195,12 +9195,12 @@ endobj
 endobj
 56 0 obj
 << /Limits [(_clampinformation) (_consumes_8)]
-/Names [(_clampinformation) 249 0 R (_cldshealthcheck) 250 0 R (_consumes) 54 0 R (_consumes_2) 73 0 R (_consumes_3) 100 0 R (_consumes_4) 171 0 R (_consumes_5) 180 0 R (_consumes_6) 189 0 R (_consumes_7) 203 0 R (_consumes_8) 228 0 R]
+/Names [(_clampinformation) 249 0 R (_cldshealthcheck) 250 0 R (_consumes) 54 0 R (_consumes_2) 73 0 R (_consumes_3) 100 0 R (_consumes_4) 172 0 R (_consumes_5) 181 0 R (_consumes_6) 190 0 R (_consumes_7) 203 0 R (_consumes_8) 228 0 R]
 >>
 endobj
 57 0 obj
 << /Limits [(_responses_10) (_responses_19)]
-/Names [(_responses_10) 83 0 R (_responses_11) 91 0 R (_responses_12) 96 0 R (_responses_13) 104 0 R (_responses_14) 107 0 R (_responses_15) 113 0 R (_responses_16) 117 0 R (_responses_17) 124 0 R (_responses_18) 130 0 R (_responses_19) 137 0 R]
+/Names [(_responses_10) 83 0 R (_responses_11) 91 0 R (_responses_12) 96 0 R (_responses_13) 104 0 R (_responses_14) 107 0 R (_responses_15) 113 0 R (_responses_16) 117 0 R (_responses_17) 124 0 R (_responses_18) 129 0 R (_responses_19) 136 0 R]
 >>
 endobj
 58 0 obj
@@ -11805,8 +11805,8 @@ endobj
 [75 0 R /XYZ 0 198.9600000000004 null]
 endobj
 84 0 obj
-<< /Limits [(_route2) (_route3)]
-/Names [(_route2) 112 0 R (_route20) 58 0 R (_route21) 63 0 R (_route22) 49 0 R (_route23) 68 0 R (_route24) 77 0 R (_route25) 81 0 R (_route26) 205 0 R (_route27) 216 0 R (_route28) 210 0 R (_route29) 196 0 R (_route3) 191 0 R]
+<< /Limits [(_route107) (_route88)]
+/Names [(_route107) 31 0 R (_route108) 36 0 R (_route74) 112 0 R (_route75) 192 0 R (_route76) 167 0 R (_route77) 183 0 R (_route78) 176 0 R (_route79) 105 0 R (_route80) 120 0 R (_route81) 127 0 R (_route82) 162 0 R (_route83) 147 0 R (_route84) 139 0 R (_route85) 154 0 R (_route86) 102 0 R (_route87) 115 0 R (_route88) 88 0 R]
 >>
 endobj
 85 0 obj
@@ -13021,7 +13021,7 @@ endobj
 endobj
 90 0 obj
 << /Limits [(_policymodel) (_produces_18)]
-/Names [(_policymodel) 340 0 R (_produces) 34 0 R (_produces_10) 85 0 R (_produces_11) 93 0 R (_produces_12) 101 0 R (_produces_13) 111 0 R (_produces_14) 114 0 R (_produces_15) 119 0 R (_produces_16) 127 0 R (_produces_17) 132 0 R (_produces_18) 139 0 R]
+/Names [(_policymodel) 340 0 R (_produces) 34 0 R (_produces_10) 85 0 R (_produces_11) 93 0 R (_produces_12) 101 0 R (_produces_13) 111 0 R (_produces_14) 114 0 R (_produces_15) 119 0 R (_produces_16) 126 0 R (_produces_17) 131 0 R (_produces_18) 138 0 R]
 >>
 endobj
 91 0 obj
@@ -16886,18 +16886,13 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [126 0 R 131 0 R]
+/Annots [125 0 R 130 0 R]
 >>
 endobj
 124 0 obj
 [123 0 R /XYZ 0 645.5999999999999 null]
 endobj
 125 0 obj
-<< /Limits [(_responses_30) (_responses_8)]
-/Names [(_responses_30) 212 0 R (_responses_31) 218 0 R (_responses_32) 226 0 R (_responses_33) 231 0 R (_responses_34) 235 0 R (_responses_35) 243 0 R (_responses_4) 46 0 R (_responses_5) 52 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 71 0 R]
->>
-endobj
-126 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -16905,19 +16900,19 @@ endobj
 /Type /Annot
 >>
 endobj
-127 0 obj
+126 0 obj
 [123 0 R /XYZ 0 540.48 null]
 endobj
-128 0 obj
+127 0 obj
 [123 0 R /XYZ 0 484.20000000000016 null]
 endobj
-129 0 obj
+128 0 obj
 [123 0 R /XYZ 0 387.96000000000015 null]
 endobj
-130 0 obj
+129 0 obj
 [123 0 R /XYZ 0 245.28000000000014 null]
 endobj
-131 0 obj
+130 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -16925,10 +16920,10 @@ endobj
 /Type /Annot
 >>
 endobj
-132 0 obj
+131 0 obj
 [123 0 R /XYZ 0 140.1600000000001 null]
 endobj
-133 0 obj
+132 0 obj
 << /Length 17251
 >>
 stream
@@ -18212,11 +18207,11 @@ Q
 
 endstream
 endobj
-134 0 obj
+133 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 133 0 R
+/Contents 132 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
@@ -18226,19 +18221,19 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [138 0 R]
+/Annots [137 0 R]
 >>
 endobj
+134 0 obj
+[133 0 R /XYZ 0 792.0 null]
+endobj
 135 0 obj
-[134 0 R /XYZ 0 792.0 null]
+[133 0 R /XYZ 0 662.1600000000001 null]
 endobj
 136 0 obj
-[134 0 R /XYZ 0 662.1600000000001 null]
+[133 0 R /XYZ 0 444.3600000000002 null]
 endobj
 137 0 obj
-[134 0 R /XYZ 0 444.3600000000002 null]
-endobj
-138 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -18246,17 +18241,22 @@ endobj
 /Type /Annot
 >>
 endobj
+138 0 obj
+[133 0 R /XYZ 0 339.2400000000001 null]
+endobj
 139 0 obj
-[134 0 R /XYZ 0 339.2400000000001 null]
+[133 0 R /XYZ 0 282.9600000000001 null]
 endobj
 140 0 obj
-[134 0 R /XYZ 0 282.9600000000001 null]
+<< /Limits [(_route89) (_version_information)]
+/Names [(_route89) 134 0 R (_route90) 94 0 R (_route91) 43 0 R (_route92) 58 0 R (_route93) 63 0 R (_route94) 49 0 R (_route95) 68 0 R (_route96) 77 0 R (_route97) 81 0 R (_route98) 205 0 R (_route99) 216 0 R (_service) 345 0 R (_uri_scheme) 27 0 R (_version_information) 25 0 R]
+>>
 endobj
 141 0 obj
-[134 0 R /XYZ 0 242.8800000000001 null]
+[133 0 R /XYZ 0 242.8800000000001 null]
 endobj
 142 0 obj
-[134 0 R /XYZ 0 137.76000000000008 null]
+[133 0 R /XYZ 0 137.76000000000008 null]
 endobj
 143 0 obj
 << /Length 19073
@@ -19682,7 +19682,7 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [145 0 R 150 0 R 157 0 R]
+/Annots [145 0 R 151 0 R 158 0 R]
 >>
 endobj
 145 0 obj
@@ -19706,6 +19706,11 @@ endobj
 [144 0 R /XYZ 0 481.68000000000046 null]
 endobj
 150 0 obj
+<< /Limits [(_responses_2) (_responses_28)]
+/Names [(_responses_2) 37 0 R (_responses_20) 142 0 R (_responses_21) 149 0 R (_responses_22) 157 0 R (_responses_23) 164 0 R (_responses_24) 170 0 R (_responses_25) 179 0 R (_responses_26) 188 0 R (_responses_27) 194 0 R (_responses_28) 201 0 R]
+>>
+endobj
+151 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -19713,29 +19718,29 @@ endobj
 /Type /Annot
 >>
 endobj
-151 0 obj
+152 0 obj
 [144 0 R /XYZ 0 376.5600000000004 null]
 endobj
-152 0 obj
+153 0 obj
 << /Limits [(_produces_19) (_produces_27)]
-/Names [(_produces_19) 146 0 R (_produces_2) 38 0 R (_produces_20) 151 0 R (_produces_21) 160 0 R (_produces_22) 165 0 R (_produces_23) 174 0 R (_produces_24) 181 0 R (_produces_25) 190 0 R (_produces_26) 195 0 R (_produces_27) 204 0 R]
+/Names [(_produces_19) 146 0 R (_produces_2) 38 0 R (_produces_20) 152 0 R (_produces_21) 161 0 R (_produces_22) 166 0 R (_produces_23) 175 0 R (_produces_24) 182 0 R (_produces_25) 191 0 R (_produces_26) 196 0 R (_produces_27) 204 0 R]
 >>
 endobj
-153 0 obj
+154 0 obj
 [144 0 R /XYZ 0 320.28000000000037 null]
 endobj
-154 0 obj
+155 0 obj
 [144 0 R /XYZ 0 280.20000000000033 null]
 endobj
-155 0 obj
+156 0 obj
 << /Limits [(_parameters_15) (_parameters_23)]
-/Names [(_parameters_15) 148 0 R (_parameters_16) 154 0 R (_parameters_17) 162 0 R (_parameters_18) 167 0 R (_parameters_19) 176 0 R (_parameters_2) 64 0 R (_parameters_20) 183 0 R (_parameters_21) 192 0 R (_parameters_22) 197 0 R (_parameters_23) 211 0 R]
+/Names [(_parameters_15) 148 0 R (_parameters_16) 155 0 R (_parameters_17) 163 0 R (_parameters_18) 168 0 R (_parameters_19) 177 0 R (_parameters_2) 64 0 R (_parameters_20) 184 0 R (_parameters_21) 193 0 R (_parameters_22) 198 0 R (_parameters_23) 211 0 R]
 >>
 endobj
-156 0 obj
+157 0 obj
 [144 0 R /XYZ 0 175.08000000000033 null]
 endobj
-157 0 obj
+158 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -19743,7 +19748,7 @@ endobj
 /Type /Annot
 >>
 endobj
-158 0 obj
+159 0 obj
 << /Length 18295
 >>
 stream
@@ -21078,11 +21083,11 @@ Q
 
 endstream
 endobj
-159 0 obj
+160 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 158 0 R
+/Contents 159 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
@@ -21092,22 +21097,22 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [164 0 R 168 0 R 170 0 R]
+/Annots [165 0 R 169 0 R 171 0 R]
 >>
 endobj
-160 0 obj
-[159 0 R /XYZ 0 792.0 null]
-endobj
 161 0 obj
-[159 0 R /XYZ 0 702.1200000000001 null]
+[160 0 R /XYZ 0 792.0 null]
 endobj
 162 0 obj
-[159 0 R /XYZ 0 662.0400000000002 null]
+[160 0 R /XYZ 0 702.1200000000001 null]
 endobj
 163 0 obj
-[159 0 R /XYZ 0 556.9200000000003 null]
+[160 0 R /XYZ 0 662.0400000000002 null]
 endobj
 164 0 obj
+[160 0 R /XYZ 0 556.9200000000003 null]
+endobj
+165 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -21115,16 +21120,16 @@ endobj
 /Type /Annot
 >>
 endobj
-165 0 obj
-[159 0 R /XYZ 0 451.8000000000004 null]
-endobj
 166 0 obj
-[159 0 R /XYZ 0 395.5200000000004 null]
+[160 0 R /XYZ 0 451.8000000000004 null]
 endobj
 167 0 obj
-[159 0 R /XYZ 0 355.44000000000034 null]
+[160 0 R /XYZ 0 395.5200000000004 null]
 endobj
 168 0 obj
+[160 0 R /XYZ 0 355.44000000000034 null]
+endobj
+169 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -21132,10 +21137,10 @@ endobj
 /Type /Annot
 >>
 endobj
-169 0 obj
-[159 0 R /XYZ 0 212.76000000000028 null]
-endobj
 170 0 obj
+[160 0 R /XYZ 0 212.76000000000028 null]
+endobj
+171 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -21143,10 +21148,10 @@ endobj
 /Type /Annot
 >>
 endobj
-171 0 obj
-[159 0 R /XYZ 0 107.64000000000024 null]
-endobj
 172 0 obj
+[160 0 R /XYZ 0 107.64000000000024 null]
+endobj
+173 0 obj
 << /Length 17036
 >>
 stream
@@ -22380,11 +22385,11 @@ Q
 
 endstream
 endobj
-173 0 obj
+174 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 172 0 R
+/Contents 173 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
@@ -22394,19 +22399,19 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [177 0 R 179 0 R 184 0 R]
+/Annots [178 0 R 180 0 R 185 0 R]
 >>
 endobj
-174 0 obj
-[173 0 R /XYZ 0 792.0 null]
-endobj
 175 0 obj
-[173 0 R /XYZ 0 702.1200000000001 null]
+[174 0 R /XYZ 0 792.0 null]
 endobj
 176 0 obj
-[173 0 R /XYZ 0 633.9600000000002 null]
+[174 0 R /XYZ 0 702.1200000000001 null]
 endobj
 177 0 obj
+[174 0 R /XYZ 0 633.9600000000002 null]
+endobj
+178 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -22414,10 +22419,10 @@ endobj
 /Type /Annot
 >>
 endobj
-178 0 obj
-[173 0 R /XYZ 0 491.28000000000026 null]
-endobj
 179 0 obj
+[174 0 R /XYZ 0 491.28000000000026 null]
+endobj
+180 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -22425,19 +22430,19 @@ endobj
 /Type /Annot
 >>
 endobj
-180 0 obj
-[173 0 R /XYZ 0 386.1600000000002 null]
-endobj
 181 0 obj
-[173 0 R /XYZ 0 329.88000000000017 null]
+[174 0 R /XYZ 0 386.1600000000002 null]
 endobj
 182 0 obj
-[173 0 R /XYZ 0 273.60000000000014 null]
+[174 0 R /XYZ 0 329.88000000000017 null]
 endobj
 183 0 obj
-[173 0 R /XYZ 0 205.44000000000014 null]
+[174 0 R /XYZ 0 273.60000000000014 null]
 endobj
 184 0 obj
+[174 0 R /XYZ 0 205.44000000000014 null]
+endobj
+185 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -22445,7 +22450,7 @@ endobj
 /Type /Annot
 >>
 endobj
-185 0 obj
+186 0 obj
 << /Length 16279
 >>
 stream
@@ -23643,11 +23648,11 @@ Q
 
 endstream
 endobj
-186 0 obj
+187 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 185 0 R
+/Contents 186 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
@@ -23657,13 +23662,13 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [188 0 R 194 0 R]
+/Annots [189 0 R 195 0 R]
 >>
 endobj
-187 0 obj
-[186 0 R /XYZ 0 792.0 null]
-endobj
 188 0 obj
+[187 0 R /XYZ 0 792.0 null]
+endobj
+189 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -23671,22 +23676,22 @@ endobj
 /Type /Annot
 >>
 endobj
-189 0 obj
-[186 0 R /XYZ 0 653.2800000000002 null]
-endobj
 190 0 obj
-[186 0 R /XYZ 0 597.0000000000003 null]
+[187 0 R /XYZ 0 653.2800000000002 null]
 endobj
 191 0 obj
-[186 0 R /XYZ 0 540.7200000000005 null]
+[187 0 R /XYZ 0 597.0000000000003 null]
 endobj
 192 0 obj
-[186 0 R /XYZ 0 500.6400000000005 null]
+[187 0 R /XYZ 0 540.7200000000005 null]
 endobj
 193 0 obj
-[186 0 R /XYZ 0 395.5200000000005 null]
+[187 0 R /XYZ 0 500.6400000000005 null]
 endobj
 194 0 obj
+[187 0 R /XYZ 0 395.5200000000005 null]
+endobj
+195 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -23694,16 +23699,16 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
-[186 0 R /XYZ 0 290.40000000000043 null]
-endobj
 196 0 obj
-[186 0 R /XYZ 0 234.1200000000004 null]
+[187 0 R /XYZ 0 290.40000000000043 null]
 endobj
 197 0 obj
-[186 0 R /XYZ 0 194.0400000000004 null]
+[187 0 R /XYZ 0 234.1200000000004 null]
 endobj
 198 0 obj
+[187 0 R /XYZ 0 194.0400000000004 null]
+endobj
+199 0 obj
 << /Length 15184
 >>
 stream
@@ -24806,11 +24811,11 @@ Q
 
 endstream
 endobj
-199 0 obj
+200 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 198 0 R
+/Contents 199 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
@@ -24820,16 +24825,11 @@ endobj
 /XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [202 0 R 208 0 R]
+/Annots [202 0 R 207 0 R]
 >>
 endobj
-200 0 obj
-[199 0 R /XYZ 0 792.0 null]
-endobj
 201 0 obj
-<< /Limits [(_responses_2) (_responses_3)]
-/Names [(_responses_2) 37 0 R (_responses_20) 142 0 R (_responses_21) 149 0 R (_responses_22) 156 0 R (_responses_23) 163 0 R (_responses_24) 169 0 R (_responses_25) 178 0 R (_responses_26) 187 0 R (_responses_27) 193 0 R (_responses_28) 200 0 R (_responses_29) 207 0 R (_responses_3) 40 0 R]
->>
+[200 0 R /XYZ 0 792.0 null]
 endobj
 202 0 obj
 << /Border [0 0 0]
@@ -24840,23 +24840,18 @@ endobj
 >>
 endobj
 203 0 obj
-[199 0 R /XYZ 0 653.2800000000002 null]
+[200 0 R /XYZ 0 653.2800000000002 null]
 endobj
 204 0 obj
-[199 0 R /XYZ 0 597.0000000000003 null]
+[200 0 R /XYZ 0 597.0000000000003 null]
 endobj
 205 0 obj
-[199 0 R /XYZ 0 540.7200000000005 null]
+[200 0 R /XYZ 0 540.7200000000005 null]
 endobj
 206 0 obj
-<< /Limits [(_route30) (_version_information)]
-/Names [(_route30) 222 0 R (_route31) 230 0 R (_route32) 240 0 R (_route33) 234 0 R (_route34) 39 0 R (_route35) 31 0 R (_route36) 36 0 R (_route4) 166 0 R (_route5) 182 0 R (_route6) 175 0 R (_route7) 105 0 R (_route8) 120 0 R (_route9) 128 0 R (_service) 345 0 R (_uri_scheme) 27 0 R (_version_information) 25 0 R]
->>
+[200 0 R /XYZ 0 500.6400000000005 null]
 endobj
 207 0 obj
-[199 0 R /XYZ 0 500.6400000000005 null]
-endobj
-208 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -24864,17 +24859,22 @@ endobj
 /Type /Annot
 >>
 endobj
+208 0 obj
+[200 0 R /XYZ 0 395.52000000000044 null]
+endobj
 209 0 obj
-[199 0 R /XYZ 0 395.52000000000044 null]
+[200 0 R /XYZ 0 339.2400000000004 null]
 endobj
 210 0 obj
-[199 0 R /XYZ 0 339.2400000000004 null]
+<< /Limits [(_responses_29) (_responses_5)]
+/Names [(_responses_29) 206 0 R (_responses_3) 40 0 R (_responses_30) 212 0 R (_responses_31) 218 0 R (_responses_32) 226 0 R (_responses_33) 231 0 R (_responses_34) 235 0 R (_responses_35) 242 0 R (_responses_4) 46 0 R (_responses_5) 52 0 R]
+>>
 endobj
 211 0 obj
-[199 0 R /XYZ 0 243.00000000000043 null]
+[200 0 R /XYZ 0 243.00000000000043 null]
 endobj
 212 0 obj
-[199 0 R /XYZ 0 100.32000000000039 null]
+[200 0 R /XYZ 0 100.32000000000039 null]
 endobj
 213 0 obj
 << /Length 14693
@@ -25987,7 +25987,7 @@ endobj
 endobj
 221 0 obj
 << /Limits [(_produces_28) (_responses)]
-/Names [(_produces_28) 209 0 R (_produces_29) 215 0 R (_produces_3) 42 0 R (_produces_30) 220 0 R (_produces_31) 229 0 R (_produces_32) 233 0 R (_produces_33) 239 0 R (_produces_34) 245 0 R (_produces_4) 48 0 R (_produces_5) 55 0 R (_produces_6) 62 0 R (_produces_7) 67 0 R (_produces_8) 76 0 R (_produces_9) 80 0 R (_responses) 32 0 R]
+/Names [(_produces_28) 208 0 R (_produces_29) 215 0 R (_produces_3) 42 0 R (_produces_30) 220 0 R (_produces_31) 229 0 R (_produces_32) 233 0 R (_produces_33) 238 0 R (_produces_34) 245 0 R (_produces_4) 48 0 R (_produces_5) 55 0 R (_produces_6) 62 0 R (_produces_7) 67 0 R (_produces_8) 76 0 R (_produces_9) 80 0 R (_responses) 32 0 R]
 >>
 endobj
 222 0 obj
@@ -27494,11 +27494,6 @@ endobj
 [225 0 R /XYZ 0 148.79999999999993 null]
 endobj
 236 0 obj
-<< /Limits [(_responses_9) (_route19)]
-/Names [(_responses_9) 79 0 R (_route10) 161 0 R (_route11) 147 0 R (_route12) 140 0 R (_route13) 153 0 R (_route14) 102 0 R (_route15) 115 0 R (_route16) 88 0 R (_route17) 135 0 R (_route18) 94 0 R (_route19) 43 0 R]
->>
-endobj
-237 0 obj
 << /Length 8598
 >>
 stream
@@ -28131,11 +28126,11 @@ Q
 
 endstream
 endobj
-238 0 obj
+237 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 237 0 R
+/Contents 236 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
@@ -28148,22 +28143,27 @@ endobj
 /Annots [244 0 R]
 >>
 endobj
+238 0 obj
+[237 0 R /XYZ 0 792.0 null]
+endobj
 239 0 obj
-[238 0 R /XYZ 0 792.0 null]
+[237 0 R /XYZ 0 702.1200000000001 null]
 endobj
 240 0 obj
-[238 0 R /XYZ 0 702.1200000000001 null]
+[237 0 R /XYZ 0 662.0400000000002 null]
 endobj
 241 0 obj
-[238 0 R /XYZ 0 662.0400000000002 null]
-endobj
-242 0 obj
 << /Limits [(_parameters_24) (_paths)]
-/Names [(_parameters_24) 217 0 R (_parameters_25) 223 0 R (_parameters_26) 241 0 R (_parameters_3) 69 0 R (_parameters_4) 78 0 R (_parameters_5) 82 0 R (_parameters_6) 89 0 R (_parameters_7) 95 0 R (_parameters_8) 103 0 R (_parameters_9) 106 0 R (_paths) 30 0 R]
+/Names [(_parameters_24) 217 0 R (_parameters_25) 223 0 R (_parameters_26) 240 0 R (_parameters_3) 69 0 R (_parameters_4) 78 0 R (_parameters_5) 82 0 R (_parameters_6) 89 0 R (_parameters_7) 95 0 R (_parameters_8) 103 0 R (_parameters_9) 106 0 R (_paths) 30 0 R]
 >>
 endobj
+242 0 obj
+[237 0 R /XYZ 0 556.9200000000003 null]
+endobj
 243 0 obj
-[238 0 R /XYZ 0 556.9200000000003 null]
+<< /Limits [(_responses_6) (_route106)]
+/Names [(_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 71 0 R (_responses_9) 79 0 R (_route100) 209 0 R (_route101) 197 0 R (_route102) 222 0 R (_route103) 230 0 R (_route104) 239 0 R (_route105) 234 0 R (_route106) 39 0 R]
+>>
 endobj
 244 0 obj
 << /Border [0 0 0]
@@ -28174,7 +28174,7 @@ endobj
 >>
 endobj
 245 0 obj
-[238 0 R /XYZ 0 451.8000000000004 null]
+[237 0 R /XYZ 0 451.8000000000004 null]
 endobj
 246 0 obj
 << /Length 17145
@@ -46554,7 +46554,7 @@ endobj
 endobj
 320 0 obj
 << /Limits [(_loopelementmodel) (_parameters_14)]
-/Names [(_loopelementmodel) 307 0 R (_looplog) 312 0 R (_looptemplate) 314 0 R (_looptemplateloopelementmodel) 319 0 R (_microservicepolicy) 323 0 R (_number) 331 0 R (_operationalpolicy) 332 0 R (_overview) 21 0 R (_parameters) 50 0 R (_parameters_10) 116 0 R (_parameters_11) 121 0 R (_parameters_12) 129 0 R (_parameters_13) 136 0 R (_parameters_14) 141 0 R]
+/Names [(_loopelementmodel) 307 0 R (_looplog) 312 0 R (_looptemplate) 314 0 R (_looptemplateloopelementmodel) 319 0 R (_microservicepolicy) 323 0 R (_number) 331 0 R (_operationalpolicy) 332 0 R (_overview) 21 0 R (_parameters) 50 0 R (_parameters_10) 116 0 R (_parameters_11) 121 0 R (_parameters_12) 128 0 R (_parameters_13) 135 0 R (_parameters_14) 141 0 R]
 >>
 endobj
 321 0 obj
@@ -50903,7 +50903,7 @@ endobj
 endobj
 356 0 obj
 << /Border [0 0 0]
-/Dest (_route35)
+/Dest (_route107)
 /Subtype /Link
 /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998]
 /Type /Annot
@@ -50911,7 +50911,7 @@ endobj
 endobj
 357 0 obj
 << /Border [0 0 0]
-/Dest (_route35)
+/Dest (_route107)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
@@ -50951,7 +50951,7 @@ endobj
 endobj
 362 0 obj
 << /Border [0 0 0]
-/Dest (_route36)
+/Dest (_route108)
 /Subtype /Link
 /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998]
 /Type /Annot
@@ -50959,7 +50959,7 @@ endobj
 endobj
 363 0 obj
 << /Border [0 0 0]
-/Dest (_route36)
+/Dest (_route108)
 /Subtype /Link
 /Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
 /Type /Annot
@@ -50999,7 +50999,7 @@ endobj
 endobj
 368 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_route106)
 /Subtype /Link
 /Rect [60.24000000000001 510.89999999999975 212.98350000000002 525.1799999999997]
 /Type /Annot
@@ -51007,7 +51007,7 @@ endobj
 endobj
 369 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_route106)
 /Subtype /Link
 /Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
 /Type /Annot
@@ -51047,7 +51047,7 @@ endobj
 endobj
 374 0 obj
 << /Border [0 0 0]
-/Dest (_route19)
+/Dest (_route91)
 /Subtype /Link
 /Rect [60.24000000000001 455.4599999999997 172.716 469.73999999999967]
 /Type /Annot
@@ -51055,7 +51055,7 @@ endobj
 endobj
 375 0 obj
 << /Border [0 0 0]
-/Dest (_route19)
+/Dest (_route91)
 /Subtype /Link
 /Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
 /Type /Annot
@@ -51095,7 +51095,7 @@ endobj
 endobj
 380 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_route94)
 /Subtype /Link
 /Rect [60.24000000000001 400.01999999999964 172.548 414.2999999999996]
 /Type /Annot
@@ -51103,7 +51103,7 @@ endobj
 endobj
 381 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_route94)
 /Subtype /Link
 /Rect [557.8905 400.01999999999964 563.76 414.2999999999996]
 /Type /Annot
@@ -51175,7 +51175,7 @@ endobj
 endobj
 390 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_route92)
 /Subtype /Link
 /Rect [60.24000000000001 307.61999999999955 263.25750000000005 321.8999999999995]
 /Type /Annot
@@ -51183,7 +51183,7 @@ endobj
 endobj
 391 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_route92)
 /Subtype /Link
 /Rect [557.8905 307.61999999999955 563.76 321.8999999999995]
 /Type /Annot
@@ -51223,7 +51223,7 @@ endobj
 endobj
 396 0 obj
 << /Border [0 0 0]
-/Dest (_route21)
+/Dest (_route93)
 /Subtype /Link
 /Rect [60.24000000000001 252.17999999999947 265.76700000000005 266.45999999999947]
 /Type /Annot
@@ -51231,7 +51231,7 @@ endobj
 endobj
 397 0 obj
 << /Border [0 0 0]
-/Dest (_route21)
+/Dest (_route93)
 /Subtype /Link
 /Rect [557.8905 252.17999999999947 563.76 266.45999999999947]
 /Type /Annot
@@ -51287,7 +51287,7 @@ endobj
 endobj
 404 0 obj
 << /Border [0 0 0]
-/Dest (_route23)
+/Dest (_route95)
 /Subtype /Link
 /Rect [60.24000000000001 178.2599999999995 212.763 192.5399999999995]
 /Type /Annot
@@ -51295,7 +51295,7 @@ endobj
 endobj
 405 0 obj
 << /Border [0 0 0]
-/Dest (_route23)
+/Dest (_route95)
 /Subtype /Link
 /Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
 /Type /Annot
@@ -51367,7 +51367,7 @@ endobj
 endobj
 414 0 obj
 << /Border [0 0 0]
-/Dest (_route24)
+/Dest (_route96)
 /Subtype /Link
 /Rect [60.24000000000001 85.85999999999956 232.70250000000001 100.13999999999956]
 /Type /Annot
@@ -51375,7 +51375,7 @@ endobj
 endobj
 415 0 obj
 << /Border [0 0 0]
-/Dest (_route24)
+/Dest (_route96)
 /Subtype /Link
 /Rect [557.8905 85.85999999999956 563.76 100.13999999999956]
 /Type /Annot
@@ -51431,7 +51431,7 @@ endobj
 endobj
 422 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route97)
 /Subtype /Link
 /Rect [60.24000000000001 723.2399999999999 354.36600000000004 737.52]
 /Type /Annot
@@ -51439,7 +51439,7 @@ endobj
 endobj
 423 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route97)
 /Subtype /Link
 /Rect [557.8905 723.2399999999999 563.76 737.52]
 /Type /Annot
@@ -51495,7 +51495,7 @@ endobj
 endobj
 430 0 obj
 << /Border [0 0 0]
-/Dest (_route16)
+/Dest (_route88)
 /Subtype /Link
 /Rect [60.24000000000001 649.3199999999998 531.1851796875001 663.5999999999999]
 /Type /Annot
@@ -51503,7 +51503,7 @@ endobj
 endobj
 431 0 obj
 << /Border [0 0 0]
-/Dest (_route16)
+/Dest (_route88)
 /Subtype /Link
 /Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
@@ -51559,7 +51559,7 @@ endobj
 endobj
 438 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_route90)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 418.877794921875 589.6799999999998]
 /Type /Annot
@@ -51567,7 +51567,7 @@ endobj
 endobj
 439 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_route90)
 /Subtype /Link
 /Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
@@ -51639,7 +51639,7 @@ endobj
 endobj
 448 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route86)
 /Subtype /Link
 /Rect [60.24000000000001 482.9999999999998 245.15550000000002 497.27999999999975]
 /Type /Annot
@@ -51647,7 +51647,7 @@ endobj
 endobj
 449 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route86)
 /Subtype /Link
 /Rect [557.8905 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
@@ -51687,7 +51687,7 @@ endobj
 endobj
 454 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_route79)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 248.431294921875 441.8399999999997]
 /Type /Annot
@@ -51695,7 +51695,7 @@ endobj
 endobj
 455 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_route79)
 /Subtype /Link
 /Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
@@ -51751,7 +51751,7 @@ endobj
 endobj
 462 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route74)
 /Subtype /Link
 /Rect [60.24000000000001 353.63999999999965 214.8735 367.9199999999996]
 /Type /Annot
@@ -51759,7 +51759,7 @@ endobj
 endobj
 463 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route74)
 /Subtype /Link
 /Rect [557.8905 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
@@ -51799,7 +51799,7 @@ endobj
 endobj
 468 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_route87)
 /Subtype /Link
 /Rect [60.24000000000001 298.1999999999996 259.467 312.47999999999956]
 /Type /Annot
@@ -51807,7 +51807,7 @@ endobj
 endobj
 469 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_route87)
 /Subtype /Link
 /Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
@@ -51863,7 +51863,7 @@ endobj
 endobj
 476 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route80)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 544.9515000000001 238.55999999999952]
 /Type /Annot
@@ -51871,7 +51871,7 @@ endobj
 endobj
 477 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route80)
 /Subtype /Link
 /Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
@@ -51927,7 +51927,7 @@ endobj
 endobj
 484 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_route81)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 530.5030898437501 164.63999999999956]
 /Type /Annot
@@ -51935,7 +51935,7 @@ endobj
 endobj
 485 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_route81)
 /Subtype /Link
 /Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
@@ -51991,7 +51991,7 @@ endobj
 endobj
 492 0 obj
 << /Border [0 0 0]
-/Dest (_route17)
+/Dest (_route89)
 /Subtype /Link
 /Rect [60.24000000000001 76.4399999999996 106.10400000000001 90.7199999999996]
 /Type /Annot
@@ -51999,7 +51999,7 @@ endobj
 endobj
 493 0 obj
 << /Border [0 0 0]
-/Dest (_route17)
+/Dest (_route89)
 /Subtype /Link
 /Rect [60.24000000000001 57.959999999999596 553.6761796875 72.2399999999996]
 /Type /Annot
@@ -52007,7 +52007,7 @@ endobj
 endobj
 494 0 obj
 << /Border [0 0 0]
-/Dest (_route17)
+/Dest (_route89)
 /Subtype /Link
 /Rect [60.24 741.7199999999999 80.26350000000001 756.0]
 /Type /Annot
@@ -52015,7 +52015,7 @@ endobj
 endobj
 495 0 obj
 << /Border [0 0 0]
-/Dest (_route17)
+/Dest (_route89)
 /Subtype /Link
 /Rect [552.021 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
@@ -52071,7 +52071,7 @@ endobj
 endobj
 502 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_route84)
 /Subtype /Link
 /Rect [60.24000000000001 667.7999999999998 248.45250000000001 682.0799999999999]
 /Type /Annot
@@ -52079,7 +52079,7 @@ endobj
 endobj
 503 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_route84)
 /Subtype /Link
 /Rect [552.021 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
@@ -52135,7 +52135,7 @@ endobj
 endobj
 510 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_route83)
 /Subtype /Link
 /Rect [60.24000000000001 593.8799999999998 235.842 608.1599999999999]
 /Type /Annot
@@ -52143,7 +52143,7 @@ endobj
 endobj
 511 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_route83)
 /Subtype /Link
 /Rect [552.021 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
@@ -52199,7 +52199,7 @@ endobj
 endobj
 518 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_route85)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 249.70200000000003 534.2399999999998]
 /Type /Annot
@@ -52207,7 +52207,7 @@ endobj
 endobj
 519 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_route85)
 /Subtype /Link
 /Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
@@ -52263,7 +52263,7 @@ endobj
 endobj
 526 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_route82)
 /Subtype /Link
 /Rect [60.24000000000001 446.03999999999974 261.860794921875 460.3199999999997]
 /Type /Annot
@@ -52271,7 +52271,7 @@ endobj
 endobj
 527 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_route82)
 /Subtype /Link
 /Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
@@ -52327,7 +52327,7 @@ endobj
 endobj
 534 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_route76)
 /Subtype /Link
 /Rect [60.24000000000001 372.11999999999966 339.560794921875 386.39999999999964]
 /Type /Annot
@@ -52335,7 +52335,7 @@ endobj
 endobj
 535 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_route76)
 /Subtype /Link
 /Rect [552.021 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
@@ -52407,7 +52407,7 @@ endobj
 endobj
 544 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_route78)
 /Subtype /Link
 /Rect [60.24000000000001 279.7199999999996 350.38629492187505 293.99999999999955]
 /Type /Annot
@@ -52415,7 +52415,7 @@ endobj
 endobj
 545 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_route78)
 /Subtype /Link
 /Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
@@ -52487,7 +52487,7 @@ endobj
 endobj
 554 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_route77)
 /Subtype /Link
 /Rect [60.24000000000001 187.31999999999954 352.81158984375 201.59999999999954]
 /Type /Annot
@@ -52495,7 +52495,7 @@ endobj
 endobj
 555 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_route77)
 /Subtype /Link
 /Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
@@ -52567,7 +52567,7 @@ endobj
 endobj
 564 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_route75)
 /Subtype /Link
 /Rect [60.24000000000001 94.91999999999959 212.0595 109.19999999999959]
 /Type /Annot
@@ -52575,7 +52575,7 @@ endobj
 endobj
 565 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_route75)
 /Subtype /Link
 /Rect [552.021 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
@@ -52631,7 +52631,7 @@ endobj
 endobj
 572 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_route101)
 /Subtype /Link
 /Rect [60.24000000000001 723.2399999999999 226.68805078125 737.52]
 /Type /Annot
@@ -52639,7 +52639,7 @@ endobj
 endobj
 573 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_route101)
 /Subtype /Link
 /Rect [552.021 723.2399999999999 563.76 737.52]
 /Type /Annot
@@ -52711,7 +52711,7 @@ endobj
 endobj
 582 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route98)
 /Subtype /Link
 /Rect [60.24000000000001 630.8399999999998 221.091755859375 645.1199999999999]
 /Type /Annot
@@ -52719,7 +52719,7 @@ endobj
 endobj
 583 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route98)
 /Subtype /Link
 /Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
@@ -52759,7 +52759,7 @@ endobj
 endobj
 588 0 obj
 << /Border [0 0 0]
-/Dest (_route28)
+/Dest (_route100)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 458.24414062500006 589.6799999999998]
 /Type /Annot
@@ -52767,7 +52767,7 @@ endobj
 endobj
 589 0 obj
 << /Border [0 0 0]
-/Dest (_route28)
+/Dest (_route100)
 /Subtype /Link
 /Rect [552.021 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
@@ -52823,7 +52823,7 @@ endobj
 endobj
 596 0 obj
 << /Border [0 0 0]
-/Dest (_route27)
+/Dest (_route99)
 /Subtype /Link
 /Rect [60.24000000000001 501.4799999999998 430.23014062500005 515.7599999999998]
 /Type /Annot
@@ -52831,7 +52831,7 @@ endobj
 endobj
 597 0 obj
 << /Border [0 0 0]
-/Dest (_route27)
+/Dest (_route99)
 /Subtype /Link
 /Rect [552.021 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
@@ -52887,7 +52887,7 @@ endobj
 endobj
 604 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route102)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 430.06214062500004 441.8399999999997]
 /Type /Annot
@@ -52895,7 +52895,7 @@ endobj
 endobj
 605 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route102)
 /Subtype /Link
 /Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
@@ -52967,7 +52967,7 @@ endobj
 endobj
 614 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route103)
 /Subtype /Link
 /Rect [60.24000000000001 335.1599999999996 175.8555 349.4399999999996]
 /Type /Annot
@@ -52975,7 +52975,7 @@ endobj
 endobj
 615 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route103)
 /Subtype /Link
 /Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
@@ -53015,7 +53015,7 @@ endobj
 endobj
 620 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route105)
 /Subtype /Link
 /Rect [60.24000000000001 279.7199999999996 211.818 293.99999999999955]
 /Type /Annot
@@ -53023,7 +53023,7 @@ endobj
 endobj
 621 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route105)
 /Subtype /Link
 /Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
@@ -53063,7 +53063,7 @@ endobj
 endobj
 626 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route104)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 261.44100000000003 238.55999999999952]
 /Type /Annot
@@ -53071,7 +53071,7 @@ endobj
 endobj
 627 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route104)
 /Subtype /Link
 /Rect [552.021 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
@@ -54170,7 +54170,7 @@ endobj
 /Last 755 0 R
 /Next 756 0 R
 /Prev 748 0 R
-/Dest [134 0 R /XYZ 0 792.0 null]
+/Dest [133 0 R /XYZ 0 792.0 null]
 >>
 endobj
 753 0 obj
@@ -54178,7 +54178,7 @@ endobj
 /Parent 752 0 R
 /Count 0
 /Next 754 0 R
-/Dest [134 0 R /XYZ 0 662.1600000000001 null]
+/Dest [133 0 R /XYZ 0 662.1600000000001 null]
 >>
 endobj
 754 0 obj
@@ -54187,7 +54187,7 @@ endobj
 /Count 0
 /Next 755 0 R
 /Prev 753 0 R
-/Dest [134 0 R /XYZ 0 444.3600000000002 null]
+/Dest [133 0 R /XYZ 0 444.3600000000002 null]
 >>
 endobj
 755 0 obj
@@ -54195,7 +54195,7 @@ endobj
 /Parent 752 0 R
 /Count 0
 /Prev 754 0 R
-/Dest [134 0 R /XYZ 0 339.2400000000001 null]
+/Dest [133 0 R /XYZ 0 339.2400000000001 null]
 >>
 endobj
 756 0 obj
@@ -54206,7 +54206,7 @@ endobj
 /Last 759 0 R
 /Next 760 0 R
 /Prev 752 0 R
-/Dest [134 0 R /XYZ 0 282.9600000000001 null]
+/Dest [133 0 R /XYZ 0 282.9600000000001 null]
 >>
 endobj
 757 0 obj
@@ -54214,7 +54214,7 @@ endobj
 /Parent 756 0 R
 /Count 0
 /Next 758 0 R
-/Dest [134 0 R /XYZ 0 242.8800000000001 null]
+/Dest [133 0 R /XYZ 0 242.8800000000001 null]
 >>
 endobj
 758 0 obj
@@ -54223,7 +54223,7 @@ endobj
 /Count 0
 /Next 759 0 R
 /Prev 757 0 R
-/Dest [134 0 R /XYZ 0 137.76000000000008 null]
+/Dest [133 0 R /XYZ 0 137.76000000000008 null]
 >>
 endobj
 759 0 obj
@@ -54303,7 +54303,7 @@ endobj
 /Parent 764 0 R
 /Count 0
 /Prev 766 0 R
-/Dest [159 0 R /XYZ 0 792.0 null]
+/Dest [160 0 R /XYZ 0 792.0 null]
 >>
 endobj
 768 0 obj
@@ -54314,7 +54314,7 @@ endobj
 /Last 771 0 R
 /Next 772 0 R
 /Prev 764 0 R
-/Dest [159 0 R /XYZ 0 702.1200000000001 null]
+/Dest [160 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 769 0 obj
@@ -54322,7 +54322,7 @@ endobj
 /Parent 768 0 R
 /Count 0
 /Next 770 0 R
-/Dest [159 0 R /XYZ 0 662.0400000000002 null]
+/Dest [160 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
 770 0 obj
@@ -54331,7 +54331,7 @@ endobj
 /Count 0
 /Next 771 0 R
 /Prev 769 0 R
-/Dest [159 0 R /XYZ 0 556.9200000000003 null]
+/Dest [160 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
 771 0 obj
@@ -54339,7 +54339,7 @@ endobj
 /Parent 768 0 R
 /Count 0
 /Prev 770 0 R
-/Dest [159 0 R /XYZ 0 451.8000000000004 null]
+/Dest [160 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
 772 0 obj
@@ -54350,7 +54350,7 @@ endobj
 /Last 776 0 R
 /Next 777 0 R
 /Prev 768 0 R
-/Dest [159 0 R /XYZ 0 395.5200000000004 null]
+/Dest [160 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
 773 0 obj
@@ -54358,7 +54358,7 @@ endobj
 /Parent 772 0 R
 /Count 0
 /Next 774 0 R
-/Dest [159 0 R /XYZ 0 355.44000000000034 null]
+/Dest [160 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
 774 0 obj
@@ -54367,7 +54367,7 @@ endobj
 /Count 0
 /Next 775 0 R
 /Prev 773 0 R
-/Dest [159 0 R /XYZ 0 212.76000000000028 null]
+/Dest [160 0 R /XYZ 0 212.76000000000028 null]
 >>
 endobj
 775 0 obj
@@ -54376,7 +54376,7 @@ endobj
 /Count 0
 /Next 776 0 R
 /Prev 774 0 R
-/Dest [159 0 R /XYZ 0 107.64000000000024 null]
+/Dest [160 0 R /XYZ 0 107.64000000000024 null]
 >>
 endobj
 776 0 obj
@@ -54384,7 +54384,7 @@ endobj
 /Parent 772 0 R
 /Count 0
 /Prev 775 0 R
-/Dest [173 0 R /XYZ 0 792.0 null]
+/Dest [174 0 R /XYZ 0 792.0 null]
 >>
 endobj
 777 0 obj
@@ -54395,7 +54395,7 @@ endobj
 /Last 781 0 R
 /Next 782 0 R
 /Prev 772 0 R
-/Dest [173 0 R /XYZ 0 702.1200000000001 null]
+/Dest [174 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 778 0 obj
@@ -54403,7 +54403,7 @@ endobj
 /Parent 777 0 R
 /Count 0
 /Next 779 0 R
-/Dest [173 0 R /XYZ 0 633.9600000000002 null]
+/Dest [174 0 R /XYZ 0 633.9600000000002 null]
 >>
 endobj
 779 0 obj
@@ -54412,7 +54412,7 @@ endobj
 /Count 0
 /Next 780 0 R
 /Prev 778 0 R
-/Dest [173 0 R /XYZ 0 491.28000000000026 null]
+/Dest [174 0 R /XYZ 0 491.28000000000026 null]
 >>
 endobj
 780 0 obj
@@ -54421,7 +54421,7 @@ endobj
 /Count 0
 /Next 781 0 R
 /Prev 779 0 R
-/Dest [173 0 R /XYZ 0 386.1600000000002 null]
+/Dest [174 0 R /XYZ 0 386.1600000000002 null]
 >>
 endobj
 781 0 obj
@@ -54429,7 +54429,7 @@ endobj
 /Parent 777 0 R
 /Count 0
 /Prev 780 0 R
-/Dest [173 0 R /XYZ 0 329.88000000000017 null]
+/Dest [174 0 R /XYZ 0 329.88000000000017 null]
 >>
 endobj
 782 0 obj
@@ -54440,7 +54440,7 @@ endobj
 /Last 786 0 R
 /Next 787 0 R
 /Prev 777 0 R
-/Dest [173 0 R /XYZ 0 273.60000000000014 null]
+/Dest [174 0 R /XYZ 0 273.60000000000014 null]
 >>
 endobj
 783 0 obj
@@ -54448,7 +54448,7 @@ endobj
 /Parent 782 0 R
 /Count 0
 /Next 784 0 R
-/Dest [173 0 R /XYZ 0 205.44000000000014 null]
+/Dest [174 0 R /XYZ 0 205.44000000000014 null]
 >>
 endobj
 784 0 obj
@@ -54457,7 +54457,7 @@ endobj
 /Count 0
 /Next 785 0 R
 /Prev 783 0 R
-/Dest [186 0 R /XYZ 0 792.0 null]
+/Dest [187 0 R /XYZ 0 792.0 null]
 >>
 endobj
 785 0 obj
@@ -54466,7 +54466,7 @@ endobj
 /Count 0
 /Next 786 0 R
 /Prev 784 0 R
-/Dest [186 0 R /XYZ 0 653.2800000000002 null]
+/Dest [187 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 786 0 obj
@@ -54474,7 +54474,7 @@ endobj
 /Parent 782 0 R
 /Count 0
 /Prev 785 0 R
-/Dest [186 0 R /XYZ 0 597.0000000000003 null]
+/Dest [187 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
 787 0 obj
@@ -54485,7 +54485,7 @@ endobj
 /Last 790 0 R
 /Next 791 0 R
 /Prev 782 0 R
-/Dest [186 0 R /XYZ 0 540.7200000000005 null]
+/Dest [187 0 R /XYZ 0 540.7200000000005 null]
 >>
 endobj
 788 0 obj
@@ -54493,7 +54493,7 @@ endobj
 /Parent 787 0 R
 /Count 0
 /Next 789 0 R
-/Dest [186 0 R /XYZ 0 500.6400000000005 null]
+/Dest [187 0 R /XYZ 0 500.6400000000005 null]
 >>
 endobj
 789 0 obj
@@ -54502,7 +54502,7 @@ endobj
 /Count 0
 /Next 790 0 R
 /Prev 788 0 R
-/Dest [186 0 R /XYZ 0 395.5200000000005 null]
+/Dest [187 0 R /XYZ 0 395.5200000000005 null]
 >>
 endobj
 790 0 obj
@@ -54510,7 +54510,7 @@ endobj
 /Parent 787 0 R
 /Count 0
 /Prev 789 0 R
-/Dest [186 0 R /XYZ 0 290.40000000000043 null]
+/Dest [187 0 R /XYZ 0 290.40000000000043 null]
 >>
 endobj
 791 0 obj
@@ -54521,7 +54521,7 @@ endobj
 /Last 795 0 R
 /Next 796 0 R
 /Prev 787 0 R
-/Dest [186 0 R /XYZ 0 234.1200000000004 null]
+/Dest [187 0 R /XYZ 0 234.1200000000004 null]
 >>
 endobj
 792 0 obj
@@ -54529,7 +54529,7 @@ endobj
 /Parent 791 0 R
 /Count 0
 /Next 793 0 R
-/Dest [186 0 R /XYZ 0 194.0400000000004 null]
+/Dest [187 0 R /XYZ 0 194.0400000000004 null]
 >>
 endobj
 793 0 obj
@@ -54538,7 +54538,7 @@ endobj
 /Count 0
 /Next 794 0 R
 /Prev 792 0 R
-/Dest [199 0 R /XYZ 0 792.0 null]
+/Dest [200 0 R /XYZ 0 792.0 null]
 >>
 endobj
 794 0 obj
@@ -54547,7 +54547,7 @@ endobj
 /Count 0
 /Next 795 0 R
 /Prev 793 0 R
-/Dest [199 0 R /XYZ 0 653.2800000000002 null]
+/Dest [200 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 795 0 obj
@@ -54555,7 +54555,7 @@ endobj
 /Parent 791 0 R
 /Count 0
 /Prev 794 0 R
-/Dest [199 0 R /XYZ 0 597.0000000000003 null]
+/Dest [200 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
 796 0 obj
@@ -54566,7 +54566,7 @@ endobj
 /Last 798 0 R
 /Next 799 0 R
 /Prev 791 0 R
-/Dest [199 0 R /XYZ 0 540.7200000000005 null]
+/Dest [200 0 R /XYZ 0 540.7200000000005 null]
 >>
 endobj
 797 0 obj
@@ -54574,7 +54574,7 @@ endobj
 /Parent 796 0 R
 /Count 0
 /Next 798 0 R
-/Dest [199 0 R /XYZ 0 500.6400000000005 null]
+/Dest [200 0 R /XYZ 0 500.6400000000005 null]
 >>
 endobj
 798 0 obj
@@ -54582,7 +54582,7 @@ endobj
 /Parent 796 0 R
 /Count 0
 /Prev 797 0 R
-/Dest [199 0 R /XYZ 0 395.52000000000044 null]
+/Dest [200 0 R /XYZ 0 395.52000000000044 null]
 >>
 endobj
 799 0 obj
@@ -54593,7 +54593,7 @@ endobj
 /Last 802 0 R
 /Next 803 0 R
 /Prev 796 0 R
-/Dest [199 0 R /XYZ 0 339.2400000000004 null]
+/Dest [200 0 R /XYZ 0 339.2400000000004 null]
 >>
 endobj
 800 0 obj
@@ -54601,7 +54601,7 @@ endobj
 /Parent 799 0 R
 /Count 0
 /Next 801 0 R
-/Dest [199 0 R /XYZ 0 243.00000000000043 null]
+/Dest [200 0 R /XYZ 0 243.00000000000043 null]
 >>
 endobj
 801 0 obj
@@ -54610,7 +54610,7 @@ endobj
 /Count 0
 /Next 802 0 R
 /Prev 800 0 R
-/Dest [199 0 R /XYZ 0 100.32000000000039 null]
+/Dest [200 0 R /XYZ 0 100.32000000000039 null]
 >>
 endobj
 802 0 obj
@@ -54753,7 +54753,7 @@ endobj
 /Parent 815 0 R
 /Count 0
 /Prev 816 0 R
-/Dest [238 0 R /XYZ 0 792.0 null]
+/Dest [237 0 R /XYZ 0 792.0 null]
 >>
 endobj
 818 0 obj
@@ -54763,7 +54763,7 @@ endobj
 /First 819 0 R
 /Last 821 0 R
 /Prev 815 0 R
-/Dest [238 0 R /XYZ 0 702.1200000000001 null]
+/Dest [237 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 819 0 obj
@@ -54771,7 +54771,7 @@ endobj
 /Parent 818 0 R
 /Count 0
 /Next 820 0 R
-/Dest [238 0 R /XYZ 0 662.0400000000002 null]
+/Dest [237 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
 820 0 obj
@@ -54780,7 +54780,7 @@ endobj
 /Count 0
 /Next 821 0 R
 /Prev 819 0 R
-/Dest [238 0 R /XYZ 0 556.9200000000003 null]
+/Dest [237 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
 821 0 obj
@@ -54788,7 +54788,7 @@ endobj
 /Parent 818 0 R
 /Count 0
 /Prev 820 0 R
-/Dest [238 0 R /XYZ 0 451.8000000000004 null]
+/Dest [237 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
 822 0 obj
@@ -55267,851 +55267,851 @@ xref
 0000130796 00000 n 
 0000143652 00000 n 
 0000144082 00000 n 
-0000146512 00000 n 
-0000146749 00000 n 
-0000146792 00000 n 
-0000146841 00000 n 
-0000146979 00000 n 
-0000147152 00000 n 
-0000147207 00000 n 
-0000147382 00000 n 
-0000147426 00000 n 
-0000159631 00000 n 
-0000159892 00000 n 
-0000159935 00000 n 
-0000159990 00000 n 
-0000160033 00000 n 
-0000160205 00000 n 
-0000160260 00000 n 
-0000160435 00000 n 
-0000160491 00000 n 
-0000160546 00000 n 
-0000160601 00000 n 
-0000160657 00000 n 
-0000160712 00000 n 
-0000160877 00000 n 
-0000160932 00000 n 
-0000160988 00000 n 
-0000177463 00000 n 
-0000177744 00000 n 
-0000177787 00000 n 
-0000177943 00000 n 
-0000177998 00000 n 
-0000178053 00000 n 
-0000178108 00000 n 
-0000178263 00000 n 
-0000178318 00000 n 
-0000178476 00000 n 
-0000178531 00000 n 
-0000178586 00000 n 
-0000178888 00000 n 
-0000179198 00000 n 
-0000179254 00000 n 
-0000179310 00000 n 
-0000197595 00000 n 
-0000197876 00000 n 
-0000197919 00000 n 
-0000197974 00000 n 
-0000198029 00000 n 
-0000198084 00000 n 
-0000198241 00000 n 
-0000198296 00000 n 
-0000198351 00000 n 
-0000198407 00000 n 
-0000198563 00000 n 
-0000198619 00000 n 
-0000198777 00000 n 
-0000198833 00000 n 
-0000214561 00000 n 
-0000214811 00000 n 
-0000214854 00000 n 
-0000214909 00000 n 
-0000214964 00000 n 
-0000215019 00000 n 
-0000215074 00000 n 
-0000215130 00000 n 
-0000215186 00000 n 
-0000215241 00000 n 
-0000215522 00000 n 
-0000215578 00000 n 
-0000231681 00000 n 
-0000231948 00000 n 
-0000231991 00000 n 
-0000232046 00000 n 
-0000232364 00000 n 
-0000232420 00000 n 
-0000232581 00000 n 
-0000232636 00000 n 
-0000232692 00000 n 
-0000232748 00000 n 
-0000232804 00000 n 
-0000250700 00000 n 
-0000250975 00000 n 
-0000251126 00000 n 
-0000251182 00000 n 
-0000251238 00000 n 
-0000251294 00000 n 
-0000251350 00000 n 
-0000251406 00000 n 
-0000251462 00000 n 
-0000251518 00000 n 
-0000251575 00000 n 
-0000251737 00000 n 
-0000265394 00000 n 
-0000265664 00000 n 
-0000265709 00000 n 
-0000265766 00000 n 
-0000265823 00000 n 
-0000265880 00000 n 
-0000265938 00000 n 
-0000265995 00000 n 
-0000266053 00000 n 
-0000266215 00000 n 
-0000266273 00000 n 
-0000266331 00000 n 
-0000266388 00000 n 
-0000285535 00000 n 
-0000285813 00000 n 
-0000285870 00000 n 
-0000286197 00000 n 
+0000146514 00000 n 
+0000146751 00000 n 
+0000146794 00000 n 
+0000146843 00000 n 
+0000146981 00000 n 
+0000147154 00000 n 
+0000147209 00000 n 
+0000147384 00000 n 
+0000147428 00000 n 
+0000159633 00000 n 
+0000159894 00000 n 
+0000159937 00000 n 
+0000159992 00000 n 
+0000160035 00000 n 
+0000160207 00000 n 
+0000160262 00000 n 
+0000160437 00000 n 
+0000160493 00000 n 
+0000160548 00000 n 
+0000160603 00000 n 
+0000160659 00000 n 
+0000160714 00000 n 
+0000160879 00000 n 
+0000160934 00000 n 
+0000160990 00000 n 
+0000177465 00000 n 
+0000177746 00000 n 
+0000177789 00000 n 
+0000177945 00000 n 
+0000178000 00000 n 
+0000178055 00000 n 
+0000178110 00000 n 
+0000178265 00000 n 
+0000178320 00000 n 
+0000178478 00000 n 
+0000178533 00000 n 
+0000178588 00000 n 
+0000178890 00000 n 
+0000179200 00000 n 
+0000179256 00000 n 
+0000179312 00000 n 
+0000197597 00000 n 
+0000197878 00000 n 
+0000197921 00000 n 
+0000197976 00000 n 
+0000198031 00000 n 
+0000198086 00000 n 
+0000198243 00000 n 
+0000198298 00000 n 
+0000198353 00000 n 
+0000198409 00000 n 
+0000198565 00000 n 
+0000198621 00000 n 
+0000198779 00000 n 
+0000198835 00000 n 
+0000214563 00000 n 
+0000214813 00000 n 
+0000214856 00000 n 
+0000214911 00000 n 
+0000214966 00000 n 
+0000215021 00000 n 
+0000215076 00000 n 
+0000215132 00000 n 
+0000215188 00000 n 
+0000215243 00000 n 
+0000215629 00000 n 
+0000215685 00000 n 
+0000231788 00000 n 
+0000232055 00000 n 
+0000232098 00000 n 
+0000232153 00000 n 
+0000232471 00000 n 
+0000232527 00000 n 
+0000232688 00000 n 
+0000232743 00000 n 
+0000232799 00000 n 
+0000232855 00000 n 
+0000232911 00000 n 
+0000250807 00000 n 
+0000251082 00000 n 
+0000251233 00000 n 
+0000251289 00000 n 
+0000251345 00000 n 
+0000251401 00000 n 
+0000251457 00000 n 
+0000251513 00000 n 
+0000251569 00000 n 
+0000251625 00000 n 
+0000251682 00000 n 
+0000251844 00000 n 
+0000265501 00000 n 
+0000265771 00000 n 
+0000265816 00000 n 
+0000265873 00000 n 
+0000265930 00000 n 
+0000265987 00000 n 
+0000266045 00000 n 
+0000266102 00000 n 
+0000266160 00000 n 
+0000266322 00000 n 
+0000266380 00000 n 
+0000266438 00000 n 
+0000266495 00000 n 
+0000285642 00000 n 
+0000285920 00000 n 
+0000285977 00000 n 
+0000286119 00000 n 
+0000286165 00000 n 
+0000286223 00000 n 
+0000286281 00000 n 
 0000286339 00000 n 
-0000286385 00000 n 
-0000286443 00000 n 
-0000286501 00000 n 
-0000286559 00000 n 
-0000286723 00000 n 
-0000286780 00000 n 
-0000304086 00000 n 
-0000304356 00000 n 
-0000304401 00000 n 
-0000304458 00000 n 
-0000304515 00000 n 
-0000304679 00000 n 
-0000304736 00000 n 
-0000304793 00000 n 
-0000304850 00000 n 
-0000304908 00000 n 
-0000324036 00000 n 
-0000324322 00000 n 
-0000324474 00000 n 
-0000324531 00000 n 
-0000324588 00000 n 
-0000324645 00000 n 
-0000324703 00000 n 
-0000324866 00000 n 
-0000324923 00000 n 
-0000325223 00000 n 
-0000325281 00000 n 
-0000325339 00000 n 
-0000325663 00000 n 
-0000325721 00000 n 
-0000325884 00000 n 
-0000344234 00000 n 
-0000344520 00000 n 
-0000344565 00000 n 
-0000344622 00000 n 
-0000344679 00000 n 
-0000344736 00000 n 
-0000344899 00000 n 
-0000344956 00000 n 
-0000345013 00000 n 
-0000345071 00000 n 
-0000345228 00000 n 
-0000345286 00000 n 
-0000345450 00000 n 
-0000345508 00000 n 
-0000362599 00000 n 
-0000362885 00000 n 
-0000362930 00000 n 
-0000362987 00000 n 
-0000363044 00000 n 
-0000363207 00000 n 
-0000363265 00000 n 
-0000363442 00000 n 
-0000363499 00000 n 
-0000363557 00000 n 
-0000363615 00000 n 
-0000363673 00000 n 
-0000363830 00000 n 
-0000380164 00000 n 
-0000380442 00000 n 
-0000380487 00000 n 
-0000380649 00000 n 
-0000380706 00000 n 
-0000380763 00000 n 
-0000380820 00000 n 
-0000380877 00000 n 
-0000380934 00000 n 
-0000381097 00000 n 
-0000381155 00000 n 
-0000381212 00000 n 
-0000381269 00000 n 
-0000396508 00000 n 
-0000396786 00000 n 
-0000396831 00000 n 
-0000397187 00000 n 
-0000397346 00000 n 
-0000397403 00000 n 
-0000397460 00000 n 
-0000397517 00000 n 
-0000397901 00000 n 
-0000397958 00000 n 
-0000398118 00000 n 
-0000398176 00000 n 
-0000398233 00000 n 
-0000398291 00000 n 
-0000398349 00000 n 
-0000413097 00000 n 
-0000413367 00000 n 
-0000413424 00000 n 
-0000413481 00000 n 
-0000413538 00000 n 
-0000413595 00000 n 
-0000413754 00000 n 
-0000413812 00000 n 
-0000414210 00000 n 
-0000414268 00000 n 
-0000414326 00000 n 
-0000433587 00000 n 
-0000433865 00000 n 
-0000433911 00000 n 
-0000434060 00000 n 
-0000434117 00000 n 
-0000434175 00000 n 
-0000434221 00000 n 
-0000434267 00000 n 
-0000434438 00000 n 
-0000434496 00000 n 
-0000434554 00000 n 
-0000434612 00000 n 
-0000434889 00000 n 
-0000443541 00000 n 
-0000443811 00000 n 
-0000443856 00000 n 
-0000443913 00000 n 
-0000443970 00000 n 
-0000444292 00000 n 
-0000444349 00000 n 
-0000444520 00000 n 
-0000444577 00000 n 
-0000461777 00000 n 
-0000462034 00000 n 
-0000462079 00000 n 
-0000462136 00000 n 
-0000462182 00000 n 
-0000462240 00000 n 
-0000462418 00000 n 
-0000482324 00000 n 
-0000482581 00000 n 
-0000482627 00000 n 
-0000482781 00000 n 
-0000482839 00000 n 
-0000483145 00000 n 
-0000503693 00000 n 
-0000503966 00000 n 
-0000504127 00000 n 
-0000504184 00000 n 
-0000504241 00000 n 
-0000504411 00000 n 
-0000504578 00000 n 
-0000525981 00000 n 
-0000526254 00000 n 
-0000526403 00000 n 
-0000526574 00000 n 
-0000526733 00000 n 
-0000526790 00000 n 
-0000548621 00000 n 
-0000548910 00000 n 
-0000549078 00000 n 
-0000549225 00000 n 
-0000549374 00000 n 
-0000549525 00000 n 
-0000549685 00000 n 
-0000549743 00000 n 
-0000572703 00000 n 
-0000572992 00000 n 
-0000573161 00000 n 
-0000573329 00000 n 
-0000573499 00000 n 
-0000573671 00000 n 
-0000573831 00000 n 
-0000595480 00000 n 
-0000595769 00000 n 
-0000595814 00000 n 
-0000595973 00000 n 
-0000596131 00000 n 
-0000596291 00000 n 
-0000596442 00000 n 
-0000596592 00000 n 
-0000619390 00000 n 
-0000619679 00000 n 
-0000619736 00000 n 
-0000619906 00000 n 
-0000620077 00000 n 
-0000620244 00000 n 
-0000620416 00000 n 
-0000620591 00000 n 
-0000642864 00000 n 
-0000643145 00000 n 
-0000643285 00000 n 
-0000643461 00000 n 
-0000643518 00000 n 
-0000643687 00000 n 
-0000643874 00000 n 
-0000664547 00000 n 
-0000664820 00000 n 
-0000664865 00000 n 
-0000665028 00000 n 
-0000665074 00000 n 
-0000665263 00000 n 
-0000665425 00000 n 
-0000686091 00000 n 
-0000686364 00000 n 
-0000686421 00000 n 
-0000686853 00000 n 
-0000687029 00000 n 
-0000687201 00000 n 
-0000687258 00000 n 
-0000687427 00000 n 
-0000707761 00000 n 
-0000708058 00000 n 
-0000708207 00000 n 
-0000708362 00000 n 
-0000708506 00000 n 
-0000708671 00000 n 
-0000708729 00000 n 
-0000708775 00000 n 
-0000708946 00000 n 
-0000709093 00000 n 
-0000730766 00000 n 
-0000731047 00000 n 
-0000731190 00000 n 
-0000731345 00000 n 
-0000731489 00000 n 
-0000731547 00000 n 
-0000731718 00000 n 
-0000742919 00000 n 
-0000743192 00000 n 
-0000743347 00000 n 
-0000743404 00000 n 
-0000743553 00000 n 
-0000743702 00000 n 
-0000743846 00000 n 
-0000743991 00000 n 
-0000744156 00000 n 
-0000744312 00000 n 
-0000744470 00000 n 
-0000744617 00000 n 
-0000744779 00000 n 
-0000744921 00000 n 
-0000745086 00000 n 
-0000745230 00000 n 
-0000745387 00000 n 
-0000745533 00000 n 
-0000745689 00000 n 
-0000745834 00000 n 
-0000745989 00000 n 
-0000746133 00000 n 
-0000746292 00000 n 
-0000746440 00000 n 
-0000746598 00000 n 
-0000746745 00000 n 
-0000746911 00000 n 
-0000747056 00000 n 
-0000747216 00000 n 
-0000747365 00000 n 
-0000747523 00000 n 
-0000747670 00000 n 
-0000747825 00000 n 
-0000747970 00000 n 
-0000748130 00000 n 
-0000748279 00000 n 
-0000748439 00000 n 
-0000748588 00000 n 
-0000748743 00000 n 
-0000748888 00000 n 
-0000749056 00000 n 
-0000749203 00000 n 
-0000749362 00000 n 
-0000749510 00000 n 
-0000749666 00000 n 
-0000749812 00000 n 
-0000749972 00000 n 
-0000750121 00000 n 
-0000750287 00000 n 
-0000750432 00000 n 
-0000750592 00000 n 
-0000750741 00000 n 
-0000750899 00000 n 
-0000751046 00000 n 
-0000751213 00000 n 
-0000751359 00000 n 
-0000751531 00000 n 
-0000751682 00000 n 
-0000751841 00000 n 
-0000751989 00000 n 
-0000752147 00000 n 
-0000752294 00000 n 
-0000752448 00000 n 
-0000752592 00000 n 
-0000752764 00000 n 
-0000752915 00000 n 
-0000753076 00000 n 
-0000753226 00000 n 
-0000753385 00000 n 
-0000753534 00000 n 
-0000753694 00000 n 
-0000753843 00000 n 
-0000754009 00000 n 
-0000754154 00000 n 
-0000754324 00000 n 
-0000754473 00000 n 
-0000754632 00000 n 
-0000754780 00000 n 
-0000754926 00000 n 
-0000755061 00000 n 
-0000755215 00000 n 
-0000755348 00000 n 
-0000755507 00000 n 
-0000755645 00000 n 
-0000755793 00000 n 
-0000755931 00000 n 
-0000756100 00000 n 
-0000756248 00000 n 
-0000756412 00000 n 
-0000756556 00000 n 
-0000756726 00000 n 
-0000756875 00000 n 
-0000757034 00000 n 
-0000757183 00000 n 
-0000757352 00000 n 
-0000757500 00000 n 
-0000757663 00000 n 
-0000757807 00000 n 
-0000757977 00000 n 
-0000758126 00000 n 
-0000758285 00000 n 
-0000758434 00000 n 
-0000758592 00000 n 
-0000758739 00000 n 
-0000758908 00000 n 
-0000759056 00000 n 
-0000759222 00000 n 
-0000759367 00000 n 
-0000759538 00000 n 
-0000759688 00000 n 
-0000759848 00000 n 
-0000759998 00000 n 
-0000760160 00000 n 
-0000760303 00000 n 
-0000760473 00000 n 
-0000760622 00000 n 
-0000760782 00000 n 
-0000760932 00000 n 
-0000761103 00000 n 
-0000761253 00000 n 
-0000761408 00000 n 
-0000761552 00000 n 
-0000761711 00000 n 
-0000761860 00000 n 
-0000762029 00000 n 
-0000762177 00000 n 
-0000762332 00000 n 
-0000762477 00000 n 
-0000762649 00000 n 
-0000762800 00000 n 
-0000762960 00000 n 
-0000763110 00000 n 
-0000763279 00000 n 
-0000763427 00000 n 
-0000763592 00000 n 
-0000763737 00000 n 
-0000763910 00000 n 
-0000764062 00000 n 
-0000764223 00000 n 
-0000764374 00000 n 
-0000764545 00000 n 
-0000764695 00000 n 
-0000764860 00000 n 
-0000765005 00000 n 
-0000765178 00000 n 
-0000765330 00000 n 
-0000765491 00000 n 
-0000765642 00000 n 
-0000765812 00000 n 
-0000765961 00000 n 
-0000766124 00000 n 
-0000766285 00000 n 
-0000766425 00000 n 
-0000766566 00000 n 
-0000766726 00000 n 
-0000766864 00000 n 
-0000767012 00000 n 
-0000767149 00000 n 
-0000767307 00000 n 
-0000767443 00000 n 
-0000767608 00000 n 
-0000767751 00000 n 
-0000767922 00000 n 
-0000768071 00000 n 
-0000768230 00000 n 
-0000768378 00000 n 
-0000768547 00000 n 
-0000768694 00000 n 
-0000768848 00000 n 
-0000768991 00000 n 
-0000769162 00000 n 
-0000769311 00000 n 
-0000769470 00000 n 
-0000769618 00000 n 
-0000769787 00000 n 
-0000769934 00000 n 
-0000770099 00000 n 
-0000770242 00000 n 
-0000770413 00000 n 
-0000770562 00000 n 
-0000770722 00000 n 
-0000770871 00000 n 
-0000771041 00000 n 
-0000771189 00000 n 
-0000771353 00000 n 
-0000771497 00000 n 
-0000771668 00000 n 
-0000771817 00000 n 
-0000771976 00000 n 
-0000772124 00000 n 
-0000772294 00000 n 
-0000772442 00000 n 
-0000772606 00000 n 
-0000772750 00000 n 
-0000772922 00000 n 
-0000773072 00000 n 
-0000773231 00000 n 
-0000773379 00000 n 
-0000773537 00000 n 
-0000773683 00000 n 
-0000773853 00000 n 
-0000774001 00000 n 
-0000774166 00000 n 
-0000774309 00000 n 
-0000774481 00000 n 
-0000774631 00000 n 
-0000774790 00000 n 
-0000774938 00000 n 
-0000775098 00000 n 
-0000775246 00000 n 
-0000775417 00000 n 
-0000775566 00000 n 
-0000775729 00000 n 
-0000775873 00000 n 
-0000776046 00000 n 
-0000776197 00000 n 
-0000776358 00000 n 
-0000776508 00000 n 
-0000776668 00000 n 
-0000776816 00000 n 
-0000776987 00000 n 
-0000777136 00000 n 
-0000777291 00000 n 
-0000777434 00000 n 
-0000777603 00000 n 
-0000777750 00000 n 
-0000777909 00000 n 
-0000778057 00000 n 
-0000778214 00000 n 
-0000778349 00000 n 
-0000778500 00000 n 
-0000778632 00000 n 
-0000778792 00000 n 
-0000778930 00000 n 
-0000779078 00000 n 
-0000779215 00000 n 
-0000779373 00000 n 
-0000779519 00000 n 
-0000779688 00000 n 
-0000779835 00000 n 
-0000779998 00000 n 
-0000780141 00000 n 
-0000780300 00000 n 
-0000780448 00000 n 
-0000780617 00000 n 
-0000780764 00000 n 
-0000780929 00000 n 
-0000781072 00000 n 
-0000781243 00000 n 
-0000781392 00000 n 
-0000781551 00000 n 
-0000781699 00000 n 
-0000781868 00000 n 
-0000782015 00000 n 
-0000782180 00000 n 
-0000782323 00000 n 
-0000782495 00000 n 
-0000782645 00000 n 
-0000782805 00000 n 
-0000782954 00000 n 
-0000783124 00000 n 
-0000783272 00000 n 
-0000783437 00000 n 
-0000783580 00000 n 
-0000783751 00000 n 
-0000783900 00000 n 
-0000784060 00000 n 
-0000784209 00000 n 
-0000784369 00000 n 
-0000784517 00000 n 
-0000784687 00000 n 
-0000784835 00000 n 
-0000784990 00000 n 
-0000785133 00000 n 
-0000785292 00000 n 
-0000785440 00000 n 
-0000785610 00000 n 
-0000785758 00000 n 
-0000785913 00000 n 
-0000786057 00000 n 
-0000786217 00000 n 
-0000786366 00000 n 
-0000786535 00000 n 
-0000786682 00000 n 
-0000786849 00000 n 
-0000786994 00000 n 
-0000787167 00000 n 
-0000787318 00000 n 
-0000787479 00000 n 
-0000787629 00000 n 
-0000787800 00000 n 
-0000787949 00000 n 
-0000788120 00000 n 
-0000788269 00000 n 
-0000788445 00000 n 
-0000788599 00000 n 
-0000788774 00000 n 
-0000788927 00000 n 
-0000789086 00000 n 
-0000789233 00000 n 
-0000789396 00000 n 
-0000789547 00000 n 
-0000789711 00000 n 
-0000789864 00000 n 
-0000790020 00000 n 
-0000790166 00000 n 
-0000790322 00000 n 
-0000790456 00000 n 
-0000790611 00000 n 
-0000790744 00000 n 
-0000790901 00000 n 
-0000791036 00000 n 
-0000791207 00000 n 
-0000791356 00000 n 
-0000791518 00000 n 
-0000791658 00000 n 
-0000791821 00000 n 
-0000791973 00000 n 
-0000792138 00000 n 
-0000792281 00000 n 
-0000792451 00000 n 
-0000792599 00000 n 
-0000792783 00000 n 
-0000792947 00000 n 
-0000793123 00000 n 
-0000793277 00000 n 
-0000793441 00000 n 
-0000793583 00000 n 
-0000793758 00000 n 
-0000793911 00000 n 
-0000794080 00000 n 
-0000794227 00000 n 
-0000794393 00000 n 
-0000794537 00000 n 
-0000794822 00000 n 
-0000794901 00000 n 
-0000795065 00000 n 
-0000795256 00000 n 
-0000795484 00000 n 
-0000795701 00000 n 
-0000795871 00000 n 
-0000796089 00000 n 
-0000796335 00000 n 
-0000796508 00000 n 
-0000796689 00000 n 
-0000796954 00000 n 
-0000797139 00000 n 
-0000797320 00000 n 
-0000797601 00000 n 
-0000797786 00000 n 
-0000797967 00000 n 
-0000798224 00000 n 
-0000798397 00000 n 
-0000798578 00000 n 
-0000798834 00000 n 
-0000799023 00000 n 
-0000799222 00000 n 
-0000799417 00000 n 
-0000799598 00000 n 
-0000799919 00000 n 
-0000800105 00000 n 
-0000800274 00000 n 
-0000800598 00000 n 
-0000800787 00000 n 
-0000800986 00000 n 
-0000801167 00000 n 
-0000801451 00000 n 
-0000801641 00000 n 
-0000801841 00000 n 
-0000802037 00000 n 
-0000802206 00000 n 
-0000802502 00000 n 
-0000802691 00000 n 
-0000802890 00000 n 
-0000803071 00000 n 
-0000803456 00000 n 
-0000803650 00000 n 
-0000803853 00000 n 
-0000804039 00000 n 
-0000804551 00000 n 
-0000804744 00000 n 
-0000804948 00000 n 
-0000805133 00000 n 
-0000805558 00000 n 
-0000805752 00000 n 
-0000805956 00000 n 
-0000806155 00000 n 
-0000806340 00000 n 
-0000806648 00000 n 
-0000806841 00000 n 
-0000807030 00000 n 
-0000807338 00000 n 
-0000807531 00000 n 
-0000807735 00000 n 
-0000807909 00000 n 
-0000808194 00000 n 
-0000808384 00000 n 
-0000808570 00000 n 
-0000808892 00000 n 
-0000809086 00000 n 
-0000809291 00000 n 
-0000809478 00000 n 
-0000810004 00000 n 
-0000810198 00000 n 
-0000810402 00000 n 
-0000810577 00000 n 
-0000811095 00000 n 
-0000811290 00000 n 
-0000811495 00000 n 
-0000811681 00000 n 
-0000812258 00000 n 
-0000812452 00000 n 
-0000812656 00000 n 
-0000812842 00000 n 
-0000813155 00000 n 
-0000813349 00000 n 
-0000813554 00000 n 
-0000813740 00000 n 
-0000814041 00000 n 
-0000814235 00000 n 
-0000814440 00000 n 
-0000814626 00000 n 
-0000814936 00000 n 
-0000815131 00000 n 
-0000815336 00000 n 
-0000815510 00000 n 
-0000815827 00000 n 
-0000816021 00000 n 
-0000816225 00000 n 
-0000816411 00000 n 
-0000816788 00000 n 
-0000816983 00000 n 
-0000817188 00000 n 
-0000817389 00000 n 
-0000817563 00000 n 
-0000817948 00000 n 
-0000818142 00000 n 
-0000818347 00000 n 
-0000818547 00000 n 
-0000818734 00000 n 
-0000819124 00000 n 
-0000819319 00000 n 
-0000819511 00000 n 
-0000819711 00000 n 
-0000819897 00000 n 
-0000820178 00000 n 
-0000820372 00000 n 
-0000820576 00000 n 
-0000820763 00000 n 
-0000821056 00000 n 
-0000821250 00000 n 
-0000821442 00000 n 
-0000821642 00000 n 
-0000821828 00000 n 
-0000822117 00000 n 
-0000822307 00000 n 
-0000822494 00000 n 
-0000822959 00000 n 
-0000823154 00000 n 
-0000823359 00000 n 
-0000823545 00000 n 
-0000823990 00000 n 
-0000824184 00000 n 
-0000824388 00000 n 
-0000824575 00000 n 
-0000825021 00000 n 
-0000825216 00000 n 
-0000825409 00000 n 
-0000825609 00000 n 
-0000825796 00000 n 
-0000826042 00000 n 
-0000826221 00000 n 
-0000826408 00000 n 
-0000826690 00000 n 
-0000826881 00000 n 
-0000827055 00000 n 
-0000827358 00000 n 
-0000827552 00000 n 
-0000827756 00000 n 
-0000827942 00000 n 
-0000828170 00000 n 
-0000828376 00000 n 
-0000828581 00000 n 
-0000828778 00000 n 
-0000828991 00000 n 
-0000829216 00000 n 
-0000829460 00000 n 
-0000829652 00000 n 
-0000829840 00000 n 
-0000830037 00000 n 
-0000830237 00000 n 
-0000830413 00000 n 
-0000830637 00000 n 
-0000830813 00000 n 
-0000831010 00000 n 
-0000831282 00000 n 
-0000831514 00000 n 
-0000831699 00000 n 
-0000831916 00000 n 
-0000832121 00000 n 
-0000832295 00000 n 
-0000832935 00000 n 
-0000840943 00000 n 
-0000841159 00000 n 
-0000842522 00000 n 
-0000843589 00000 n 
-0000851341 00000 n 
-0000851562 00000 n 
-0000852925 00000 n 
-0000854002 00000 n 
-0000857263 00000 n 
-0000857489 00000 n 
-0000858852 00000 n 
-0000859968 00000 n 
-0000862111 00000 n 
-0000862325 00000 n 
-0000863688 00000 n 
+0000286503 00000 n 
+0000286560 00000 n 
+0000303866 00000 n 
+0000304136 00000 n 
+0000304181 00000 n 
+0000304238 00000 n 
+0000304295 00000 n 
+0000304459 00000 n 
+0000304516 00000 n 
+0000304573 00000 n 
+0000304920 00000 n 
+0000304977 00000 n 
+0000305035 00000 n 
+0000324163 00000 n 
+0000324449 00000 n 
+0000324601 00000 n 
+0000324658 00000 n 
+0000324715 00000 n 
+0000324772 00000 n 
+0000324830 00000 n 
+0000325141 00000 n 
+0000325304 00000 n 
+0000325361 00000 n 
+0000325661 00000 n 
+0000325719 00000 n 
+0000325777 00000 n 
+0000326101 00000 n 
+0000326159 00000 n 
+0000326322 00000 n 
+0000344672 00000 n 
+0000344958 00000 n 
+0000345003 00000 n 
+0000345060 00000 n 
+0000345117 00000 n 
+0000345174 00000 n 
+0000345337 00000 n 
+0000345394 00000 n 
+0000345451 00000 n 
+0000345509 00000 n 
+0000345666 00000 n 
+0000345724 00000 n 
+0000345888 00000 n 
+0000345946 00000 n 
+0000363037 00000 n 
+0000363323 00000 n 
+0000363368 00000 n 
+0000363425 00000 n 
+0000363482 00000 n 
+0000363645 00000 n 
+0000363703 00000 n 
+0000363880 00000 n 
+0000363937 00000 n 
+0000363995 00000 n 
+0000364053 00000 n 
+0000364111 00000 n 
+0000364268 00000 n 
+0000380602 00000 n 
+0000380880 00000 n 
+0000380925 00000 n 
+0000381087 00000 n 
+0000381144 00000 n 
+0000381201 00000 n 
+0000381258 00000 n 
+0000381315 00000 n 
+0000381372 00000 n 
+0000381535 00000 n 
+0000381593 00000 n 
+0000381650 00000 n 
+0000381707 00000 n 
+0000396946 00000 n 
+0000397224 00000 n 
+0000397269 00000 n 
+0000397428 00000 n 
+0000397485 00000 n 
+0000397542 00000 n 
+0000397599 00000 n 
+0000397656 00000 n 
+0000397816 00000 n 
+0000397874 00000 n 
+0000397931 00000 n 
+0000398238 00000 n 
+0000398296 00000 n 
+0000398354 00000 n 
+0000413102 00000 n 
+0000413372 00000 n 
+0000413429 00000 n 
+0000413486 00000 n 
+0000413543 00000 n 
+0000413600 00000 n 
+0000413759 00000 n 
+0000413817 00000 n 
+0000414215 00000 n 
+0000414273 00000 n 
+0000414331 00000 n 
+0000433592 00000 n 
+0000433870 00000 n 
+0000433916 00000 n 
+0000434065 00000 n 
+0000434122 00000 n 
+0000434180 00000 n 
+0000434226 00000 n 
+0000434272 00000 n 
+0000434443 00000 n 
+0000434501 00000 n 
+0000434559 00000 n 
+0000434617 00000 n 
+0000443269 00000 n 
+0000443539 00000 n 
+0000443584 00000 n 
+0000443641 00000 n 
+0000443698 00000 n 
+0000444020 00000 n 
+0000444077 00000 n 
+0000444373 00000 n 
+0000444544 00000 n 
+0000444601 00000 n 
+0000461801 00000 n 
+0000462058 00000 n 
+0000462103 00000 n 
+0000462160 00000 n 
+0000462206 00000 n 
+0000462264 00000 n 
+0000462442 00000 n 
+0000482348 00000 n 
+0000482605 00000 n 
+0000482651 00000 n 
+0000482805 00000 n 
+0000482863 00000 n 
+0000483169 00000 n 
+0000503717 00000 n 
+0000503990 00000 n 
+0000504151 00000 n 
+0000504208 00000 n 
+0000504265 00000 n 
+0000504435 00000 n 
+0000504602 00000 n 
+0000526005 00000 n 
+0000526278 00000 n 
+0000526427 00000 n 
+0000526598 00000 n 
+0000526757 00000 n 
+0000526814 00000 n 
+0000548645 00000 n 
+0000548934 00000 n 
+0000549102 00000 n 
+0000549249 00000 n 
+0000549398 00000 n 
+0000549549 00000 n 
+0000549709 00000 n 
+0000549767 00000 n 
+0000572727 00000 n 
+0000573016 00000 n 
+0000573185 00000 n 
+0000573353 00000 n 
+0000573523 00000 n 
+0000573695 00000 n 
+0000573855 00000 n 
+0000595504 00000 n 
+0000595793 00000 n 
+0000595838 00000 n 
+0000595997 00000 n 
+0000596155 00000 n 
+0000596315 00000 n 
+0000596466 00000 n 
+0000596616 00000 n 
+0000619414 00000 n 
+0000619703 00000 n 
+0000619760 00000 n 
+0000619930 00000 n 
+0000620101 00000 n 
+0000620268 00000 n 
+0000620440 00000 n 
+0000620615 00000 n 
+0000642888 00000 n 
+0000643169 00000 n 
+0000643309 00000 n 
+0000643485 00000 n 
+0000643542 00000 n 
+0000643711 00000 n 
+0000643898 00000 n 
+0000664571 00000 n 
+0000664844 00000 n 
+0000664889 00000 n 
+0000665052 00000 n 
+0000665098 00000 n 
+0000665287 00000 n 
+0000665449 00000 n 
+0000686115 00000 n 
+0000686388 00000 n 
+0000686445 00000 n 
+0000686877 00000 n 
+0000687053 00000 n 
+0000687225 00000 n 
+0000687282 00000 n 
+0000687451 00000 n 
+0000707785 00000 n 
+0000708082 00000 n 
+0000708231 00000 n 
+0000708386 00000 n 
+0000708530 00000 n 
+0000708695 00000 n 
+0000708753 00000 n 
+0000708799 00000 n 
+0000708970 00000 n 
+0000709117 00000 n 
+0000730790 00000 n 
+0000731071 00000 n 
+0000731214 00000 n 
+0000731369 00000 n 
+0000731513 00000 n 
+0000731571 00000 n 
+0000731742 00000 n 
+0000742943 00000 n 
+0000743216 00000 n 
+0000743371 00000 n 
+0000743428 00000 n 
+0000743577 00000 n 
+0000743726 00000 n 
+0000743870 00000 n 
+0000744015 00000 n 
+0000744180 00000 n 
+0000744336 00000 n 
+0000744494 00000 n 
+0000744641 00000 n 
+0000744803 00000 n 
+0000744945 00000 n 
+0000745111 00000 n 
+0000745256 00000 n 
+0000745413 00000 n 
+0000745559 00000 n 
+0000745715 00000 n 
+0000745860 00000 n 
+0000746016 00000 n 
+0000746161 00000 n 
+0000746320 00000 n 
+0000746468 00000 n 
+0000746626 00000 n 
+0000746773 00000 n 
+0000746940 00000 n 
+0000747086 00000 n 
+0000747246 00000 n 
+0000747395 00000 n 
+0000747553 00000 n 
+0000747700 00000 n 
+0000747855 00000 n 
+0000748000 00000 n 
+0000748160 00000 n 
+0000748309 00000 n 
+0000748469 00000 n 
+0000748618 00000 n 
+0000748773 00000 n 
+0000748918 00000 n 
+0000749086 00000 n 
+0000749233 00000 n 
+0000749392 00000 n 
+0000749540 00000 n 
+0000749696 00000 n 
+0000749842 00000 n 
+0000750002 00000 n 
+0000750151 00000 n 
+0000750317 00000 n 
+0000750462 00000 n 
+0000750622 00000 n 
+0000750771 00000 n 
+0000750929 00000 n 
+0000751076 00000 n 
+0000751243 00000 n 
+0000751389 00000 n 
+0000751561 00000 n 
+0000751712 00000 n 
+0000751871 00000 n 
+0000752019 00000 n 
+0000752177 00000 n 
+0000752324 00000 n 
+0000752478 00000 n 
+0000752622 00000 n 
+0000752794 00000 n 
+0000752945 00000 n 
+0000753106 00000 n 
+0000753256 00000 n 
+0000753415 00000 n 
+0000753564 00000 n 
+0000753724 00000 n 
+0000753873 00000 n 
+0000754039 00000 n 
+0000754184 00000 n 
+0000754354 00000 n 
+0000754503 00000 n 
+0000754662 00000 n 
+0000754810 00000 n 
+0000754956 00000 n 
+0000755091 00000 n 
+0000755245 00000 n 
+0000755378 00000 n 
+0000755537 00000 n 
+0000755675 00000 n 
+0000755823 00000 n 
+0000755961 00000 n 
+0000756130 00000 n 
+0000756278 00000 n 
+0000756442 00000 n 
+0000756586 00000 n 
+0000756756 00000 n 
+0000756905 00000 n 
+0000757064 00000 n 
+0000757213 00000 n 
+0000757382 00000 n 
+0000757530 00000 n 
+0000757693 00000 n 
+0000757837 00000 n 
+0000758007 00000 n 
+0000758156 00000 n 
+0000758315 00000 n 
+0000758464 00000 n 
+0000758622 00000 n 
+0000758769 00000 n 
+0000758938 00000 n 
+0000759086 00000 n 
+0000759252 00000 n 
+0000759397 00000 n 
+0000759568 00000 n 
+0000759718 00000 n 
+0000759878 00000 n 
+0000760028 00000 n 
+0000760191 00000 n 
+0000760335 00000 n 
+0000760505 00000 n 
+0000760654 00000 n 
+0000760814 00000 n 
+0000760964 00000 n 
+0000761135 00000 n 
+0000761285 00000 n 
+0000761441 00000 n 
+0000761586 00000 n 
+0000761745 00000 n 
+0000761894 00000 n 
+0000762063 00000 n 
+0000762211 00000 n 
+0000762366 00000 n 
+0000762511 00000 n 
+0000762683 00000 n 
+0000762834 00000 n 
+0000762994 00000 n 
+0000763144 00000 n 
+0000763313 00000 n 
+0000763461 00000 n 
+0000763627 00000 n 
+0000763773 00000 n 
+0000763946 00000 n 
+0000764098 00000 n 
+0000764259 00000 n 
+0000764410 00000 n 
+0000764581 00000 n 
+0000764731 00000 n 
+0000764897 00000 n 
+0000765043 00000 n 
+0000765216 00000 n 
+0000765368 00000 n 
+0000765529 00000 n 
+0000765680 00000 n 
+0000765850 00000 n 
+0000765999 00000 n 
+0000766162 00000 n 
+0000766323 00000 n 
+0000766463 00000 n 
+0000766604 00000 n 
+0000766764 00000 n 
+0000766902 00000 n 
+0000767050 00000 n 
+0000767187 00000 n 
+0000767345 00000 n 
+0000767481 00000 n 
+0000767646 00000 n 
+0000767789 00000 n 
+0000767960 00000 n 
+0000768109 00000 n 
+0000768268 00000 n 
+0000768416 00000 n 
+0000768585 00000 n 
+0000768732 00000 n 
+0000768886 00000 n 
+0000769029 00000 n 
+0000769200 00000 n 
+0000769349 00000 n 
+0000769508 00000 n 
+0000769656 00000 n 
+0000769825 00000 n 
+0000769972 00000 n 
+0000770137 00000 n 
+0000770280 00000 n 
+0000770451 00000 n 
+0000770600 00000 n 
+0000770760 00000 n 
+0000770909 00000 n 
+0000771079 00000 n 
+0000771227 00000 n 
+0000771391 00000 n 
+0000771535 00000 n 
+0000771706 00000 n 
+0000771855 00000 n 
+0000772014 00000 n 
+0000772162 00000 n 
+0000772332 00000 n 
+0000772480 00000 n 
+0000772645 00000 n 
+0000772790 00000 n 
+0000772962 00000 n 
+0000773112 00000 n 
+0000773271 00000 n 
+0000773419 00000 n 
+0000773577 00000 n 
+0000773723 00000 n 
+0000773893 00000 n 
+0000774041 00000 n 
+0000774207 00000 n 
+0000774351 00000 n 
+0000774523 00000 n 
+0000774673 00000 n 
+0000774832 00000 n 
+0000774980 00000 n 
+0000775140 00000 n 
+0000775288 00000 n 
+0000775459 00000 n 
+0000775608 00000 n 
+0000775772 00000 n 
+0000775917 00000 n 
+0000776090 00000 n 
+0000776241 00000 n 
+0000776402 00000 n 
+0000776552 00000 n 
+0000776712 00000 n 
+0000776860 00000 n 
+0000777031 00000 n 
+0000777180 00000 n 
+0000777336 00000 n 
+0000777480 00000 n 
+0000777649 00000 n 
+0000777796 00000 n 
+0000777955 00000 n 
+0000778103 00000 n 
+0000778260 00000 n 
+0000778395 00000 n 
+0000778547 00000 n 
+0000778680 00000 n 
+0000778840 00000 n 
+0000778978 00000 n 
+0000779126 00000 n 
+0000779263 00000 n 
+0000779421 00000 n 
+0000779567 00000 n 
+0000779736 00000 n 
+0000779883 00000 n 
+0000780046 00000 n 
+0000780189 00000 n 
+0000780348 00000 n 
+0000780496 00000 n 
+0000780665 00000 n 
+0000780812 00000 n 
+0000780978 00000 n 
+0000781122 00000 n 
+0000781293 00000 n 
+0000781442 00000 n 
+0000781601 00000 n 
+0000781749 00000 n 
+0000781918 00000 n 
+0000782065 00000 n 
+0000782230 00000 n 
+0000782373 00000 n 
+0000782545 00000 n 
+0000782695 00000 n 
+0000782855 00000 n 
+0000783004 00000 n 
+0000783174 00000 n 
+0000783322 00000 n 
+0000783488 00000 n 
+0000783632 00000 n 
+0000783803 00000 n 
+0000783952 00000 n 
+0000784112 00000 n 
+0000784261 00000 n 
+0000784421 00000 n 
+0000784569 00000 n 
+0000784739 00000 n 
+0000784887 00000 n 
+0000785043 00000 n 
+0000785187 00000 n 
+0000785346 00000 n 
+0000785494 00000 n 
+0000785664 00000 n 
+0000785812 00000 n 
+0000785968 00000 n 
+0000786113 00000 n 
+0000786273 00000 n 
+0000786422 00000 n 
+0000786591 00000 n 
+0000786738 00000 n 
+0000786906 00000 n 
+0000787052 00000 n 
+0000787225 00000 n 
+0000787376 00000 n 
+0000787537 00000 n 
+0000787687 00000 n 
+0000787858 00000 n 
+0000788007 00000 n 
+0000788178 00000 n 
+0000788327 00000 n 
+0000788503 00000 n 
+0000788657 00000 n 
+0000788832 00000 n 
+0000788985 00000 n 
+0000789144 00000 n 
+0000789291 00000 n 
+0000789454 00000 n 
+0000789605 00000 n 
+0000789769 00000 n 
+0000789922 00000 n 
+0000790078 00000 n 
+0000790224 00000 n 
+0000790380 00000 n 
+0000790514 00000 n 
+0000790669 00000 n 
+0000790802 00000 n 
+0000790959 00000 n 
+0000791094 00000 n 
+0000791265 00000 n 
+0000791414 00000 n 
+0000791576 00000 n 
+0000791716 00000 n 
+0000791879 00000 n 
+0000792031 00000 n 
+0000792196 00000 n 
+0000792339 00000 n 
+0000792509 00000 n 
+0000792657 00000 n 
+0000792841 00000 n 
+0000793005 00000 n 
+0000793181 00000 n 
+0000793335 00000 n 
+0000793499 00000 n 
+0000793641 00000 n 
+0000793816 00000 n 
+0000793969 00000 n 
+0000794138 00000 n 
+0000794285 00000 n 
+0000794451 00000 n 
+0000794595 00000 n 
+0000794880 00000 n 
+0000794959 00000 n 
+0000795123 00000 n 
+0000795314 00000 n 
+0000795542 00000 n 
+0000795759 00000 n 
+0000795929 00000 n 
+0000796147 00000 n 
+0000796393 00000 n 
+0000796566 00000 n 
+0000796747 00000 n 
+0000797012 00000 n 
+0000797197 00000 n 
+0000797378 00000 n 
+0000797659 00000 n 
+0000797844 00000 n 
+0000798025 00000 n 
+0000798282 00000 n 
+0000798455 00000 n 
+0000798636 00000 n 
+0000798892 00000 n 
+0000799081 00000 n 
+0000799280 00000 n 
+0000799475 00000 n 
+0000799656 00000 n 
+0000799977 00000 n 
+0000800163 00000 n 
+0000800332 00000 n 
+0000800656 00000 n 
+0000800845 00000 n 
+0000801044 00000 n 
+0000801225 00000 n 
+0000801509 00000 n 
+0000801699 00000 n 
+0000801899 00000 n 
+0000802095 00000 n 
+0000802264 00000 n 
+0000802560 00000 n 
+0000802749 00000 n 
+0000802948 00000 n 
+0000803129 00000 n 
+0000803514 00000 n 
+0000803708 00000 n 
+0000803911 00000 n 
+0000804097 00000 n 
+0000804609 00000 n 
+0000804802 00000 n 
+0000805006 00000 n 
+0000805191 00000 n 
+0000805616 00000 n 
+0000805810 00000 n 
+0000806014 00000 n 
+0000806213 00000 n 
+0000806398 00000 n 
+0000806706 00000 n 
+0000806899 00000 n 
+0000807088 00000 n 
+0000807396 00000 n 
+0000807589 00000 n 
+0000807793 00000 n 
+0000807967 00000 n 
+0000808252 00000 n 
+0000808442 00000 n 
+0000808628 00000 n 
+0000808950 00000 n 
+0000809144 00000 n 
+0000809349 00000 n 
+0000809536 00000 n 
+0000810062 00000 n 
+0000810256 00000 n 
+0000810460 00000 n 
+0000810635 00000 n 
+0000811153 00000 n 
+0000811348 00000 n 
+0000811553 00000 n 
+0000811739 00000 n 
+0000812316 00000 n 
+0000812510 00000 n 
+0000812714 00000 n 
+0000812900 00000 n 
+0000813213 00000 n 
+0000813407 00000 n 
+0000813612 00000 n 
+0000813798 00000 n 
+0000814099 00000 n 
+0000814293 00000 n 
+0000814498 00000 n 
+0000814684 00000 n 
+0000814994 00000 n 
+0000815189 00000 n 
+0000815394 00000 n 
+0000815568 00000 n 
+0000815885 00000 n 
+0000816079 00000 n 
+0000816283 00000 n 
+0000816469 00000 n 
+0000816846 00000 n 
+0000817041 00000 n 
+0000817246 00000 n 
+0000817447 00000 n 
+0000817621 00000 n 
+0000818006 00000 n 
+0000818200 00000 n 
+0000818405 00000 n 
+0000818605 00000 n 
+0000818792 00000 n 
+0000819182 00000 n 
+0000819377 00000 n 
+0000819569 00000 n 
+0000819769 00000 n 
+0000819955 00000 n 
+0000820236 00000 n 
+0000820430 00000 n 
+0000820634 00000 n 
+0000820821 00000 n 
+0000821114 00000 n 
+0000821308 00000 n 
+0000821500 00000 n 
+0000821700 00000 n 
+0000821886 00000 n 
+0000822175 00000 n 
+0000822365 00000 n 
+0000822552 00000 n 
+0000823017 00000 n 
+0000823212 00000 n 
+0000823417 00000 n 
+0000823603 00000 n 
+0000824048 00000 n 
+0000824242 00000 n 
+0000824446 00000 n 
+0000824633 00000 n 
+0000825079 00000 n 
+0000825274 00000 n 
+0000825467 00000 n 
+0000825667 00000 n 
+0000825854 00000 n 
+0000826100 00000 n 
+0000826279 00000 n 
+0000826466 00000 n 
+0000826748 00000 n 
+0000826939 00000 n 
+0000827113 00000 n 
+0000827416 00000 n 
+0000827610 00000 n 
+0000827814 00000 n 
+0000828000 00000 n 
+0000828228 00000 n 
+0000828434 00000 n 
+0000828639 00000 n 
+0000828836 00000 n 
+0000829049 00000 n 
+0000829274 00000 n 
+0000829518 00000 n 
+0000829710 00000 n 
+0000829898 00000 n 
+0000830095 00000 n 
+0000830295 00000 n 
+0000830471 00000 n 
+0000830695 00000 n 
+0000830871 00000 n 
+0000831068 00000 n 
+0000831340 00000 n 
+0000831572 00000 n 
+0000831757 00000 n 
+0000831974 00000 n 
+0000832179 00000 n 
+0000832353 00000 n 
+0000832993 00000 n 
+0000841001 00000 n 
+0000841217 00000 n 
+0000842580 00000 n 
+0000843647 00000 n 
+0000851399 00000 n 
+0000851620 00000 n 
+0000852983 00000 n 
+0000854060 00000 n 
+0000857321 00000 n 
+0000857547 00000 n 
+0000858910 00000 n 
+0000860026 00000 n 
+0000862169 00000 n 
+0000862383 00000 n 
+0000863746 00000 n 
 trailer
 << /Size 860
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-864814
+864872
 %%EOF
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index a319b7b0f..f26829698 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -26,8 +26,8 @@ USE `cldsdb4`;
 
 LOCK TABLES `dictionary` WRITE;
 /*!40000 ALTER TABLE `dictionary` DISABLE KEYS */;
-INSERT INTO `dictionary` VALUES ('DefaultActors','Not found','2020-10-09 17:11:39.923782','Not found','2020-10-09 17:11:39.923782',0,'');
-INSERT INTO `dictionary` VALUES ('DefaultOperations','Not found','2020-10-09 17:11:40.013259','Not found','2020-10-09 17:11:40.013259',0,'');
+INSERT INTO `dictionary` VALUES ('DefaultActors','Not found','2020-12-11 13:09:10.091122','Not found','2020-12-11 13:09:10.091122',0,'');
+INSERT INTO `dictionary` VALUES ('DefaultOperations','Not found','2020-12-11 13:09:10.110987','Not found','2020-12-11 13:09:10.110987',0,'');
 /*!40000 ALTER TABLE `dictionary` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -37,20 +37,20 @@ UNLOCK TABLES;
 
 LOCK TABLES `dictionary_elements` WRITE;
 /*!40000 ALTER TABLE `dictionary_elements` DISABLE KEYS */;
-INSERT INTO `dictionary_elements` VALUES ('APPC','Not found','2020-10-09 17:11:39.960011','Not found','2020-10-09 17:11:39.960011','APPC component','APPC',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('BandwidthOnDemand (SDNC operation)','Not found','2020-10-09 17:11:40.015148','Not found','2020-10-09 17:11:40.015148','SDNC operation','BandwidthOnDemand',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Health-Check (APPC operation)','Not found','2020-10-09 17:11:40.065809','Not found','2020-10-09 17:11:40.065809','APPC operation','Health-Check',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Migrate (APPC operation)','Not found','2020-10-09 17:11:40.061300','Not found','2020-10-09 17:11:40.061300','APPC operation','Migrate',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('ModifyConfig (APPC/VFC operation)','Not found','2020-10-09 17:11:40.048127','Not found','2020-10-09 17:11:40.048127','APPC/VFC operation','ModifyConfig',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Rebuild (APPC operation)','Not found','2020-10-09 17:11:40.044193','Not found','2020-10-09 17:11:40.044193','APPC operation','Rebuild',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Reroute (SDNC operation)','Not found','2020-10-09 17:11:40.031946','Not found','2020-10-09 17:11:40.031946','SDNC operation','Reroute',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Restart (APPC operation)','Not found','2020-10-09 17:11:40.057051','Not found','2020-10-09 17:11:40.057051','APPC operation','Restart',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('SDNC','Not found','2020-10-09 17:11:39.943208','Not found','2020-10-09 17:11:39.943208','SDNC component','SDNC',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('SDNR','Not found','2020-10-09 17:11:39.940697','Not found','2020-10-09 17:11:39.940697','SDNR component','SDNR',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('SO','Not found','2020-10-09 17:11:39.954184','Not found','2020-10-09 17:11:39.954184','SO component','SO',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('VF Module Create (SO operation)','Not found','2020-10-09 17:11:40.036281','Not found','2020-10-09 17:11:40.036281','SO operation','VF Module Create',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('VF Module Delete (SO operation)','Not found','2020-10-09 17:11:40.028817','Not found','2020-10-09 17:11:40.028817','SO operation','VF Module Delete',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('VFC','Not found','2020-10-09 17:11:39.951016','Not found','2020-10-09 17:11:39.951016','VFC component','VFC',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('APPC','Not found','2020-12-11 13:09:10.100698','Not found','2020-12-11 13:09:10.100698','APPC component','APPC',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('BandwidthOnDemand (SDNC operation)','Not found','2020-12-11 13:09:10.112242','Not found','2020-12-11 13:09:10.112242','SDNC operation','BandwidthOnDemand',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('Health-Check (APPC operation)','Not found','2020-12-11 13:09:10.123052','Not found','2020-12-11 13:09:10.123052','APPC operation','Health-Check',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('Migrate (APPC operation)','Not found','2020-12-11 13:09:10.121906','Not found','2020-12-11 13:09:10.121906','APPC operation','Migrate',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('ModifyConfig (APPC/VFC operation)','Not found','2020-12-11 13:09:10.119448','Not found','2020-12-11 13:09:10.119448','APPC/VFC operation','ModifyConfig',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('Rebuild (APPC operation)','Not found','2020-12-11 13:09:10.117513','Not found','2020-12-11 13:09:10.117513','APPC operation','Rebuild',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('Reroute (SDNC operation)','Not found','2020-12-11 13:09:10.114623','Not found','2020-12-11 13:09:10.114623','SDNC operation','Reroute',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('Restart (APPC operation)','Not found','2020-12-11 13:09:10.120619','Not found','2020-12-11 13:09:10.120619','APPC operation','Restart',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('SDNC','Not found','2020-12-11 13:09:10.097548','Not found','2020-12-11 13:09:10.097548','SDNC component','SDNC',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('SDNR','Not found','2020-12-11 13:09:10.095814','Not found','2020-12-11 13:09:10.095814','SDNR component','SDNR',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('SO','Not found','2020-12-11 13:09:10.099751','Not found','2020-12-11 13:09:10.099751','SO component','SO',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('VF Module Create (SO operation)','Not found','2020-12-11 13:09:10.115714','Not found','2020-12-11 13:09:10.115714','SO operation','VF Module Create',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('VF Module Delete (SO operation)','Not found','2020-12-11 13:09:10.113414','Not found','2020-12-11 13:09:10.113414','SO operation','VF Module Delete',NULL,'string');
+INSERT INTO `dictionary_elements` VALUES ('VFC','Not found','2020-12-11 13:09:10.098818','Not found','2020-12-11 13:09:10.098818','VFC component','VFC',NULL,'string');
 /*!40000 ALTER TABLE `dictionary_elements` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -93,7 +93,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-10-09 17:11:38.266040','Not found','2020-10-09 17:11:38.542649',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-12-11 13:08:37.738163','Not found','2020-12-11 13:08:37.868869',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -112,9 +112,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca','Not found','2020-10-09 17:11:38.503094','Not found','2020-10-09 17:11:38.503094','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-fc2ea033-6e47-49f5-b393-71e40d6678ca',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca_3','Not found','2020-10-09 17:11:38.401001','Not found','2020-10-09 17:11:38.401001','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml\n  - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml\"\n  - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml\"\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: \"true\"\n  dmaap_host:\n    type: string\n    default: \"message-router.onap.svc.cluster.local\"\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: \"false\"\n  redisHosts:\n    type: string\n    default: \"dcae-redis.onap.svc.cluster.local:6379\"\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2\"\n  consul_host:\n    type: string\n    default: \"consul-server.onap\"\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n      service_component_type: \'dcaegen2-analytics-tca\'\n      application_config: {}\n      docker_config: {}\n      image:\n        get_input: tag_version\n      log_info:\n        log_directory: \"/opt/app/TCAnalytics/logs\"\n      application_config:\n        app_config:\n          appDescription: DCAE Analytics Threshold Crossing Alert Application\n          appName: dcae-tca\n          tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n          tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n          tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n          tcaVESAlertsTableName: TCAVESAlertsTable\n          tcaVESAlertsTableTTLSeconds: \'1728000\'\n          tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n          tcaVESMessageStatusTableTTLSeconds: \'86400\'\n          thresholdCalculatorFlowletInstances: \'2\'\n        app_preferences:\n          aaiEnrichmentHost:\n            get_input: aaiEnrichmentHost\n          aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n          aaiEnrichmentPortNumber: \'8443\'\n          aaiEnrichmentProtocol: https\n          aaiEnrichmentUserName: dcae@dcae.onap.org\n          aaiEnrichmentUserPassword: demo123456!\n          aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n          aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n          enableAAIEnrichment:\n            get_input: enableAAIEnrichment\n          enableRedisCaching:\n            get_input: enableRedisCaching\n          redisHosts:\n            get_input: redisHosts\n          enableAlertCEFFormat: \'false\'\n          publisherContentType: application/json\n          publisherHostName:\n            get_input: dmaap_host\n          publisherHostPort:\n            get_input: dmaap_port\n          publisherMaxBatchSize: \'1\'\n          publisherMaxRecoveryQueueSize: \'100000\'\n          publisherPollingInterval: \'20000\'\n          publisherProtocol: http\n          publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n          subscriberConsumerGroup: OpenDCAE-clamp\n          subscriberConsumerId: c12\n          subscriberContentType: application/json\n          subscriberHostName:\n            get_input: dmaap_host\n          subscriberHostPort:\n            get_input: dmaap_port\n          subscriberMessageLimit: \'-1\'\n          subscriberPollingInterval: \'30000\'\n          subscriberProtocol: http\n          subscriberTimeoutMS: \'-1\'\n          subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n          #tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n          tca_policy: \'\'\n      service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n              DMAAPHOST:\n                { get_input: dmaap_host }\n              DMAAPPORT: \"3904\"\n              DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n              DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n              AAIHOST:\n                { get_input: aaiEnrichmentHost }\n              AAIPORT: \"8443\"\n              CONSUL_HOST:\n                { get_input: consul_host }\n              CONSUL_PORT: \"8500\"\n              CBS_HOST:\n                { get_input: cbs_host }\n              CBS_PORT: \"10000\"\n              CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n        get_input: policy_id\n      policy_model_id:\n        get_input: policy_model_id\n','typeId-4bf1b214-ba2a-4c11-b6ec-377a29a1fc2b',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName2_tca_2','Not found','2020-10-09 17:11:38.256597','Not found','2020-10-09 17:11:38.256597','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-66bade06-cbe6-4b82-ac71-4c74a01fc8aa',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_vXSOK_v1_0_ResourceInstanceName1_tca','Not found','2020-12-11 13:08:37.835870','Not found','2020-12-11 13:08:37.835870','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-93833cac-bba0-43c2-857b-c58914e90fea',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_vXSOK_v1_0_ResourceInstanceName1_tca_3','Not found','2020-12-11 13:08:37.795397','Not found','2020-12-11 13:08:37.795397','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml\n  - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml\"\n  - \"https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml\"\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: \"true\"\n  dmaap_host:\n    type: string\n    default: \"message-router.onap.svc.cluster.local\"\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: \"false\"\n  redisHosts:\n    type: string\n    default: \"dcae-redis.onap.svc.cluster.local:6379\"\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2\"\n  consul_host:\n    type: string\n    default: \"consul-server.onap\"\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n      service_component_type: \'dcaegen2-analytics-tca\'\n      application_config: {}\n      docker_config: {}\n      image:\n        get_input: tag_version\n      log_info:\n        log_directory: \"/opt/app/TCAnalytics/logs\"\n      application_config:\n        app_config:\n          appDescription: DCAE Analytics Threshold Crossing Alert Application\n          appName: dcae-tca\n          tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n          tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n          tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n          tcaVESAlertsTableName: TCAVESAlertsTable\n          tcaVESAlertsTableTTLSeconds: \'1728000\'\n          tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n          tcaVESMessageStatusTableTTLSeconds: \'86400\'\n          thresholdCalculatorFlowletInstances: \'2\'\n        app_preferences:\n          aaiEnrichmentHost:\n            get_input: aaiEnrichmentHost\n          aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n          aaiEnrichmentPortNumber: \'8443\'\n          aaiEnrichmentProtocol: https\n          aaiEnrichmentUserName: dcae@dcae.onap.org\n          aaiEnrichmentUserPassword: demo123456!\n          aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n          aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n          enableAAIEnrichment:\n            get_input: enableAAIEnrichment\n          enableRedisCaching:\n            get_input: enableRedisCaching\n          redisHosts:\n            get_input: redisHosts\n          enableAlertCEFFormat: \'false\'\n          publisherContentType: application/json\n          publisherHostName:\n            get_input: dmaap_host\n          publisherHostPort:\n            get_input: dmaap_port\n          publisherMaxBatchSize: \'1\'\n          publisherMaxRecoveryQueueSize: \'100000\'\n          publisherPollingInterval: \'20000\'\n          publisherProtocol: http\n          publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n          subscriberConsumerGroup: OpenDCAE-clamp\n          subscriberConsumerId: c12\n          subscriberContentType: application/json\n          subscriberHostName:\n            get_input: dmaap_host\n          subscriberHostPort:\n            get_input: dmaap_port\n          subscriberMessageLimit: \'-1\'\n          subscriberPollingInterval: \'30000\'\n          subscriberProtocol: http\n          subscriberTimeoutMS: \'-1\'\n          subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n          #tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n          tca_policy: \'\'\n      service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n              DMAAPHOST:\n                { get_input: dmaap_host }\n              DMAAPPORT: \"3904\"\n              DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n              DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n              AAIHOST:\n                { get_input: aaiEnrichmentHost }\n              AAIPORT: \"8443\"\n              CONSUL_HOST:\n                { get_input: consul_host }\n              CONSUL_PORT: \"8500\"\n              CBS_HOST:\n                { get_input: cbs_host }\n              CBS_PORT: \"10000\"\n              CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n        get_input: policy_id\n      policy_model_id:\n        get_input: policy_model_id\n','typeId-16cb34d9-d335-4f9c-8175-b94716ea0a23',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_vXSOK_v1_0_ResourceInstanceName2_tca_2','Not found','2020-12-11 13:08:37.717767','Not found','2020-12-11 13:08:37.717767','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-ab8ca488-654b-4947-a4d8-243e2cd9ab67',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,9 +152,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_U19Qe_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_vXSOK_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_vXSOK_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_vXSOK_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -182,12 +182,12 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-10-09 17:11:33.689766','Not found','2020-10-09 17:11:34.010869','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing\n                    the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop\n            actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-10-09 17:11:33.627436','Not found','2020-10-09 17:11:34.033593','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing\n                    the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                -   valid_values:\n                    - second\n                    - minute\n                    - hour\n                    - day\n                    - week\n                    - month\n                    - year\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-10-09 17:11:33.773212','Not found','2020-10-09 17:11:33.773212','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing\n                    the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity\n',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-10-09 17:11:33.562107','Not found','2020-10-09 17:11:34.058644','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.Common:\n        properties:\n            abatement:\n                name: abatement\n                type: boolean\n                typeVersion: 0.0.0\n                description: Whether an abatement event message will be expected for\n                    the control loop from DCAE.\n                default: \'false\'\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            operations:\n                name: operations\n                type: list\n                typeVersion: 0.0.0\n                description: List of operations to be performed when Control Loop\n                    is triggered.\n                required: true\n                constraints: [\n                    ]\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\n                    typeVersion: 0.0.0\n                    constraints: [\n                        ]\n                metadata: {\n                    }\n            trigger:\n                name: trigger\n                type: string\n                typeVersion: 0.0.0\n                description: Initial operation to execute upon receiving an Onset\n                    event message for the Control Loop.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            timeout:\n                name: timeout\n                type: integer\n                typeVersion: 0.0.0\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            id:\n                name: id\n                type: string\n                typeVersion: 0.0.0\n                description: The unique control loop id.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n        name: onap.policies.controlloop.operational.Common\n        version: 1.0.0\n        derived_from: tosca.policies.Root\n        metadata: {\n            }\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n    onap.policies.controlloop.operational.common.Apex:\n        properties:\n            engineServiceParameters:\n                name: engineServiceParameters\n                type: string\n                typeVersion: 0.0.0\n                description: The engine parameters like name, instanceCount, policy\n                    implementation, parameters etc.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            eventOutputParameters:\n                name: eventOutputParameters\n                type: string\n                typeVersion: 0.0.0\n                description: The event output parameters.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            javaProperties:\n                name: javaProperties\n                type: string\n                typeVersion: 0.0.0\n                description: Name/value pairs of properties to be set for APEX if\n                    needed.\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            eventInputParameters:\n                name: eventInputParameters\n                type: string\n                typeVersion: 0.0.0\n                description: The event input parameters.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n        name: onap.policies.controlloop.operational.common.Apex\n        version: 1.0.0\n        derived_from: onap.policies.controlloop.operational.Common\n        metadata: {\n            }\n        description: Operational policies for Apex PDP\ndata_types:\n    onap.datatype.controlloop.Actor:\n        constraints: [\n            ]\n        properties:\n            payload:\n                name: payload\n                type: map\n                typeVersion: 0.0.0\n                description: Name/value pairs of payload information passed by Policy\n                    to the actor\n                required: false\n                constraints: [\n                    ]\n                entry_schema:\n                    type: string\n                    typeVersion: 0.0.0\n                    constraints: [\n                        ]\n                metadata:\n                    clamp_possible_values: ClampExecution:CDS/payload\n            target:\n                name: target\n                type: onap.datatype.controlloop.Target\n                typeVersion: 0.0.0\n                description: The resource the operation should be performed on.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            actor:\n                name: actor\n                type: string\n                typeVersion: 0.0.0\n                description: The actor performing the operation.\n                required: true\n                constraints: [\n                    ]\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n            operation:\n                name: operation\n                type: string\n                typeVersion: 0.0.0\n                description: The operation the actor is performing.\n                required: true\n                constraints: [\n                    ]\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation\n        name: onap.datatype.controlloop.Actor\n        version: 0.0.0\n        derived_from: tosca.datatypes.Root\n        metadata: {\n            }\n        description: An actor/operation/target definition\n    onap.datatype.controlloop.Operation:\n        constraints: [\n            ]\n        properties:\n            failure_retries:\n                name: failure_retries\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the current operation\n                    has exceeded its max retries.\n                default: final_failure_retries\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            id:\n                name: id\n                type: string\n                typeVersion: 0.0.0\n                description: Unique identifier for the operation\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure_timeout:\n                name: failure_timeout\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the time out for\n                    the operation occurs.\n                default: final_failure_timeout\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure:\n                name: failure\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke on Actor operation\n                    failure.\n                default: final_failure\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            operation:\n                name: operation\n                type: onap.datatype.controlloop.Actor\n                typeVersion: 0.0.0\n                description: The definition of the operation to be performed.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure_guard:\n                name: failure_guard\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the current operation\n                    is blocked due to guard policy enforcement.\n                default: final_failure_guard\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            retries:\n                name: retries\n                type: integer\n                typeVersion: 0.0.0\n                description: The number of retries the actor should attempt to perform\n                    the operation.\n                default: \'0\'\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            timeout:\n                name: timeout\n                type: integer\n                typeVersion: 0.0.0\n                description: The amount of time for the actor to perform the operation.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure_exception:\n                name: failure_exception\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the current operation\n                    causes an exception.\n                default: final_failure_exception\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            description:\n                name: description\n                type: string\n                typeVersion: 0.0.0\n                description: A user-friendly description of the intent for the operation\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            success:\n                name: success\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke on success. A value\n                    of \"final_success\" indicates and end to the operation.\n                default: final_success\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n        name: onap.datatype.controlloop.Operation\n        version: 0.0.0\n        derived_from: tosca.datatypes.Root\n        metadata: {\n            }\n        description: An operation supported by an actor\n    onap.datatype.controlloop.Target:\n        constraints: [\n            ]\n        properties:\n            entityIds:\n                name: entityIds\n                type: map\n                typeVersion: 0.0.0\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                constraints: [\n                    ]\n                entry_schema:\n                    type: string\n                    typeVersion: 0.0.0\n                    constraints: [\n                        ]\n                metadata:\n                    clamp_possible_values: ClampExecution:CSAR_RESOURCES\n            targetType:\n                name: targetType\n                type: string\n                typeVersion: 0.0.0\n                description: Category for the target type\n                required: true\n                constraints:\n                -   valid_values:\n                    - VNF\n                    - VM\n                    - VFMODULE\n                    - PNF\n                metadata: {\n                    }\n        name: onap.datatype.controlloop.Target\n        version: 0.0.0\n        derived_from: tosca.datatypes.Root\n        metadata: {\n            }\n        description: Definition for a entity in A&AI to perform a control loop operation\n            on\nname: ToscaServiceTemplateSimple\nversion: 1.0.0\nmetadata: {\n    }\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-10-09 17:11:33.405456','Not found','2020-10-09 17:11:34.097298','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for\n                    the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset\n                    event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop\n                    is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation\n            on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                -   valid_values:\n                    - VNF\n                    - VM\n                    - VFMODULE\n                    - PNF\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                metadata:\n                    clamp_possible_values: ClampExecution:CSAR_RESOURCES\n                entry_schema:\n                    type: string\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy\n                    to the actor\n                required: false\n                metadata:\n                    clamp_possible_values: ClampExecution:CDS/payload\n                entry_schema:\n                    type: string\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform\n                    the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value\n                    of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation\n                    failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for\n                    the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation\n                    has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation\n                    causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation\n                    is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-10-09 17:11:38.086948','Not found','2020-10-09 17:11:38.086948','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: a base policy type for all policies that govern monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: onap.datatypes.monitoring.tca_policy\n                description: TCA Policy JSON\n                required: true\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name\n                    e.g. VNF, VM\n                constraints:\n                -   valid_values:\n                    - VM\n                    - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                -   equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to\n                    be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                -   valid_values:\n                    - ONSET\n                    - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                -   valid_values:\n                    - LESS\n                    - LESS_OR_EQUAL\n                    - GREATER\n                    - GREATER_OR_EQUAL\n                    - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be\n                    analyzed for TCA\n                constraints:\n                -   valid_values:\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                    - $.event.measurementsForVfScalingFields.meanRequestLatency\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                    - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                -   valid_values:\n                    - CRITICAL\n                    - MAJOR\n                    - MINOR\n                    - WARNING\n                    - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-12-11 13:08:35.348618','Not found','2020-12-11 13:08:35.531457','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing\n                    the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop\n            actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-12-11 13:08:35.280128','Not found','2020-12-11 13:08:35.546611','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing\n                    the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                -   valid_values:\n                    - second\n                    - minute\n                    - hour\n                    - day\n                    - week\n                    - month\n                    - year\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-12-11 13:08:35.392508','Not found','2020-12-11 13:08:35.392508','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing\n                    the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-12-11 13:08:35.195163','Not found','2020-12-11 13:08:35.560779','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.Common:\n        properties:\n            abatement:\n                name: abatement\n                type: boolean\n                typeVersion: 0.0.0\n                description: Whether an abatement event message will be expected for\n                    the control loop from DCAE.\n                default: \'false\'\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            operations:\n                name: operations\n                type: list\n                typeVersion: 0.0.0\n                description: List of operations to be performed when Control Loop\n                    is triggered.\n                required: true\n                constraints: [\n                    ]\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\n                    typeVersion: 0.0.0\n                    constraints: [\n                        ]\n                metadata: {\n                    }\n            trigger:\n                name: trigger\n                type: string\n                typeVersion: 0.0.0\n                description: Initial operation to execute upon receiving an Onset\n                    event message for the Control Loop.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            timeout:\n                name: timeout\n                type: integer\n                typeVersion: 0.0.0\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            id:\n                name: id\n                type: string\n                typeVersion: 0.0.0\n                description: The unique control loop id.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n        name: onap.policies.controlloop.operational.Common\n        version: 1.0.0\n        derived_from: tosca.policies.Root\n        metadata: {\n            }\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n    onap.policies.controlloop.operational.common.Apex:\n        properties:\n            engineServiceParameters:\n                name: engineServiceParameters\n                type: string\n                typeVersion: 0.0.0\n                description: The engine parameters like name, instanceCount, policy\n                    implementation, parameters etc.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            eventOutputParameters:\n                name: eventOutputParameters\n                type: string\n                typeVersion: 0.0.0\n                description: The event output parameters.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            javaProperties:\n                name: javaProperties\n                type: string\n                typeVersion: 0.0.0\n                description: Name/value pairs of properties to be set for APEX if\n                    needed.\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            eventInputParameters:\n                name: eventInputParameters\n                type: string\n                typeVersion: 0.0.0\n                description: The event input parameters.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n        name: onap.policies.controlloop.operational.common.Apex\n        version: 1.0.0\n        derived_from: onap.policies.controlloop.operational.Common\n        metadata: {\n            }\n        description: Operational policies for Apex PDP\ndata_types:\n    onap.datatype.controlloop.Actor:\n        constraints: [\n            ]\n        properties:\n            payload:\n                name: payload\n                type: map\n                typeVersion: 0.0.0\n                description: Name/value pairs of payload information passed by Policy\n                    to the actor\n                required: false\n                constraints: [\n                    ]\n                entry_schema:\n                    type: string\n                    typeVersion: 0.0.0\n                    constraints: [\n                        ]\n                metadata:\n                    clamp_possible_values: ClampExecution:CDS/payload\n            target:\n                name: target\n                type: onap.datatype.controlloop.Target\n                typeVersion: 0.0.0\n                description: The resource the operation should be performed on.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            actor:\n                name: actor\n                type: string\n                typeVersion: 0.0.0\n                description: The actor performing the operation.\n                required: true\n                constraints: [\n                    ]\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n            operation:\n                name: operation\n                type: string\n                typeVersion: 0.0.0\n                description: The operation the actor is performing.\n                required: true\n                constraints: [\n                    ]\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation\n        name: onap.datatype.controlloop.Actor\n        version: 0.0.0\n        derived_from: tosca.datatypes.Root\n        metadata: {\n            }\n        description: An actor/operation/target definition\n    onap.datatype.controlloop.Operation:\n        constraints: [\n            ]\n        properties:\n            failure_retries:\n                name: failure_retries\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the current operation\n                    has exceeded its max retries.\n                default: final_failure_retries\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            id:\n                name: id\n                type: string\n                typeVersion: 0.0.0\n                description: Unique identifier for the operation\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure_timeout:\n                name: failure_timeout\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the time out for\n                    the operation occurs.\n                default: final_failure_timeout\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure:\n                name: failure\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke on Actor operation\n                    failure.\n                default: final_failure\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            operation:\n                name: operation\n                type: onap.datatype.controlloop.Actor\n                typeVersion: 0.0.0\n                description: The definition of the operation to be performed.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure_guard:\n                name: failure_guard\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the current operation\n                    is blocked due to guard policy enforcement.\n                default: final_failure_guard\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            retries:\n                name: retries\n                type: integer\n                typeVersion: 0.0.0\n                description: The number of retries the actor should attempt to perform\n                    the operation.\n                default: \'0\'\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            timeout:\n                name: timeout\n                type: integer\n                typeVersion: 0.0.0\n                description: The amount of time for the actor to perform the operation.\n                required: true\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            failure_exception:\n                name: failure_exception\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke when the current operation\n                    causes an exception.\n                default: final_failure_exception\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            description:\n                name: description\n                type: string\n                typeVersion: 0.0.0\n                description: A user-friendly description of the intent for the operation\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n            success:\n                name: success\n                type: string\n                typeVersion: 0.0.0\n                description: Points to the operation to invoke on success. A value\n                    of \"final_success\" indicates and end to the operation.\n                default: final_success\n                required: false\n                constraints: [\n                    ]\n                metadata: {\n                    }\n        name: onap.datatype.controlloop.Operation\n        version: 0.0.0\n        derived_from: tosca.datatypes.Root\n        metadata: {\n            }\n        description: An operation supported by an actor\n    onap.datatype.controlloop.Target:\n        constraints: [\n            ]\n        properties:\n            entityIds:\n                name: entityIds\n                type: map\n                typeVersion: 0.0.0\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                constraints: [\n                    ]\n                entry_schema:\n                    type: string\n                    typeVersion: 0.0.0\n                    constraints: [\n                        ]\n                metadata:\n                    clamp_possible_values: ClampExecution:CSAR_RESOURCES\n            targetType:\n                name: targetType\n                type: string\n                typeVersion: 0.0.0\n                description: Category for the target type\n                required: true\n                constraints:\n                -   valid_values:\n                    - VNF\n                    - VM\n                    - VFMODULE\n                    - PNF\n                metadata: {\n                    }\n        name: onap.datatype.controlloop.Target\n        version: 0.0.0\n        derived_from: tosca.datatypes.Root\n        metadata: {\n            }\n        description: Definition for a entity in A&AI to perform a control loop operation\n            on\nname: ToscaServiceTemplateSimple\nversion: 1.0.0\nmetadata: {\n    }\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-12-11 13:08:35.125997','Not found','2020-12-11 13:08:35.578296','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for\n                    the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset\n                    event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop\n                    is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation\n            on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                -   valid_values:\n                    - VNF\n                    - VM\n                    - VFMODULE\n                    - PNF\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                metadata:\n                    clamp_possible_values: ClampExecution:CSAR_RESOURCES\n                entry_schema:\n                    type: string\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n                metadata:\n                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy\n                    to the actor\n                required: false\n                metadata:\n                    clamp_possible_values: ClampExecution:CDS/payload\n                entry_schema:\n                    type: string\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform\n                    the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value\n                    of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation\n                    failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for\n                    the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation\n                    has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation\n                    causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation\n                    is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-12-11 13:08:37.637693','Not found','2020-12-11 13:08:37.637693','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: a base policy type for all policies that govern monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: onap.datatypes.monitoring.tca_policy\n                description: TCA Policy JSON\n                required: true\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name\n                    e.g. VNF, VM\n                constraints:\n                -   valid_values:\n                    - VM\n                    - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                -   equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to\n                    be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                -   valid_values:\n                    - ONSET\n                    - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                -   valid_values:\n                    - LESS\n                    - LESS_OR_EQUAL\n                    - GREATER\n                    - GREATER_OR_EQUAL\n                    - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be\n                    analyzed for TCA\n                constraints:\n                -   valid_values:\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                    - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                    - $.event.measurementsForVfScalingFields.meanRequestLatency\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                    - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                    - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                -   valid_values:\n                    - CRITICAL\n                    - MAJOR\n                    - MINOR\n                    - WARNING\n                    - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -209,4 +209,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-10-09 15:12:32
+-- Dump completed on 2020-12-11 12:09:39
diff --git a/src/main/java/org/onap/clamp/authorization/AuthorizationController.java b/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
index f4da09a2e..f703e3363 100644
--- a/src/main/java/org/onap/clamp/authorization/AuthorizationController.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/AuthorizationController.java
@@ -23,16 +23,16 @@
  *
  */
 
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.util.Date;
 import org.apache.camel.Exchange;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.exception.NotAuthorizedException;
-import org.onap.clamp.clds.model.ClampInformation;
-import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.exception.NotAuthorizedException;
+import org.onap.policy.clamp.clds.model.ClampInformation;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
diff --git a/src/main/java/org/onap/clamp/authorization/CldsUser.java b/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
index b50f50cb2..8f1e2bf67 100644
--- a/src/main/java/org/onap/clamp/authorization/CldsUser.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/CldsUser.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
index 0ee126ead..41887a315 100644
--- a/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermission.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
 
 /**
  * Permission class that can be instantiated easily using constructor or factory
diff --git a/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
index 026ee802c..0b178c256 100644
--- a/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/SecureServicePermissionDeserializer.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
 
 
 import com.google.gson.Gson;
diff --git a/src/main/java/org/onap/clamp/authorization/UserService.java b/src/main/java/org/onap/policy/clamp/authorization/UserService.java
index b4f51c95b..c748a5a54 100644
--- a/src/main/java/org/onap/clamp/authorization/UserService.java
+++ b/src/main/java/org/onap/policy/clamp/authorization/UserService.java
@@ -20,7 +20,7 @@
  * ===================================================================
  */
 
-package org.onap.clamp.authorization;
+package org.onap.policy.clamp.authorization;
 
 
 import org.springframework.security.core.context.SecurityContext;
diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/policy/clamp/clds/Application.java
index e83ff3e76..79247ca63 100644
--- a/src/main/java/org/onap/clamp/clds/Application.java
+++ b/src/main/java/org/onap/policy/clamp/clds/Application.java
@@ -23,7 +23,7 @@
  *
  */
 
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -36,9 +36,9 @@ import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Enumeration;
 import org.apache.catalina.connector.Connector;
-import org.onap.clamp.clds.util.ClampVersioning;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.util.PassDecoder;
+import org.onap.policy.clamp.clds.util.ClampVersioning;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.util.PassDecoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
@@ -61,10 +61,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@ComponentScan(basePackages = { "org.onap.clamp" })
+@ComponentScan(basePackages = { "org.onap.policy.clamp" })
 @SpringBootApplication(exclude = { SecurityAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class })
-@EnableJpaRepositories(basePackages = { "org.onap.clamp" })
-@EntityScan(basePackages = { "org.onap.clamp" })
+@EnableJpaRepositories(basePackages = { "org.onap.policy.clamp" })
+@EntityScan(basePackages = { "org.onap.policy.clamp" })
 @EnableTransactionManagement
 @EnableConfigurationProperties
 @EnableAsync
diff --git a/src/main/java/org/onap/clamp/clds/ClampInUserAuditorAware.java b/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
index 9351db23c..939cea49c 100644
--- a/src/main/java/org/onap/clamp/clds/ClampInUserAuditorAware.java
+++ b/src/main/java/org/onap/policy/clamp/clds/ClampInUserAuditorAware.java
@@ -21,10 +21,10 @@
  *
  */
 
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
 
 import java.util.Optional;
-import org.onap.clamp.authorization.AuthorizationController;
+import org.onap.policy.clamp.authorization.AuthorizationController;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/ClampServlet.java b/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
index 5ca3dfb6e..801f59c31 100644
--- a/src/main/java/org/onap/clamp/clds/ClampServlet.java
+++ b/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
@@ -23,23 +23,21 @@
  *
  */
 
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import fj.data.Array;
 import java.io.IOException;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
-import org.onap.clamp.authorization.SecureServicePermission;
+import org.onap.policy.clamp.authorization.SecureServicePermission;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java b/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
index a0109a688..f66a09c41 100644
--- a/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
+++ b/src/main/java/org/onap/policy/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds;
+package org.onap.policy.clamp.clds;
 
 import org.apache.catalina.Context;
 import org.apache.tomcat.util.descriptor.web.SecurityCollection;
diff --git a/src/main/java/org/onap/clamp/clds/client/CdsServices.java b/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
index 31960cc02..ff79ef413 100644
--- a/src/main/java/org/onap/clamp/clds/client/CdsServices.java
+++ b/src/main/java/org/onap/policy/clamp/clds/client/CdsServices.java
@@ -20,7 +20,7 @@
  *

  */

 

-package org.onap.clamp.clds.client;

+package org.onap.policy.clamp.clds.client;

 

 import static java.lang.Boolean.parseBoolean;

 

@@ -34,10 +34,10 @@ import java.util.Map;
 import org.apache.camel.CamelContext;

 import org.apache.camel.Exchange;

 import org.apache.camel.builder.ExchangeBuilder;

-import org.onap.clamp.clds.exception.cds.CdsParametersException;

-import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse;

-import org.onap.clamp.clds.util.JsonUtils;

-import org.onap.clamp.clds.util.LoggingUtils;

+import org.onap.policy.clamp.clds.exception.cds.CdsParametersException;

+import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse;

+import org.onap.policy.clamp.clds.util.JsonUtils;

+import org.onap.policy.clamp.clds.util.LoggingUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Component;

 

diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java b/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
index ade96e0a7..fed061e7d 100644
--- a/src/main/java/org/onap/clamp/clds/client/DcaeInventoryServices.java
+++ b/src/main/java/org/onap/policy/clamp/clds/client/DcaeInventoryServices.java
@@ -22,7 +22,7 @@
  *

  */

 

-package org.onap.clamp.clds.client;

+package org.onap.policy.clamp.clds.client;

 

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

@@ -35,10 +35,10 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;

 import org.json.simple.parser.JSONParser;

 import org.json.simple.parser.ParseException;

-import org.onap.clamp.clds.config.ClampProperties;

-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;

-import org.onap.clamp.clds.util.JsonUtils;

-import org.onap.clamp.clds.util.LoggingUtils;

+import org.onap.policy.clamp.clds.config.ClampProperties;

+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;

+import org.onap.policy.clamp.clds.util.JsonUtils;

+import org.onap.policy.clamp.clds.util.LoggingUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Component;

 

diff --git a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java b/src/main/java/org/onap/policy/clamp/clds/client/PolicyEngineServices.java
index c75d733a8..bc6a68286 100644
--- a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
+++ b/src/main/java/org/onap/policy/clamp/clds/client/PolicyEngineServices.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.client;
+package org.onap.policy.clamp.clds.client;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -34,13 +34,12 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.ExchangeBuilder;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.pdpgroup.PdpGroup;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintMicroService;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.pdpgroup.PdpGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.DumperOptions;
diff --git a/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
index 7c86728bb..30ba6e6ae 100644
--- a/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/AafConfiguration.java
@@ -21,10 +21,10 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import javax.servlet.Filter;
-import org.onap.clamp.clds.filter.ClampCadiFilter;
+import org.onap.policy.clamp.clds.filter.ClampCadiFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
index 36e11f64f..9431f40e8 100644
--- a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/CamelConfiguration.java
@@ -20,7 +20,7 @@
  * ===================================================================
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import java.io.IOException;
 import java.net.URL;
@@ -45,9 +45,9 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
-import org.onap.clamp.clds.util.ClampVersioning;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.util.PassDecoder;
+import org.onap.policy.clamp.clds.util.ClampVersioning;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.util.PassDecoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/clds/config/ClampProperties.java b/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
index 0b5c951bf..f11e16733 100644
--- a/src/main/java/org/onap/clamp/clds/config/ClampProperties.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/ClampProperties.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java b/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
index a7ef10738..20d7143fb 100644
--- a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoder.java
@@ -23,16 +23,16 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import com.google.gson.JsonParseException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
-import org.onap.clamp.authorization.CldsUser;
-import org.onap.clamp.clds.exception.CldsUsersException;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.authorization.CldsUser;
+import org.onap.policy.clamp.clds.exception.CldsUsersException;
+import org.onap.policy.clamp.clds.util.JsonUtils;
 
 public class CldsUserJsonDecoder {
 
diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultDictionaryElements.java b/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
index 1c52e4100..27cf0b941 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultDictionaryElements.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/DefaultDictionaryElements.java
@@ -21,12 +21,12 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import javax.annotation.PostConstruct;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
index cfd5f990f..015868141 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/DefaultUserConfiguration.java
@@ -23,14 +23,14 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.io.IOException;
-import org.onap.clamp.authorization.CldsUser;
-import org.onap.clamp.clds.exception.CldsConfigException;
-import org.onap.clamp.clds.exception.CldsUsersException;
+import org.onap.policy.clamp.authorization.CldsUser;
+import org.onap.policy.clamp.clds.exception.CldsConfigException;
+import org.onap.policy.clamp.clds.exception.CldsUsersException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/clamp/clds/config/SslConfig.java b/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
index 6345f4b56..329cb4bed 100644
--- a/src/main/java/org/onap/clamp/clds/config/SslConfig.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/SslConfig.java
@@ -21,16 +21,15 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.util.PassDecoder;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.util.PassDecoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
diff --git a/src/main/java/org/onap/clamp/clds/config/SystemPropertiesLoader.java b/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
index 10c6901fb..3e2e62b66 100644
--- a/src/main/java/org/onap/clamp/clds/config/SystemPropertiesLoader.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/SystemPropertiesLoader.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
index b6f1e1a65..4748edf6d 100644
--- a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcControllersConfiguration.java
@@ -23,7 +23,7 @@
  * 
  */
 
-package org.onap.clamp.clds.config.sdc;
+package org.onap.policy.clamp.clds.config.sdc;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
@@ -32,8 +32,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.PostConstruct;
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.policy.clamp.clds.util.JsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
index da90e6060..0bbbf19dc 100644
--- a/src/main/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfiguration.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.config.sdc;
+package org.onap.policy.clamp.clds.config.sdc;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -32,8 +32,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.codec.DecoderException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.onap.clamp.clds.util.CryptoUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.policy.clamp.clds.util.CryptoUtils;
 import org.onap.sdc.api.consumer.IConfiguration;
 
 /**
diff --git a/src/main/java/org/onap/clamp/clds/config/spring/CldsConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
index 14c08c800..72f09ce13 100644
--- a/src/main/java/org/onap/clamp/clds/config/spring/CldsConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/spring/CldsConfiguration.java
@@ -21,9 +21,9 @@
  *
  */
 
-package org.onap.clamp.clds.config.spring;
+package org.onap.policy.clamp.clds.config.spring;
 
-import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.ClampProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/clamp/clds/config/spring/SdcControllerConfiguration.java b/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
index 62c3a1fd1..6005b0d39 100644
--- a/src/main/java/org/onap/clamp/clds/config/spring/SdcControllerConfiguration.java
+++ b/src/main/java/org/onap/policy/clamp/clds/config/spring/SdcControllerConfiguration.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.config.spring;
+package org.onap.policy.clamp.clds.config.spring;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -29,12 +29,12 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.config.sdc.SdcControllersConfiguration;
-import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
-import org.onap.clamp.clds.sdc.controller.SdcSingleController;
-import org.onap.clamp.clds.sdc.controller.SdcSingleControllerStatus;
-import org.onap.clamp.loop.CsarInstaller;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.sdc.SdcControllersConfiguration;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.policy.clamp.clds.sdc.controller.SdcSingleController;
+import org.onap.policy.clamp.clds.sdc.controller.SdcSingleControllerStatus;
+import org.onap.policy.clamp.loop.CsarInstaller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/org/onap/clamp/clds/exception/CldsConfigException.java b/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
index 93d98151a..ef1ced0a3 100644
--- a/src/main/java/org/onap/clamp/clds/exception/CldsConfigException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/CldsConfigException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception;
+package org.onap.policy.clamp.clds.exception;
 
 /**
  * New exception to CldsUser errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/CldsUsersException.java b/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
index 270bfa1e2..4d4855b6f 100644
--- a/src/main/java/org/onap/clamp/clds/exception/CldsUsersException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/CldsUsersException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception;
+package org.onap.policy.clamp.clds.exception;
 
 /**
  * New exception to CldsUser errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/NotAuthorizedException.java b/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
index 1bdf18e7e..73c117932 100644
--- a/src/main/java/org/onap/clamp/clds/exception/NotAuthorizedException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/NotAuthorizedException.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.exception;
+package org.onap.policy.clamp.clds.exception;
 
 /**
  * New exception to request errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/cds/CdsParametersException.java b/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
index 73ce31f89..b4a013eb4 100644
--- a/src/main/java/org/onap/clamp/clds/exception/cds/CdsParametersException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/cds/CdsParametersException.java
@@ -20,7 +20,7 @@
  *
  */
 
-package org.onap.clamp.clds.exception.cds;
+package org.onap.policy.clamp.clds.exception.cds;
 
 /**
  * Exception while parsing CDS response.
diff --git a/src/main/java/org/onap/clamp/clds/exception/dcae/DcaeDeploymentException.java b/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
index e733da53d..78c2c6331 100644
--- a/src/main/java/org/onap/clamp/clds/exception/dcae/DcaeDeploymentException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/dcae/DcaeDeploymentException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.dcae;
+package org.onap.policy.clamp.clds.exception.dcae;
 
 /**
  * New exception to capture DCAE communication errors.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/BlueprintParserException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
index 7257fd8a0..6939fdf06 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/BlueprintParserException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/BlueprintParserException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
 
 /**
  * Exception during blueprint parsing.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/CsarHandlerException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
index c3ebde1f8..e3f16f908 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/CsarHandlerException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/CsarHandlerException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
 
 /**
  * Exception during Csar operations.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
index 523766af1..1202ec199 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcArtifactInstallerException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
 
 /**
  * Exception during SDC artifact installation.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcControllerException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
index d73001d78..e391ee7e8 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcControllerException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcControllerException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
 
 /**
  * Exception of the SDC controller.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcDownloadException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
index 6cd3fb88d..3c0240ef3 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcDownloadException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcDownloadException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
 
 /**
  * Exception during download from SDC.
diff --git a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcParametersException.java b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
index bfe63cbfb..fe573882f 100644
--- a/src/main/java/org/onap/clamp/clds/exception/sdc/controller/SdcParametersException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/exception/sdc/controller/SdcParametersException.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.exception.sdc.controller;
+package org.onap.policy.clamp.clds.exception.sdc.controller;
 
 /**
  * Exception of the SDC controller.
diff --git a/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java b/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
index c673f544a..6fa8ecb2b 100644
--- a/src/main/java/org/onap/clamp/clds/filter/ClampCadiFilter.java
+++ b/src/main/java/org/onap/policy/clamp/clds/filter/ClampCadiFilter.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.filter;
+package org.onap.policy.clamp.clds.filter;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -43,7 +43,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.filter.CadiFilter;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/clamp/clds/model/ClampInformation.java b/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
index d73e94204..5708cb6ec 100644
--- a/src/main/java/org/onap/clamp/clds/model/ClampInformation.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/ClampInformation.java
@@ -21,12 +21,12 @@
  *
  */
 
-package org.onap.clamp.clds.model;
+package org.onap.policy.clamp.clds.model;
 
 import com.google.gson.annotations.Expose;
 import java.util.ArrayList;
 import java.util.List;
-import org.onap.clamp.clds.util.ClampVersioning;
+import org.onap.policy.clamp.clds.util.ClampVersioning;
 
 public class ClampInformation {
     @Expose
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsHealthCheck.java b/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
index 651997cd3..c814a628d 100644
--- a/src/main/java/org/onap/clamp/clds/model/CldsHealthCheck.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/CldsHealthCheck.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.model;
+package org.onap.policy.clamp.clds.model;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/main/java/org/onap/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java b/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
index 36510ea8f..a3b42524e 100644
--- a/src/main/java/org/onap/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/cds/CdsBpWorkFlowListResponse.java
@@ -20,7 +20,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.cds;
+package org.onap.policy.clamp.clds.model.cds;
 
 import com.google.gson.annotations.Expose;
 import java.util.LinkedList;
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
index fc2ca5caa..a69d1a353 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryCache.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
index 67bd026d0..72ae61359 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponse.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponse.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeLinks.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
index 368e1b8e6..4d6e544da 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeLinks.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeLinks.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeOperationStatusResponse.java b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
index aee7d0613..9389a51fc 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
+++ b/src/main/java/org/onap/policy/clamp/clds/model/dcae/DcaeOperationStatusResponse.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/DistributionStatusMessage.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
index c80441fa6..ca46c6d31 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/DistributionStatusMessage.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/DistributionStatusMessage.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.sdc.controller;
+package org.onap.policy.clamp.clds.sdc.controller;
 
 import org.onap.sdc.api.consumer.IDistributionStatusMessage;
 import org.onap.sdc.utils.DistributionStatusEnum;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
index 8afb3e81a..4ca6b1cf4 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleController.java
@@ -22,24 +22,24 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller;
+package org.onap.policy.clamp.clds.sdc.controller;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.util.Date;
 import java.util.Map.Entry;
 import java.util.concurrent.ThreadLocalRandom;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcDownloadException;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.loop.CsarInstaller;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcDownloadException;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.loop.CsarInstaller;
 import org.onap.sdc.api.IDistributionClient;
 import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
 import org.onap.sdc.api.consumer.IDistributionStatusMessage;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleControllerStatus.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
index a50e340e3..fe269c486 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/SdcSingleControllerStatus.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.sdc.controller;
+package org.onap.policy.clamp.clds.sdc.controller;
 
 public enum SdcSingleControllerStatus {
     STOPPED, IDLE, BUSY
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintArtifact.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
index 35bc909dc..df81cfb0c 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintArtifact.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import org.onap.sdc.api.notification.IResourceInstance;
 
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintMicroService.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
index e00ce9430..519a24f46 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintMicroService.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParser.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
index 0c6ec8d83..ada47992a 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParser.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParser.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -38,7 +38,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import org.json.JSONObject;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
 import org.yaml.snakeyaml.Yaml;
 
 public class BlueprintParser {
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/ChainGenerator.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
index 7768cd817..10e7a56a4 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/ChainGenerator.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGenerator.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
index aa1a6af71..436e594ce 100644
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java
+++ b/src/main/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandler.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -41,8 +41,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.apache.commons.io.IOUtils;
 import org.codehaus.plexus.util.StringUtils;
-import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
 import org.onap.sdc.api.notification.IArtifactInfo;
 import org.onap.sdc.api.notification.INotificationData;
 import org.onap.sdc.api.notification.IResourceInstance;
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java b/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
index 3fceace55..02481494a 100644
--- a/src/main/java/org/onap/clamp/clds/service/CldsHealthcheckService.java
+++ b/src/main/java/org/onap/policy/clamp/clds/service/CldsHealthcheckService.java
@@ -20,13 +20,13 @@
  * ===================================================================
  */
 
-package org.onap.clamp.clds.service;
+package org.onap.policy.clamp.clds.service;
 
 import java.util.Date;
-import org.onap.clamp.clds.model.CldsHealthCheck;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
-import org.onap.clamp.loop.LoopController;
+import org.onap.policy.clamp.clds.model.CldsHealthCheck;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.util.OnapLogConstants;
+import org.onap.policy.clamp.loop.LoopController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/JsonEditorSchemaConstants.java b/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
index e3c661698..32f328079 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/JsonEditorSchemaConstants.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/JsonEditorSchemaConstants.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
 
 public class JsonEditorSchemaConstants {
 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
index d00c431c8..c2b5d5963 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaSchemaConstants.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
 
 public class ToscaSchemaConstants {
 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
index 45bb87ed8..d6b0a031f 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -37,10 +37,10 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
index 5832986a1..3505c8b86 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupport.java
@@ -21,18 +21,18 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
 import java.io.IOException;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.service.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/UnknownComponentException.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
index e30f9158b..fb684b57b 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/UnknownComponentException.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/UnknownComponentException.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 public class UnknownComponentException extends Exception {
     public UnknownComponentException(String nameEntry) {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ArrayField.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
index 83f792f3f..9834c78e7 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ArrayField.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ArrayField.java
@@ -21,7 +21,7 @@
  *

  */

 

-package org.onap.clamp.clds.tosca.update.elements;

+package org.onap.policy.clamp.clds.tosca.update.elements;

 

 import com.google.gson.JsonArray;

 import java.util.ArrayList;

diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
index d6bd355e3..b41042abe 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/Constraint.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/Constraint.java
@@ -21,14 +21,14 @@
  *

  */

 

-package org.onap.clamp.clds.tosca.update.elements;

+package org.onap.policy.clamp.clds.tosca.update.elements;

 

 import com.google.gson.JsonArray;

 import com.google.gson.JsonObject;

 import java.util.ArrayList;

 import java.util.LinkedHashMap;

 import java.util.Map.Entry;

-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;

+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;

 

 public class Constraint {

 

diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElement.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
index 9035a5806..0c531e9d0 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElement.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElement.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.elements;
+package org.onap.policy.clamp.clds.tosca.update.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElementProperty.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
index c5ab5a18e..4db8b0356 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/elements/ToscaElementProperty.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/elements/ToscaElementProperty.java
@@ -21,13 +21,13 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.elements;
+package org.onap.policy.clamp.clds.tosca.update.elements;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
 
 public class ToscaElementProperty {
 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
index 885e755bd..e18af7188 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.execution;
+package org.onap.policy.clamp.clds.tosca.update.execution;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -29,10 +29,10 @@ import com.google.gson.JsonObject;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.PostConstruct;
-import org.onap.clamp.clds.tosca.update.execution.cds.ToscaMetadataCdsProcess;
-import org.onap.clamp.clds.tosca.update.execution.target.ToscaMetadataTargetProcess;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.tosca.update.execution.cds.ToscaMetadataCdsProcess;
+import org.onap.policy.clamp.clds.tosca.update.execution.target.ToscaMetadataTargetProcess;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.tosca.DictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
index 214eadb03..a1275229d 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataProcess.java
@@ -21,10 +21,10 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.execution;
+package org.onap.policy.clamp.clds.tosca.update.execution;
 
 import com.google.gson.JsonObject;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.service.Service;
 
 /**
  * This code is the interface that must be implemented to have a tosca process.
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
index 39fa25a2b..bd3a1cb13 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
@@ -21,18 +21,18 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.execution.cds;
-
-import static org.onap.clamp.clds.tosca.ToscaSchemaConstants.TYPE;
-import static org.onap.clamp.clds.tosca.ToscaSchemaConstants.TYPE_LIST;
+package org.onap.policy.clamp.clds.tosca.update.execution.cds;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.Map;
 import java.util.Set;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
+import org.onap.policy.clamp.loop.service.Service;
+
 
 /**
  * This class is there to add the JsonObject for CDS in the json Schema according to what is found in the Tosca model.
@@ -193,12 +193,13 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess {
             if (key.equalsIgnoreCase(workFlowName + "-properties")) {
                 addDefaultValueForData(entry.getValue().getAsJsonObject().get("properties")
                         .getAsJsonObject(), defaultValue, workFlowName);
-            } else if ("object".equalsIgnoreCase(inputProperty.get(TYPE).getAsString())) {
+            } else if ("object".equalsIgnoreCase(inputProperty.get(ToscaSchemaConstants.TYPE).getAsString())) {
                 JsonObject object = new JsonObject();
                 addDefaultValueForData(entry.getValue().getAsJsonObject().get("properties")
                         .getAsJsonObject(), object, workFlowName);
                 defaultValue.add(entry.getKey(), object);
-            } else if (TYPE_LIST.equalsIgnoreCase(inputProperty.get(TYPE).getAsString())) {
+            } else if (ToscaSchemaConstants.TYPE_LIST.equalsIgnoreCase(inputProperty.get(ToscaSchemaConstants.TYPE)
+                    .getAsString())) {
                 defaultValue.add(entry.getKey(), handleListType(entry.getValue().getAsJsonObject(), workFlowName));
             } else {
                 defaultValue.addProperty(entry.getKey(), "");
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
index 8b8fa1784..f4ca9909b 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
@@ -21,12 +21,12 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.execution.target;
+package org.onap.policy.clamp.clds.tosca.update.execution.target;
 
 import com.google.gson.JsonObject;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
 
 /**
  * This class is there to add the JsonObject for CDS in the json Schema according to what is found in the Tosca model.
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
index d23dc79ec..c7cc7e7fa 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.parser;
+package org.onap.policy.clamp.clds.tosca.update.parser;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -29,11 +29,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.loop.service.Service;
 
 public class ToscaConverterToJsonSchema {
     private LinkedHashMap<String, ToscaElement> components;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaElementParser.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
index 090fcfcfa..a3dd9c3e1 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaElementParser.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/ToscaElementParser.java
@@ -21,12 +21,12 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.parser;
+package org.onap.policy.clamp.clds.tosca.update.parser;
 
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
 import org.yaml.snakeyaml.Yaml;
 
 public class ToscaElementParser {
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
index f4a48139e..b2568b79f 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParser.java
@@ -21,11 +21,11 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.parser.metadata;
+package org.onap.policy.clamp.clds.tosca.update.parser.metadata;
 
 import com.google.gson.JsonObject;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.loop.service.Service;
 
 public interface ToscaMetadataParser {
     JsonObject processAllMetadataElement(ToscaElementProperty toscaElementProperty, Service serviceModel);
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
index 3fdd192d6..049018ae0 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/parser/metadata/ToscaMetadataParserWithDictionarySupport.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.parser.metadata;
+package org.onap.policy.clamp.clds.tosca.update.parser.metadata;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -29,13 +29,13 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Optional;
-import org.onap.clamp.clds.tosca.JsonEditorSchemaConstants;
-import org.onap.clamp.clds.tosca.ToscaSchemaConstants;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.tosca.JsonEditorSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplate.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
index 0b7a9a171..5c96f2c4a 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplate.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplate.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.templates;
+package org.onap.policy.clamp.clds.tosca.update.templates;
 
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateField.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
index a1e15307c..d9fd11de2 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateField.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateField.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.templates;
+package org.onap.policy.clamp.clds.tosca.update.templates;
 
 public class JsonTemplateField {
     private String title;
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateManager.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
index a278cb667..1813d0786 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/templates/JsonTemplateManager.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/templates/JsonTemplateManager.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update.templates;
+package org.onap.policy.clamp.clds.tosca.update.templates;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -29,13 +29,13 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import org.onap.clamp.clds.tosca.update.UnknownComponentException;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.parser.ToscaConverterToJsonSchema;
-import org.onap.clamp.clds.tosca.update.parser.ToscaElementParser;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.tosca.update.UnknownComponentException;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.parser.ToscaConverterToJsonSchema;
+import org.onap.policy.clamp.clds.tosca.update.parser.ToscaElementParser;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParser;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.service.Service;
 
 public class JsonTemplateManager {
     private LinkedHashMap<String, JsonTemplate> jsonSchemaTemplates;
diff --git a/src/main/java/org/onap/clamp/clds/util/ClampVersioning.java b/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
index bcdae5e43..0890615d9 100644
--- a/src/main/java/org/onap/clamp/clds/util/ClampVersioning.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/ClampVersioning.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/src/main/java/org/onap/clamp/clds/util/CryptoUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/CryptoUtils.java
index 1ddf3a90a..01dd48763 100644
--- a/src/main/java/org/onap/clamp/clds/util/CryptoUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/CryptoUtils.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -80,7 +80,7 @@ public final class CryptoUtils {
     /**
      * Key to read in the key.properties file.
      */
-    private static final String KEY_PARAM = "org.onap.clamp.encryption.aes.key";
+    private static final String KEY_PARAM = "org.onap.policy.clamp.encryption.aes.key";
     private static final String PROPERTIES_FILE_NAME = "clds/key.properties";
     /**
      * The SecretKeySpec created from the Base 64 String key.
diff --git a/src/main/java/org/onap/clamp/clds/util/JsonUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
index fa639a0a1..d57ce2095 100644
--- a/src/main/java/org/onap/clamp/clds/util/JsonUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/JsonUtils.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.time.Instant;
-import org.onap.clamp.authorization.SecureServicePermission;
-import org.onap.clamp.authorization.SecureServicePermissionDeserializer;
-import org.onap.clamp.dao.model.gson.converter.InstantDeserializer;
-import org.onap.clamp.dao.model.gson.converter.InstantSerializer;
+import org.onap.policy.clamp.authorization.SecureServicePermission;
+import org.onap.policy.clamp.authorization.SecureServicePermissionDeserializer;
+import org.onap.policy.clamp.dao.model.gson.converter.InstantDeserializer;
+import org.onap.policy.clamp.dao.model.gson.converter.InstantSerializer;
 
 /**
  * This class is used to access the GSON with restricted type access.
diff --git a/src/main/java/org/onap/clamp/clds/util/LogMessages.java b/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
index 7f4c8781f..676206e0f 100644
--- a/src/main/java/org/onap/clamp/clds/util/LogMessages.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/LogMessages.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import com.att.eelf.i18n.EELFResolvableErrorEnum;
 import com.att.eelf.i18n.EELFResourceManager;
diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
index a502a52cb..d7a158e73 100644
--- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/LoggingUtils.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
@@ -39,7 +39,7 @@ import java.util.UUID;
 import javax.net.ssl.HttpsURLConnection;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotNull;
-import org.onap.clamp.authorization.AuthorizationController;
+import org.onap.policy.clamp.authorization.AuthorizationController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
diff --git a/src/main/java/org/onap/clamp/clds/util/OnapLogConstants.java b/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
index 8185b7592..78b16f1a0 100644
--- a/src/main/java/org/onap/clamp/clds/util/OnapLogConstants.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/OnapLogConstants.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
diff --git a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtils.java b/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
index f858ed2b8..cd4700277 100644
--- a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtils.java
+++ b/src/main/java/org/onap/policy/clamp/clds/util/ResourceFileUtils.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/onap/clamp/configuration/ClampGsonDataFormat.java b/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
index 3b56772ca..e5f12163e 100644
--- a/src/main/java/org/onap/clamp/configuration/ClampGsonDataFormat.java
+++ b/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
@@ -20,7 +20,7 @@
  * ===================================================================
  */
 
-package org.onap.clamp.configuration;
+package org.onap.policy.clamp.configuration;
 
 import com.google.gson.Gson;
 import java.io.BufferedReader;
@@ -36,7 +36,7 @@ import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.DataFormatName;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.IOHelper;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.JsonUtils;
 
 public class ClampGsonDataFormat extends ServiceSupport implements DataFormat, DataFormatName {
     private Gson gson;
diff --git a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantDeserializer.java b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
index 2c6c47f54..db024e07a 100644
--- a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantDeserializer.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantDeserializer.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.dao.model.gson.converter;
+package org.onap.policy.clamp.dao.model.gson.converter;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantSerializer.java b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
index 3705f122b..7208a472c 100644
--- a/src/main/java/org/onap/clamp/dao/model/gson/converter/InstantSerializer.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/gson/converter/InstantSerializer.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.dao.model.gson.converter;
+package org.onap.policy.clamp.dao.model.gson.converter;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
diff --git a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
index 7370e40bf..d3aaa32a9 100644
--- a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonStringSqlTypeDescriptor.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
diff --git a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonTypeDescriptor.java b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
index 266809401..ed8464b14 100644
--- a/src/main/java/org/onap/clamp/dao/model/jsontype/JsonTypeDescriptor.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/JsonTypeDescriptor.java
@@ -21,14 +21,14 @@
  *
  */
 
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
 
 import com.google.gson.JsonObject;
 import java.io.Serializable;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.JsonUtils;
 
 public class JsonTypeDescriptor extends AbstractTypeDescriptor<JsonObject> {
 
diff --git a/src/main/java/org/onap/clamp/dao/model/jsontype/StringJsonUserType.java b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
index 509057d16..4a7b65bb4 100644
--- a/src/main/java/org/onap/clamp/dao/model/jsontype/StringJsonUserType.java
+++ b/src/main/java/org/onap/policy/clamp/dao/model/jsontype/StringJsonUserType.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
 
 import com.google.gson.JsonObject;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
diff --git a/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java b/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
index e31406b2c..d54b23b21 100644
--- a/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java
+++ b/src/main/java/org/onap/policy/clamp/flow/log/FlowLogOperation.java
@@ -21,12 +21,12 @@
  *
  */
 
-package org.onap.clamp.flow.log;
+package org.onap.policy.clamp.flow.log;
 
 import javax.servlet.http.HttpServletRequest;
 import org.apache.camel.Exchange;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.util.OnapLogConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
diff --git a/src/main/java/org/onap/clamp/loop/CsarInstaller.java b/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
index a1ef612c6..753789a68 100644
--- a/src/main/java/org/onap/clamp/loop/CsarInstaller.java
+++ b/src/main/java/org/onap/policy/clamp/loop/CsarInstaller.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -30,25 +30,24 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.client.DcaeInventoryServices;
-import org.onap.clamp.clds.client.PolicyEngineServices;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintParser;
-import org.onap.clamp.clds.sdc.controller.installer.ChainGenerator;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.loop.cds.CdsDataInstaller;
-import org.onap.clamp.loop.service.CsarServiceInstaller;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.LoopTemplatesRepository;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.clds.client.DcaeInventoryServices;
+import org.onap.policy.clamp.clds.client.PolicyEngineServices;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintMicroService;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintParser;
+import org.onap.policy.clamp.clds.sdc.controller.installer.ChainGenerator;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.loop.cds.CdsDataInstaller;
+import org.onap.policy.clamp.loop.service.CsarServiceInstaller;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.LoopTemplatesRepository;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/policy/clamp/loop/Loop.java
index 9fde19542..99d8d1e69 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/policy/clamp/loop/Loop.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
@@ -50,19 +50,19 @@ import org.hibernate.annotations.SortNatural;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.components.external.DcaeComponent;
-import org.onap.clamp.loop.components.external.ExternalComponent;
-import org.onap.clamp.loop.components.external.PolicyComponent;
-import org.onap.clamp.loop.deploy.DcaeDeployParameters;
-import org.onap.clamp.loop.log.LoopLog;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.components.external.DcaeComponent;
+import org.onap.policy.clamp.loop.components.external.ExternalComponent;
+import org.onap.policy.clamp.loop.components.external.PolicyComponent;
+import org.onap.policy.clamp.loop.deploy.DcaeDeployParameters;
+import org.onap.policy.clamp.loop.log.LoopLog;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
 
 @Entity
 @Table(name = "loops")
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/policy/clamp/loop/LoopController.java
index 603726f56..98459c909 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopController.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -29,12 +29,12 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.List;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/policy/clamp/loop/LoopService.java
index 5f0822816..975011669 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopService.java
@@ -21,21 +21,21 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 import javax.persistence.EntityNotFoundException;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.template.LoopTemplatesService;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.template.LoopTemplatesService;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/onap/clamp/loop/LoopState.java b/src/main/java/org/onap/policy/clamp/loop/LoopState.java
index 4707730ce..48d4487f0 100644
--- a/src/main/java/org/onap/clamp/loop/LoopState.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopState.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 public enum LoopState {
     DESIGN, SUBMITTED, DEPLOYED, RUNNING, STOPPED, IN_ERROR, WAITING;
diff --git a/src/main/java/org/onap/clamp/loop/LoopsRepository.java b/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
index c2ef2fd0e..7b92ed584 100644
--- a/src/main/java/org/onap/clamp/loop/LoopsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java b/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
index 4c331b7d0..68adb3887 100644
--- a/src/main/java/org/onap/clamp/loop/cds/CdsDataInstaller.java
+++ b/src/main/java/org/onap/policy/clamp/loop/cds/CdsDataInstaller.java
@@ -22,16 +22,16 @@
  *
  */
 
-package org.onap.clamp.loop.cds;
+package org.onap.policy.clamp.loop.cds;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
-import org.onap.clamp.clds.client.CdsServices;
-import org.onap.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.service.ServicesRepository;
+import org.onap.policy.clamp.clds.client.CdsServices;
+import org.onap.policy.clamp.clds.model.cds.CdsBpWorkFlowListResponse;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.service.ServicesRepository;
 import org.onap.sdc.tosca.parser.enums.SdcTypes;
 import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/onap/clamp/loop/common/AuditEntity.java b/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
index d5a1bfc59..92c795e90 100644
--- a/src/main/java/org/onap/clamp/loop/common/AuditEntity.java
+++ b/src/main/java/org/onap/policy/clamp/loop/common/AuditEntity.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.common;
+package org.onap.policy.clamp.loop.common;
 
 import com.google.gson.annotations.Expose;
 import java.time.Instant;
diff --git a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java b/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
index d6a061f41..1b36aab55 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/DcaeComponent.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -36,11 +36,11 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.model.dcae.DcaeOperationStatusResponse;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.model.dcae.DcaeOperationStatusResponse;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
 
 public class DcaeComponent extends ExternalComponent {
 
diff --git a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponent.java b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
index 1cfb93a35..ce7efe494 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponent.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponent.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
 
 import com.google.gson.annotations.Expose;
 import org.apache.camel.Exchange;
diff --git a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponentState.java b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
index a57234af0..a57800025 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/ExternalComponentState.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/ExternalComponentState.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
index 8a5ff7fc6..648463d78 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/policy/clamp/loop/components/external/PolicyComponent.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.components.external;
+package org.onap.policy.clamp.loop.components.external;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -35,9 +35,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import javax.persistence.Transient;
 import org.apache.camel.Exchange;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
 
 public class PolicyComponent extends ExternalComponent {
 
diff --git a/src/main/java/org/onap/clamp/loop/deploy/DcaeDeployParameters.java b/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
index b00c99c5f..9d56f23c4 100644
--- a/src/main/java/org/onap/clamp/loop/deploy/DcaeDeployParameters.java
+++ b/src/main/java/org/onap/policy/clamp/loop/deploy/DcaeDeployParameters.java
@@ -21,16 +21,16 @@
  *
  */
 
-package org.onap.clamp.loop.deploy;
+package org.onap.policy.clamp.loop.deploy;
 
 import com.google.gson.JsonObject;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.components.external.DcaeComponent;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.components.external.DcaeComponent;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
 import org.yaml.snakeyaml.Yaml;
 
 /**
diff --git a/src/main/java/org/onap/clamp/loop/log/LogType.java b/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
index 13d9dccf8..50f6571d6 100644
--- a/src/main/java/org/onap/clamp/loop/log/LogType.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LogType.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
 
 public enum LogType {
     INFO, WARNING, ERROR;
diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLog.java b/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
index ad3c7970f..00f7e1f41 100644
--- a/src/main/java/org/onap/clamp/loop/log/LoopLog.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LoopLog.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
@@ -38,7 +38,7 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import org.onap.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.Loop;
 
 /**
  * This class holds the logs created by the Clamp Backend. The Instant is always
diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
index 0b3c34ec0..df1f3919e 100644
--- a/src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLogService.java b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
index d02d0b278..a2f133f2f 100644
--- a/src/main/java/org/onap/clamp/loop/log/LoopLogService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/log/LoopLogService.java
@@ -21,9 +21,9 @@
  *
  */
 
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
 
-import org.onap.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.Loop;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java b/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
index c43f2cb6d..1429d73c2 100644
--- a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java
+++ b/src/main/java/org/onap/policy/clamp/loop/service/CsarServiceInstaller.java
@@ -22,15 +22,15 @@
  *
  */
 
-package org.onap.clamp.loop.service;
+package org.onap.policy.clamp.loop.service;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
 import java.util.Map.Entry;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.clds.util.JsonUtils;
 import org.onap.sdc.tosca.parser.api.IEntityDetails;
 import org.onap.sdc.tosca.parser.elements.queries.EntityQuery;
 import org.onap.sdc.tosca.parser.elements.queries.TopologyTemplateQuery;
diff --git a/src/main/java/org/onap/clamp/loop/service/Service.java b/src/main/java/org/onap/policy/clamp/loop/service/Service.java
index 2ac9d7e87..b7442abc5 100644
--- a/src/main/java/org/onap/clamp/loop/service/Service.java
+++ b/src/main/java/org/onap/policy/clamp/loop/service/Service.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.service;
+package org.onap.policy.clamp.loop.service;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -36,8 +36,8 @@ import javax.persistence.Transient;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
 
 @Entity
 @Table(name = "services")
diff --git a/src/main/java/org/onap/clamp/loop/service/ServicesRepository.java b/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
index fe5ba8ed0..62596a08e 100644
--- a/src/main/java/org/onap/clamp/loop/service/ServicesRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/service/ServicesRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.service;
+package org.onap.policy.clamp.loop.service;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
index f210df949..6eb3c7195 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModel.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
@@ -40,12 +40,12 @@ import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import org.hibernate.annotations.SortNatural;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.policy.Policy;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.policy.Policy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
 
 /**
  * This class represents a micro service/operational/... model for a loop template.
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModelsRepository.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
index 27b82189c..d9b879d0f 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModelsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopElementModelsRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
index 1204c6c62..ab7367aaf 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplate.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
@@ -39,8 +39,8 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import org.hibernate.annotations.SortNatural;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.service.Service;
 
 @Entity
 @Table(name = "loop_templates")
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModel.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
index 36fc3fb1d..c0b0c7d24 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModel.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModel.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
index cac5f088a..9da8272bd 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplateLoopElementModelId.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesRepository.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
index c647c261a..3993dee34 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
index 29382137e..974cf3b5c 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTemplatesService.java
@@ -21,10 +21,10 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import java.util.List;
-import org.onap.clamp.clds.sdc.controller.installer.ChainGenerator;
+import org.onap.policy.clamp.clds.sdc.controller.installer.ChainGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopType.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
index ccbc62a83..eacfecb5e 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopType.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopType.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 /**
  * Enums for AllowedLoopType in LoopTemplate enity.
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java b/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
index 0b05613cb..81ca18d57 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/LoopTypeConvertor.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import java.util.stream.Stream;
 import javax.persistence.AttributeConverter;
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
index 3f45d0551..2414377d7 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModel.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
@@ -38,9 +38,9 @@ import javax.persistence.Table;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.util.SemanticVersioning;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.util.SemanticVersioning;
 
 /**
  * This class represents the policy model tosca revision that we can have to a
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelId.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
index 3fd19171f..2591bd174 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelId.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelId.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsRepository.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
index f4b09caeb..6ff7e3d0c 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
index c482c34d5..8670ab73e 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
+++ b/src/main/java/org/onap/policy/clamp/loop/template/PolicyModelsService.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.onap.clamp.clds.tosca.ToscaSchemaConstants;
-import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
-import org.onap.clamp.policy.pdpgroup.PdpGroup;
-import org.onap.clamp.util.SemanticVersioning;
+import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.policy.clamp.clds.tosca.ToscaYamlToJsonConvertor;
+import org.onap.policy.clamp.policy.pdpgroup.PdpGroup;
+import org.onap.policy.clamp.util.SemanticVersioning;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/policy/clamp/policy/Policy.java
index d84f2c8a0..801183cab 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/policy/clamp/policy/Policy.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy;
+package org.onap.policy.clamp.policy;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -43,12 +43,12 @@ import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.json.JSONObject;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.common.AuditEntity;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
 import org.yaml.snakeyaml.Yaml;
 
 @MappedSuperclass
diff --git a/src/main/java/org/onap/clamp/policy/PolicyService.java b/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
index ad092b516..35ffa2443 100644
--- a/src/main/java/org/onap/clamp/policy/PolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
@@ -21,11 +21,11 @@
  *
  */
 
-package org.onap.clamp.policy;
+package org.onap.policy.clamp.policy;
 
 import java.util.List;
 import java.util.Set;
-import org.onap.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.Loop;
 
 public interface PolicyService<T extends Policy> {
 
diff --git a/src/main/java/org/onap/clamp/policy/downloader/PolicyEngineController.java b/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
index b9777029a..569678dc7 100644
--- a/src/main/java/org/onap/clamp/policy/downloader/PolicyEngineController.java
+++ b/src/main/java/org/onap/policy/clamp/policy/downloader/PolicyEngineController.java
@@ -21,14 +21,14 @@
  *
  */
 
-package org.onap.clamp.policy.downloader;
+package org.onap.policy.clamp.policy.downloader;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.time.Instant;
 import org.json.simple.parser.ParseException;
-import org.onap.clamp.clds.client.PolicyEngineServices;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.clds.client.PolicyEngineServices;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
index a654edab9..2e5db8e24 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicy.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
 
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
@@ -37,13 +37,13 @@ import javax.persistence.Table;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.Policy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.Policy;
 
 @Entity
 @Table(name = "micro_service_policies")
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
index 38b310ce8..2ce2c4f17 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java
+++ b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
index 060e79a63..b9871049e 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/microservice/MicroServicePolicyService.java
@@ -21,14 +21,14 @@
  *
  */
 
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
 
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.policy.PolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.policy.PolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
index 4b052427f..5b29f319c 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicy.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -41,13 +41,13 @@ import javax.persistence.Transient;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.Policy;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.dao.model.jsontype.StringJsonUserType;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.Policy;
 
 @Entity
 @Table(name = "operational_policies")
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
index c0a6e12cd..b0a33669a 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 9bae7bd04..8a1bb1abf 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -33,9 +33,9 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.service.Service;
 
 public class OperationalPolicyRepresentationBuilder {
 
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
index d5442e145..3f3f39b45 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/operational/OperationalPolicyService.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
-import org.onap.clamp.policy.PolicyService;
+import org.onap.policy.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.policy.PolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpGroup.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroup.java
index 6a070c550..9cbeec109 100644
--- a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpGroup.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroup.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpSubgroup.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpSubgroup.java
index 28de79abf..890f90775 100644
--- a/src/main/java/org/onap/clamp/policy/pdpgroup/PdpSubgroup.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PdpSubgroup.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import com.google.gson.annotations.Expose;
 import java.util.List;
diff --git a/src/main/java/org/onap/clamp/policy/pdpgroup/PolicyModelKey.java b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKey.java
index 6d9343dc5..df92bfdf9 100644
--- a/src/main/java/org/onap/clamp/policy/pdpgroup/PolicyModelKey.java
+++ b/src/main/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKey.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
diff --git a/src/main/java/org/onap/clamp/tosca/Dictionary.java b/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
index cf514c4bd..4b01d6902 100644
--- a/src/main/java/org/onap/clamp/tosca/Dictionary.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/Dictionary.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
@@ -36,7 +36,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-import org.onap.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.common.AuditEntity;
 
 /**
  * Represents Dictionary.
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryElement.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
index 43a3106f5..ecf4b876c 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryElement.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElement.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
 
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
@@ -33,7 +33,7 @@ import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-import org.onap.clamp.loop.common.AuditEntity;
+import org.onap.policy.clamp.loop.common.AuditEntity;
 
 /**
  * Represents a Dictionary Item.
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
index 43f6f1d40..0bc50fe1a 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryElementsRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
index ae8430d93..a2f417d17 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryRepository.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
 
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryService.java b/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
index 6172641a7..849d4baae 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryService.java
+++ b/src/main/java/org/onap/policy/clamp/tosca/DictionaryService.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
 
 import com.google.common.collect.Sets;
 import java.util.List;
diff --git a/src/main/java/org/onap/clamp/util/PassDecoder.java b/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
index b2e4ca2c5..f4b8ed4dc 100644
--- a/src/main/java/org/onap/clamp/util/PassDecoder.java
+++ b/src/main/java/org/onap/policy/clamp/util/PassDecoder.java
@@ -20,16 +20,13 @@
  * ===================================================================
  */
 
-package org.onap.clamp.util;
+package org.onap.policy.clamp.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import org.onap.aaf.cadi.Symm;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 
 /**
  * PassDecoder for decrypting the truststore and keystore password.
diff --git a/src/main/java/org/onap/clamp/util/SemanticVersioning.java b/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
index 8852e2a4f..58367193f 100644
--- a/src/main/java/org/onap/clamp/util/SemanticVersioning.java
+++ b/src/main/java/org/onap/policy/clamp/util/SemanticVersioning.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.util;
+package org.onap.policy.clamp.util;
 
 /**
  * This class is the base class for object that requires semantic versioning.
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 6f6156c32..ab1d4fa1a 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,31 +444,31 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route35">2.1. GET /v1/healthcheck</a>
+<li><a href="#_route107">2.1. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route36">2.2. GET /v1/user/getUser</a>
+<li><a href="#_route108">2.2. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route34">2.3. GET /v2/clampInformation</a>
+<li><a href="#_route106">2.3. GET /v2/clampInformation</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route19">2.4. GET /v2/dictionary</a>
+<li><a href="#_route91">2.4. GET /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_4">2.4.1. Responses</a></li>
 <li><a href="#_produces_4">2.4.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route22">2.5. PUT /v2/dictionary</a>
+<li><a href="#_route94">2.5. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters">2.5.1. Parameters</a></li>
 <li><a href="#_responses_5">2.5.2. Responses</a></li>
@@ -476,20 +476,20 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_5">2.5.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route20">2.6. GET /v2/dictionary/secondary/names</a>
+<li><a href="#_route92">2.6. GET /v2/dictionary/secondary/names</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_6">2.6.1. Responses</a></li>
 <li><a href="#_produces_6">2.6.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route21">2.7. GET /v2/dictionary/{dictionaryName}</a>
+<li><a href="#_route93">2.7. GET /v2/dictionary/{dictionaryName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_2">2.7.1. Parameters</a></li>
 <li><a href="#_responses_7">2.7.2. Responses</a></li>
 <li><a href="#_produces_7">2.7.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route23">2.8. PUT /v2/dictionary/{name}</a>
+<li><a href="#_route95">2.8. PUT /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_3">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
@@ -497,28 +497,28 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_8">2.8.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route24">2.9. DELETE /v2/dictionary/{name}</a>
+<li><a href="#_route96">2.9. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_4">2.9.1. Parameters</a></li>
 <li><a href="#_responses_9">2.9.2. Responses</a></li>
 <li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route25">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a>
+<li><a href="#_route97">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_5">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
 <li><a href="#_produces_10">2.10.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route16">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a>
+<li><a href="#_route88">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_6">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
 <li><a href="#_produces_11">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route18">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a>
+<li><a href="#_route90">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_7">2.12.1. Parameters</a></li>
 <li><a href="#_responses_12">2.12.2. Responses</a></li>
@@ -526,82 +526,82 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_12">2.12.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route14">2.13. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route86">2.13. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_8">2.13.1. Parameters</a></li>
 <li><a href="#_responses_13">2.13.2. Responses</a></li>
 </ul>
 </li>
-<li><a href="#_route7">2.14. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route79">2.14. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route2">2.15. GET /v2/loop/getAllNames</a>
+<li><a href="#_route74">2.15. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_15">2.15.1. Responses</a></li>
 <li><a href="#_produces_14">2.15.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route15">2.16. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route87">2.16. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_10">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route8">2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}</a>
+<li><a href="#_route80">2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_11">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
 <li><a href="#_produces_16">2.17.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route9">2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}</a>
+<li><a href="#_route81">2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_12">2.18.1. Parameters</a></li>
 <li><a href="#_responses_18">2.18.2. Responses</a></li>
 <li><a href="#_produces_17">2.18.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route17">2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}</a>
+<li><a href="#_route89">2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_13">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
 <li><a href="#_produces_18">2.19.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route12">2.20. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route84">2.20. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_14">2.20.1. Parameters</a></li>
 <li><a href="#_responses_20">2.20.2. Responses</a></li>
 <li><a href="#_produces_19">2.20.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route11">2.21. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route83">2.21. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_15">2.21.1. Parameters</a></li>
 <li><a href="#_responses_21">2.21.2. Responses</a></li>
 <li><a href="#_produces_20">2.21.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route13">2.22. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route85">2.22. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_16">2.22.1. Parameters</a></li>
 <li><a href="#_responses_22">2.22.2. Responses</a></li>
 <li><a href="#_produces_21">2.22.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route10">2.23. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route82">2.23. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_17">2.23.1. Parameters</a></li>
 <li><a href="#_responses_23">2.23.2. Responses</a></li>
 <li><a href="#_produces_22">2.23.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route4">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route76">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_18">2.24.1. Parameters</a></li>
 <li><a href="#_responses_24">2.24.2. Responses</a></li>
@@ -609,7 +609,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_23">2.24.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route6">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route78">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_19">2.25.1. Parameters</a></li>
 <li><a href="#_responses_25">2.25.2. Responses</a></li>
@@ -617,7 +617,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_24">2.25.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route5">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route77">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_20">2.26.1. Parameters</a></li>
 <li><a href="#_responses_26">2.26.2. Responses</a></li>
@@ -625,14 +625,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_25">2.26.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route3">2.27. GET /v2/loop/{loopName}</a>
+<li><a href="#_route75">2.27. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_21">2.27.1. Parameters</a></li>
 <li><a href="#_responses_27">2.27.2. Responses</a></li>
 <li><a href="#_produces_26">2.27.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route29">2.28. POST /v2/policyToscaModels</a>
+<li><a href="#_route101">2.28. POST /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_22">2.28.1. Parameters</a></li>
 <li><a href="#_responses_28">2.28.2. Responses</a></li>
@@ -640,27 +640,27 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_27">2.28.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route26">2.29. GET /v2/policyToscaModels</a>
+<li><a href="#_route98">2.29. GET /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_29">2.29.1. Responses</a></li>
 <li><a href="#_produces_28">2.29.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route28">2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}</a>
+<li><a href="#_route100">2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_23">2.30.1. Parameters</a></li>
 <li><a href="#_responses_30">2.30.2. Responses</a></li>
 <li><a href="#_produces_29">2.30.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route27">2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a>
+<li><a href="#_route99">2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_24">2.31.1. Parameters</a></li>
 <li><a href="#_responses_31">2.31.2. Responses</a></li>
 <li><a href="#_produces_30">2.31.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route30">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a>
+<li><a href="#_route102">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_25">2.32.1. Parameters</a></li>
 <li><a href="#_responses_32">2.32.2. Responses</a></li>
@@ -668,19 +668,19 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_31">2.32.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route31">2.33. GET /v2/templates</a>
+<li><a href="#_route103">2.33. GET /v2/templates</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_33">2.33.1. Responses</a></li>
 <li><a href="#_produces_32">2.33.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route33">2.34. GET /v2/templates/names</a>
+<li><a href="#_route105">2.34. GET /v2/templates/names</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_34">2.34.1. Responses</a></li>
 <li><a href="#_produces_33">2.34.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route32">2.35. GET /v2/templates/{templateName}</a>
+<li><a href="#_route104">2.35. GET /v2/templates/{templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_26">2.35.1. Parameters</a></li>
 <li><a href="#_responses_35">2.35.2. Responses</a></li>
@@ -723,13 +723,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_version_information"><a class="anchor" href="#_version_information"></a><a class="link" href="#_version_information">1.1. Version information</a></h3>
 <div class="paragraph">
-<p><em>Version</em> : 5.1.3-SNAPSHOT</p>
+<p><em>Version</em> : 5.1.5-SNAPSHOT</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:8443<br>
+<p><em>Host</em> : localhost:38837<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -740,7 +740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route35"><a class="anchor" href="#_route35"></a><a class="link" href="#_route35">2.1. GET /v1/healthcheck</a></h3>
+<h3 id="_route107"><a class="anchor" href="#_route107"></a><a class="link" href="#_route107">2.1. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -777,7 +777,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route36"><a class="anchor" href="#_route36"></a><a class="link" href="#_route36">2.2. GET /v1/user/getUser</a></h3>
+<h3 id="_route108"><a class="anchor" href="#_route108"></a><a class="link" href="#_route108">2.2. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -811,7 +811,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route34"><a class="anchor" href="#_route34"></a><a class="link" href="#_route34">2.3. GET /v2/clampInformation</a></h3>
+<h3 id="_route106"><a class="anchor" href="#_route106"></a><a class="link" href="#_route106">2.3. GET /v2/clampInformation</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -848,7 +848,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route19"><a class="anchor" href="#_route19"></a><a class="link" href="#_route19">2.4. GET /v2/dictionary</a></h3>
+<h3 id="_route91"><a class="anchor" href="#_route91"></a><a class="link" href="#_route91">2.4. GET /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_responses_4"><a class="anchor" href="#_responses_4"></a><a class="link" href="#_responses_4">2.4.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -885,7 +885,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.5. PUT /v2/dictionary</a></h3>
+<h3 id="_route94"><a class="anchor" href="#_route94"></a><a class="link" href="#_route94">2.5. PUT /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.5.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -957,7 +957,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.6. GET /v2/dictionary/secondary/names</a></h3>
+<h3 id="_route92"><a class="anchor" href="#_route92"></a><a class="link" href="#_route92">2.6. GET /v2/dictionary/secondary/names</a></h3>
 <div class="sect3">
 <h4 id="_responses_6"><a class="anchor" href="#_responses_6"></a><a class="link" href="#_responses_6">2.6.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -994,7 +994,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route21"><a class="anchor" href="#_route21"></a><a class="link" href="#_route21">2.7. GET /v2/dictionary/{dictionaryName}</a></h3>
+<h3 id="_route93"><a class="anchor" href="#_route93"></a><a class="link" href="#_route93">2.7. GET /v2/dictionary/{dictionaryName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_2"><a class="anchor" href="#_parameters_2"></a><a class="link" href="#_parameters_2">2.7.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1056,7 +1056,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route23"><a class="anchor" href="#_route23"></a><a class="link" href="#_route23">2.8. PUT /v2/dictionary/{name}</a></h3>
+<h3 id="_route95"><a class="anchor" href="#_route95"></a><a class="link" href="#_route95">2.8. PUT /v2/dictionary/{name}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_3"><a class="anchor" href="#_parameters_3"></a><a class="link" href="#_parameters_3">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1134,7 +1134,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route24"><a class="anchor" href="#_route24"></a><a class="link" href="#_route24">2.9. DELETE /v2/dictionary/{name}</a></h3>
+<h3 id="_route96"><a class="anchor" href="#_route96"></a><a class="link" href="#_route96">2.9. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.9.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1193,7 +1193,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a></h3>
+<h3 id="_route97"><a class="anchor" href="#_route97"></a><a class="link" href="#_route97">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_5"><a class="anchor" href="#_parameters_5"></a><a class="link" href="#_parameters_5">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1258,7 +1258,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route16"><a class="anchor" href="#_route16"></a><a class="link" href="#_route16">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a></h3>
+<h3 id="_route88"><a class="anchor" href="#_route88"></a><a class="link" href="#_route88">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1332,7 +1332,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a></h3>
+<h3 id="_route90"><a class="anchor" href="#_route90"></a><a class="link" href="#_route90">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.12.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1404,7 +1404,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.13. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route86"><a class="anchor" href="#_route86"></a><a class="link" href="#_route86">2.13. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.13.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1453,7 +1453,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.14. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route79"><a class="anchor" href="#_route79"></a><a class="link" href="#_route79">2.14. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1515,7 +1515,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.15. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route74"><a class="anchor" href="#_route74"></a><a class="link" href="#_route74">2.15. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
 <h4 id="_responses_15"><a class="anchor" href="#_responses_15"></a><a class="link" href="#_responses_15">2.15.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1552,7 +1552,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.16. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route87"><a class="anchor" href="#_route87"></a><a class="link" href="#_route87">2.16. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1614,7 +1614,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}</a></h3>
+<h3 id="_route80"><a class="anchor" href="#_route80"></a><a class="link" href="#_route80">2.17. PUT /v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1682,7 +1682,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}</a></h3>
+<h3 id="_route81"><a class="anchor" href="#_route81"></a><a class="link" href="#_route81">2.18. PUT /v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.18.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1750,7 +1750,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route17"><a class="anchor" href="#_route17"></a><a class="link" href="#_route17">2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}</a></h3>
+<h3 id="_route89"><a class="anchor" href="#_route89"></a><a class="link" href="#_route89">2.19. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1830,7 +1830,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.20. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route84"><a class="anchor" href="#_route84"></a><a class="link" href="#_route84">2.20. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.20.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1892,7 +1892,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.21. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route83"><a class="anchor" href="#_route83"></a><a class="link" href="#_route83">2.21. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.21.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1954,7 +1954,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.22. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route85"><a class="anchor" href="#_route85"></a><a class="link" href="#_route85">2.22. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.22.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2016,7 +2016,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.23. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route82"><a class="anchor" href="#_route82"></a><a class="link" href="#_route82">2.23. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.23.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2078,7 +2078,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route76"><a class="anchor" href="#_route76"></a><a class="link" href="#_route76">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.24.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2156,7 +2156,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route78"><a class="anchor" href="#_route78"></a><a class="link" href="#_route78">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_19"><a class="anchor" href="#_parameters_19"></a><a class="link" href="#_parameters_19">2.25.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2234,7 +2234,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route77"><a class="anchor" href="#_route77"></a><a class="link" href="#_route77">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_20"><a class="anchor" href="#_parameters_20"></a><a class="link" href="#_parameters_20">2.26.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2312,7 +2312,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.27. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route75"><a class="anchor" href="#_route75"></a><a class="link" href="#_route75">2.27. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.27.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2374,7 +2374,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.28. POST /v2/policyToscaModels</a></h3>
+<h3 id="_route101"><a class="anchor" href="#_route101"></a><a class="link" href="#_route101">2.28. POST /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_parameters_22"><a class="anchor" href="#_parameters_22"></a><a class="link" href="#_parameters_22">2.28.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2446,7 +2446,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.29. GET /v2/policyToscaModels</a></h3>
+<h3 id="_route98"><a class="anchor" href="#_route98"></a><a class="link" href="#_route98">2.29. GET /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_responses_29"><a class="anchor" href="#_responses_29"></a><a class="link" href="#_responses_29">2.29.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2483,7 +2483,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route28"><a class="anchor" href="#_route28"></a><a class="link" href="#_route28">2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}</a></h3>
+<h3 id="_route100"><a class="anchor" href="#_route100"></a><a class="link" href="#_route100">2.30. GET /v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_23"><a class="anchor" href="#_parameters_23"></a><a class="link" href="#_parameters_23">2.30.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2551,7 +2551,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route27"><a class="anchor" href="#_route27"></a><a class="link" href="#_route27">2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a></h3>
+<h3 id="_route99"><a class="anchor" href="#_route99"></a><a class="link" href="#_route99">2.31. GET /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_24"><a class="anchor" href="#_parameters_24"></a><a class="link" href="#_parameters_24">2.31.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2619,7 +2619,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a></h3>
+<h3 id="_route102"><a class="anchor" href="#_route102"></a><a class="link" href="#_route102">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_25"><a class="anchor" href="#_parameters_25"></a><a class="link" href="#_parameters_25">2.32.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2703,7 +2703,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.33. GET /v2/templates</a></h3>
+<h3 id="_route103"><a class="anchor" href="#_route103"></a><a class="link" href="#_route103">2.33. GET /v2/templates</a></h3>
 <div class="sect3">
 <h4 id="_responses_33"><a class="anchor" href="#_responses_33"></a><a class="link" href="#_responses_33">2.33.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2740,7 +2740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route33"><a class="anchor" href="#_route33"></a><a class="link" href="#_route33">2.34. GET /v2/templates/names</a></h3>
+<h3 id="_route105"><a class="anchor" href="#_route105"></a><a class="link" href="#_route105">2.34. GET /v2/templates/names</a></h3>
 <div class="sect3">
 <h4 id="_responses_34"><a class="anchor" href="#_responses_34"></a><a class="link" href="#_responses_34">2.34.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2777,7 +2777,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route32"><a class="anchor" href="#_route32"></a><a class="link" href="#_route32">2.35. GET /v2/templates/{templateName}</a></h3>
+<h3 id="_route104"><a class="anchor" href="#_route104"></a><a class="link" href="#_route104">2.35. GET /v2/templates/{templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_26"><a class="anchor" href="#_parameters_26"></a><a class="link" href="#_parameters_26">2.35.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -4197,7 +4197,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-08-13 14:06:50 CEST
+Last updated 2020-12-10 09:38:32 CET
 </div>
 </div>
 </body>
diff --git a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson b/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson
index 3fa78e040..04caffa99 100644
--- a/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson
+++ b/src/main/resources/META-INF/services/org/apache/camel/dataformat/clamp-gson
@@ -20,4 +20,4 @@
  * ===================================================================
  */
  
-class=org.onap.clamp.configuration.ClampGsonDataFormat
\ No newline at end of file
+class=org.onap.policy.clamp.configuration.ClampGsonDataFormat
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 505ea30d9..c43f3297d 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -6,20 +6,20 @@
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=getLoopNames()" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=getLoopNames()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET All Loop names FAILED: ${exception.stacktrace}" />
 
@@ -33,26 +33,26 @@
 				</doTry>
 			</route>
 		</get>
-		<get uri="/v2/loop/{loopName}" outType="org.onap.clamp.loop.Loop"
+		<get uri="/v2/loop/{loopName}" outType="org.onap.policy.clamp.loop.Loop"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}" />
 
@@ -68,32 +68,32 @@
 		</get>
 
 		<post uri="/v2/loop/updateGlobalProperties/{loopName}"
-			type="com.google.gson.JsonObject" consumes="application/json"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+              type="com.google.gson.JsonObject" consumes="application/json"
+              outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<setHeader headerName="GlobalPropertiesJson">
 						<simple>${body}</simple>
 					</setHeader>
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 
@@ -108,36 +108,36 @@
 			</route>
 		</post>
 		<post uri="/v2/loop/updateOperationalPolicies/{loopName}"
-			type="com.google.gson.JsonArray" consumes="application/json"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+              type="com.google.gson.JsonArray" consumes="application/json"
+              outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<setHeader headerName="OperationalPoliciesArray">
 						<simple>${body}</simple>
 					</setHeader>
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UPDATE Operational policies FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
 
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
@@ -150,39 +150,39 @@
 			</route>
 		</post>
 		<post uri="/v2/loop/updateMicroservicePolicy/{loopName}"
-			type="org.onap.clamp.policy.microservice.MicroServicePolicy"
+			type="org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
 			consumes="application/json"
-			outType="org.onap.clamp.policy.microservice.MicroServicePolicy"
+			outType="org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<setProperty propertyName="MicroServicePolicyObject">
 						<simple>${body}</simple>
 					</setProperty>
 
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${exchangeProperty[MicroServicePolicyObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${exchangeProperty[MicroServicePolicyObject]})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -194,7 +194,7 @@
 			</route>
 		</post>
 		<put uri="/v2/loop/deploy/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -204,32 +204,32 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:deploy-loop" />
 
 					<log loggingLevel="INFO"
 						message="DEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -241,38 +241,38 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}"
-			 outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|microServicePolicyName" />
 				<doTry>
 					<log loggingLevel="INFO"
 						 message="Refresh Micro Service Policy UI for loop: ${header.loopName} and ${header.microServicePolicyName}" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
+							uri="bean:org.onap.policy.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=refreshMicroServicePolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.microServicePolicyName})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=refreshMicroServicePolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.microServicePolicyName})" />
 					<log loggingLevel="INFO"
 						 message="REFRESH Micro Service policy request successfully executed for loop: ${header.loopName}" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -284,38 +284,38 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|operationalPolicyName" />
 				<doTry>
 					<log loggingLevel="INFO"
 						message="Refresh Operational Policy UI for loop: ${header.loopName} and ${header.operationalPolicyName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
+							uri="bean:org.onap.policy.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=refreshOperationalPolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.operationalPolicyName})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=refreshOperationalPolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.operationalPolicyName})" />
 					<log loggingLevel="INFO"
 						message="REFRESH operational policy request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -327,7 +327,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/undeploy/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -337,31 +337,31 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:undeploy-loop" />
 
 					<log loggingLevel="INFO"
 						message="UNDEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -373,7 +373,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/stop/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -383,31 +383,31 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
 					<log loggingLevel="INFO"
 						message="STOP request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -419,7 +419,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/restart/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -429,32 +429,32 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:add-all-to-active-pdp-group" />
 					<log loggingLevel="INFO"
 						message="RESTART request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -466,7 +466,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/submit/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -476,12 +476,12 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})" />
 					<setProperty propertyName="raiseHttpExceptionFlag">
 						<simple resultType="java.lang.Boolean">false</simple>
 					</setProperty>
@@ -529,20 +529,20 @@
 					<log loggingLevel="INFO"
 						message="SUBMIT request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -563,12 +563,12 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:undeploy-loop" />
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
 					<log loggingLevel="INFO"
@@ -602,22 +602,22 @@
 						<to uri="direct:delete-policy" />
 					</split>
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=deleteLoop(${header.loopName})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=deleteLoop(${header.loopName})" />
 					<log loggingLevel="INFO"
 						message="DELETE request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -629,38 +629,38 @@
 			</route>
 		</put>
 		<get uri="/v2/loop/getstatus/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<log loggingLevel="INFO"
 						message="GET STATUS request for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:update-policy-status-for-loop" />
 					<to uri="direct:update-dcae-status-for-loop" />
 					<to uri="direct:update-loop-state" />
 
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET STATUS request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 					</doCatch>
 					<doFinally>
 						<setBody>
@@ -674,32 +674,32 @@
 			</route>
 		</get>
 
-		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -711,14 +711,14 @@
 				</doTry>
 			</route>
 		</put>
-		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion|policyName" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<setProperty propertyName="policyName">
 						<simple>${header.policyName}</simple>
@@ -735,22 +735,22 @@
 					</setProperty>
 					<to uri="direct:delete-policy" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -762,33 +762,33 @@
 			</route>
 		</put>
 		<post
-				uri="/v2/loop/create/{loopName}?templateName={templateName}"
-				outType="org.onap.clamp.loop.Loop" consumes="application/json"
-				produces="application/json">
+                uri="/v2/loop/create/{loopName}?templateName={templateName}"
+                outType="org.onap.policy.clamp.loop.Loop" consumes="application/json"
+                produces="application/json">
 			<route>
 				<removeHeaders
 						pattern="*"
 						excludePattern="loopName|templateName" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -800,25 +800,25 @@
 			</route>
 		</post>
 		<get uri="/v2/dictionary"
-			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+             outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Dictionary request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -838,20 +838,20 @@
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Dictionary request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -865,26 +865,26 @@
 			</route>
 		</get>
 		<get uri="/v2/dictionary/{dictionaryName}"
-			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+             outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 					excludePattern="dictionaryName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -897,29 +897,29 @@
 				</doTry>
 			</route>
 		</get>
-		<put uri="/v2/dictionary" type="org.onap.clamp.tosca.Dictionary"
-			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
-			produces="application/json">
+		<put uri="/v2/dictionary" type="org.onap.policy.clamp.tosca.Dictionary"
+             outType="org.onap.policy.clamp.tosca.Dictionary" consumes="application/json"
+             produces="application/json">
 			<route>
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="DictionaryObject">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="PUT Dictionary request failed for: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -934,30 +934,30 @@
 		</put>
 
 		<put uri="/v2/dictionary/{name}"
-			type="org.onap.clamp.tosca.Dictionary"
-			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
-			produces="application/json">
+             type="org.onap.policy.clamp.tosca.Dictionary"
+             outType="org.onap.policy.clamp.tosca.Dictionary" consumes="application/json"
+             produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="name" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="DictionaryObject">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -976,20 +976,20 @@
 				<removeHeaders pattern="*" excludePattern="name" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1010,20 +1010,20 @@
 					excludePattern="name|shortName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1038,26 +1038,26 @@
 		</delete>
 
 		<get uri="/v2/policyToscaModels"
-			outType="org.onap.clamp.loop.template.PolicyModel"
+			outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Policy Models request failed for: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1071,27 +1071,27 @@
 			</route>
 		</get>
 		<get uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
-			outType="org.onap.clamp.loop.template.PolicyModel"
+			outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 					excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType},${header.policyModelVersion})" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType},${header.policyModelVersion})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1111,20 +1111,20 @@
 					excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1140,29 +1140,29 @@
 
 		<post uri="/v2/policyToscaModels"
 			type="java.lang.String"
-			outType="org.onap.clamp.loop.template.PolicyModel"
+			outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			consumes="plain/text" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"/>
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="PolicyModelTosca">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="POST Policy Model YAML request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1177,30 +1177,30 @@
 		</post>
 		<put uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
 			  type="java.lang.String"
-			  outType="org.onap.clamp.loop.template.PolicyModel"
+			  outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			  consumes="plain/text" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 							   excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="PolicyModelTosca">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-							uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=updatePolicyModelTosca(${header.policyModelType},${policyModelVersion},${exchangeProperty[PolicyModelTosca]})" />
+							uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=updatePolicyModelTosca(${header.policyModelType},${policyModelVersion},${exchangeProperty[PolicyModelTosca]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="MODIFY Policy Model YAML request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1215,26 +1215,26 @@
 		</put>
 
 		<get uri="/v2/templates"
-			outType="org.onap.clamp.loop.template.LoopTemplate"
+			outType="org.onap.policy.clamp.loop.template.LoopTemplate"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
+						uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET ALL templates request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1248,27 +1248,27 @@
 			</route>
 		</get>
 		<get uri="/v2/templates/{templateName}"
-			outType="org.onap.clamp.loop.template.LoopTemplate"
+			outType="org.onap.policy.clamp.loop.template.LoopTemplate"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 					excludePattern="templateName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
+						uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1287,20 +1287,20 @@
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
+						uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET All Template names request failed for template:  ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1313,10 +1313,10 @@
 				</doTry>
 			</route>
 		</get>
-		<get uri="/v2/clampInformation" outType="org.onap.clamp.clds.model.ClampInformation"
+		<get uri="/v2/clampInformation" outType="org.onap.policy.clamp.clds.model.ClampInformation"
 			 produces="application/json">
 			<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=getClampInformation()" />
+					uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=getClampInformation()" />
 		</get>
 	</rest>
 </rests>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index ce52f31d6..61e1efbdc 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -1,10 +1,10 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
 	<rest>
 		<get uri="/v1/healthcheck" produces="application/json"
-			outType="org.onap.clamp.clds.model.CldsHealthCheck">
+			outType="org.onap.policy.clamp.clds.model.CldsHealthCheck">
 			<route>
 				<setBody>
-					<method ref="org.onap.clamp.clds.service.CldsHealthcheckService"
+					<method ref="org.onap.policy.clamp.clds.service.CldsHealthcheckService"
 						method="gethealthcheck()" />
 				</setBody>
 				<when>
@@ -18,7 +18,7 @@
 		</get>
 
 		<get uri="/v1/user/getUser" produces="text/plain">
-			<to uri="bean:org.onap.clamp.authorization.UserService?method=getUser()" />
+			<to uri="bean:org.onap.policy.clamp.authorization.UserService?method=getUser()" />
 		</get>
 	</rest>
 </rests>
diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/src/main/resources/clds/camel/routes/cds-flows.xml
index 0e56970c2..73f8cb849 100644
--- a/src/main/resources/clds/camel/routes/cds-flows.xml
+++ b/src/main/resources/clds/camel/routes/cds-flows.xml
@@ -3,7 +3,7 @@
         <from uri="direct:get-blueprint-workflow-list"/>
         <log loggingLevel="INFO"
              message="Getting blueprint workflow list from CDS"/>
-        <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting workflow list from CDS')"/>
+        <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting workflow list from CDS')"/>
         <doTry>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
@@ -26,7 +26,7 @@
             </doCatch>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
-                <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
@@ -34,7 +34,7 @@
         <from uri="direct:get-blueprint-workflow-input-properties"/>
         <log loggingLevel="INFO"
              message="Getting blueprint input properties for workflow"/>
-        <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting input properties for workflow')"/>
+        <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting input properties for workflow')"/>
         <doTry>
             <setHeader headerName="CamelHttpMethod">
                 <constant>POST</constant>
@@ -57,7 +57,7 @@
             </doCatch>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
-                <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml
index 65849e9ae..1a0eb7b9a 100644
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/main/resources/clds/camel/routes/dcae-flows.xml
@@ -20,7 +20,7 @@
             <log loggingLevel="INFO"
                  message="Deploying the blueprints for loop: ${exchangeProperty[loopObject].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop with multiple blueprints')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop with multiple blueprints')"/>
             <split>
                 <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
                 </simple>
@@ -34,11 +34,11 @@
                     <simple resultType="java.lang.Boolean">false</simple>
                 </setProperty>
                 <setBody>
-                    <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                             method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})"/>
                 </setBody>
                 <setProperty propertyName="dcaeDeploymentId">
-                    <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                             method="generateDeploymentId()"/>
                 </setProperty>
                 <setHeader headerName="CamelHttpMethod">
@@ -65,17 +65,17 @@
                         uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
                 <convertBodyTo type="java.lang.String"/>
                 <setProperty propertyName="dcaeResponse">
-                    <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                             method="convertDcaeResponse(${body})"/>
                 </setProperty>
                 <setProperty propertyName="dcaeStatusUrl">
-                    <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                             method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
                 </setProperty>
                 <to
-                        uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
+                        uri="bean:org.onap.policy.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
                 <to
-                        uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Deploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
+                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Deploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
             </split>
             <doCatch>
                 <exception>java.lang.Exception</exception>
@@ -97,7 +97,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
@@ -107,13 +107,13 @@
             <log loggingLevel="INFO"
                  message="Deploying the loop: ${exchangeProperty[loopObject].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop')"/>
             <setBody>
-                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                         method="getDeployPayload(${exchangeProperty[loopObject]})"/>
             </setBody>
             <setProperty propertyName="dcaeDeploymentId">
-                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                         method="generateDeploymentId()"/>
             </setProperty>
             <setHeader headerName="CamelHttpMethod">
@@ -140,21 +140,21 @@
                     uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <setProperty propertyName="dcaeResponse">
-                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                         method="convertDcaeResponse(${body})"/>
             </setProperty>
 
 
             <setProperty propertyName="dcaeStatusUrl">
-                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                         method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
             </setProperty>
             <to
-                    uri="bean:org.onap.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
+                    uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>DEPLOY loop status
                         (Dep-id:${exchangeProperty[dcaeDeploymentId]},
@@ -189,7 +189,7 @@
             <log loggingLevel="INFO"
                  message="Undeploying the blueprints for loop: ${exchangeProperty[loopObject].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop with multiple blueprints')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop with multiple blueprints')"/>
             <split>
                 <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
                 </simple>
@@ -204,7 +204,7 @@
                         <simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentId()} != null
                         </simple>
                         <setBody>
-                            <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                                     method="getUndeployPayload(${exchangeProperty[microServicePolicy]})"/>
                         </setBody>
                         <setHeader headerName="CamelHttpMethod">
@@ -231,23 +231,23 @@
                                 uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
                         <convertBodyTo type="java.lang.String"/>
                         <setProperty propertyName="dcaeResponse">
-                            <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                                     method="convertDcaeResponse(${body})"/>
                         </setProperty>
                         <setProperty propertyName="dcaeStatusUrl">
-                            <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                                     method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
                         </setProperty>
                         <to
-                                uri="bean:org.onap.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},null,${exchangeProperty[dcaeStatusUrl]})"/>
+                                uri="bean:org.onap.policy.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},null,${exchangeProperty[dcaeStatusUrl]})"/>
                         <to
-                                uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
+                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
                     </when>
                     <otherwise>
                         <log loggingLevel="WARNING"
                              message="Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !"/>
                         <to
-                                uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING','DCAE',${exchangeProperty[loopObject]})"/>
+                                uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING','DCAE',${exchangeProperty[loopObject]})"/>
                     </otherwise>
                 </choice>
             </split>
@@ -269,7 +269,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
@@ -278,7 +278,7 @@
         <log loggingLevel="INFO"
              message="Undeploying the loop: ${exchangeProperty[loopObject].getName()} : ${exchangeProperty[loopObject].getDcaeDeploymentId()}"/>
         <to
-                uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/>
+                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/>
         <choice>
             <when>
                 <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()}
@@ -286,7 +286,7 @@
                 </simple>
                 <doTry>
                     <setBody>
-                        <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                                 method="getUndeployPayload(${exchangeProperty[loopObject]})"/>
                     </setBody>
                     <setHeader headerName="CamelHttpMethod">
@@ -314,19 +314,19 @@
                             uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=300000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
                     <convertBodyTo type="java.lang.String"/>
                     <setProperty propertyName="dcaeResponse">
-                        <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                                 method="convertDcaeResponse(${body})"/>
                     </setProperty>
                     <setProperty propertyName="dcaeStatusUrl">
-                        <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                                 method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
                     </setProperty>
                     <to
-                            uri="bean:org.onap.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},null,${exchangeProperty[dcaeStatusUrl]})"/>
+                            uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateDcaeDeploymentFields(${exchangeProperty[loopObject]},null,${exchangeProperty[dcaeStatusUrl]})"/>
                     <doFinally>
                         <to uri="direct:reset-raise-http-exception-flag"/>
                         <to
-                                uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                         <setProperty propertyName="logMessage">
                             <simple>UNDEPLOY loop status</simple>
                         </setProperty>
@@ -341,7 +341,7 @@
                 <log loggingLevel="WARNING"
                      message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !"/>
                 <to
-                        uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})"/>
+                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})"/>
             </otherwise>
         </choice>
     </route>
@@ -350,7 +350,7 @@
         <log loggingLevel="INFO"
              message="Getting DCAE deployment status for loop: ${exchangeProperty[loopObject].getName()} - ${exchangeProperty[dcaeComponent].getComponentName()}"/>
         <to
-                uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')"/>
+                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')"/>
         <doTry>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
@@ -394,12 +394,12 @@
                 <log loggingLevel="ERROR"
                      message="GET DCAE deployment request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
                 <to
-                        uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET DCAE deployment request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
+                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET DCAE deployment request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
             </doCatch>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>DCAE deployment status</simple>
                 </setProperty>
@@ -415,7 +415,7 @@
         <log loggingLevel="INFO"
              message="Getting DCAE blueprint id in inventory"/>
         <to
-                uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')"/>
+                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')"/>
         <doTry>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
@@ -440,7 +440,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
 
@@ -449,7 +449,7 @@
         <from uri="direct:get-all-dcae-blueprint-inventory"/>
         <log loggingLevel="INFO"
              message="Getting all DCAE blueprint from inventory"/>
-        <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting all blueprint from inventory')"/>
+        <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting all blueprint from inventory')"/>
         <doTry>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
@@ -471,20 +471,20 @@
             <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <setProperty propertyName="dcaeResponseList">
-                <method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
                         method="convertToDcaeInventoryResponse(${body})"/>
             </setProperty>
             <split>
                 <simple>${exchangeProperty[dcaeResponseList]}</simple>
-                <convertBodyTo type="org.onap.clamp.clds.model.dcae.DcaeInventoryResponse"/>
+                <convertBodyTo type="org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse"/>
                 <setProperty propertyName="dcaeResponse">
                     <simple>${body}</simple>
                 </setProperty>
-                <to uri="bean:org.onap.clamp.clds.model.dcae.DcaeInventoryCache?method=addDcaeInventoryResponse(${exchangeProperty[dcaeResponse]})"/>
+                <to uri="bean:org.onap.policy.clamp.clds.model.dcae.DcaeInventoryCache?method=addDcaeInventoryResponse(${exchangeProperty[dcaeResponse]})"/>
             </split>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
-                <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index d0d552568..d5ab050cf 100644
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/src/main/resources/clds/camel/routes/loop-flows.xml
@@ -5,7 +5,7 @@
 			<simple>${header.loopName}</simple>
 		</setBody>
 		<setProperty propertyName="loopObject">
-			<method ref="org.onap.clamp.loop.LoopService" method="getLoop" />
+			<method ref="org.onap.policy.clamp.loop.LoopService" method="getLoop" />
 		</setProperty>
 
 		<when>
@@ -87,7 +87,7 @@
 		<log loggingLevel="INFO"
 			message="Policy state set to: ${exchangeProperty[policyState].getStateName()}" />
 		<to
-			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('Policy state set to: ${exchangeProperty[policyState].getStateName()}','INFO','POLICY',${exchangeProperty[loopObject]})" />
+			uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Policy state set to: ${exchangeProperty[policyState].getStateName()}','INFO','POLICY',${exchangeProperty[loopObject]})" />
 	</route>
 	<route id="update-dcae-status-for-loop">
 		<from uri="direct:update-dcae-status-for-loop" />
@@ -114,7 +114,7 @@
 						<simple> ${header.CamelHttpResponseCode} == 200 </simple>
 						<convertBodyTo type="java.lang.String" />
 						<setProperty propertyName="dcaeResponse">
-							<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+							<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
 								method="convertDcaeResponse(${body})" />
 						</setProperty>
 					</when>
@@ -126,7 +126,7 @@
 				<log loggingLevel="INFO"
 					message="DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - DCAE message: ${exchangeProperty[dcaeResponse].getError()}" />
 				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[loopObject]})" />
+					uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[loopObject]})" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
@@ -154,7 +154,7 @@
 							<simple> ${header.CamelHttpResponseCode} == 200 </simple>
 							<convertBodyTo type="java.lang.String" />
 							<setProperty propertyName="dcaeResponse">
-								<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
+								<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
 									method="convertDcaeResponse(${body})" />
 							</setProperty>
 						</when>
@@ -166,7 +166,7 @@
 					<log loggingLevel="INFO"
 						message="DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - DCAE message: ${exchangeProperty[dcaeResponse].getError()}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[microServicePolicy]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('DCAE state set to: ${exchangeProperty[dcaeState].getStateName()} - message: ${exchangeProperty[dcaeResponse].getError()}','INFO','DCAE',${exchangeProperty[microServicePolicy]})" />
 				</split>>
 			</when>
 		</choice>
@@ -182,7 +182,7 @@
 					== 'NOT_SENT'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DESIGN')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DESIGN')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' or
@@ -190,7 +190,7 @@
 					'MICROSERVICE_INSTALLATION_FAILED'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'IN_ERROR')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'IN_ERROR')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
@@ -198,7 +198,7 @@
 					${exchangeProperty['policyState'].getStateName()} == 'IN_ERROR'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'IN_ERROR')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'IN_ERROR')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
@@ -206,7 +206,7 @@
 					${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'RUNNING')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'RUNNING')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
@@ -214,7 +214,7 @@
 					${exchangeProperty['policyState'].getStateName()} == 'SENT'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'STOPPED')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'STOPPED')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
@@ -223,7 +223,7 @@
 					${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'SUBMITTED')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'SUBMITTED')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
@@ -233,7 +233,7 @@
 					${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'WAITING')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'WAITING')" />
 			</when>
 			<when>
 				<simple>${exchangeProperty['dcaeState'].getStateName()} ==
@@ -241,13 +241,13 @@
 					${exchangeProperty['policyState'].getStateName()} != 'NOT_SENT'
 				</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DEPLOYED')" />
+					uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DEPLOYED')" />
 			</when>
 		</choice>
 		<log loggingLevel="INFO"
 			message="New loop state is: ${exchangeProperty[loopObject].getLastComputedState().toString()}" />
 		<to
-			uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('New loop state is: ${exchangeProperty[loopObject].getLastComputedState().toString()}','INFO',${exchangeProperty[loopObject]})" />
+			uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('New loop state is: ${exchangeProperty[loopObject].getLastComputedState().toString()}','INFO',${exchangeProperty[loopObject]})" />
 
 	</route>
 </routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
index 9328ceb00..0ee386eb4 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/src/main/resources/clds/camel/routes/policy-flows.xml
@@ -36,7 +36,7 @@
             <log loggingLevel="INFO"
                  message="Getting Policy: ${exchangeProperty[policyName]}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
             </setHeader>
@@ -65,12 +65,12 @@
                 <log loggingLevel="ERROR"
                      message="GET policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
                 <to
-                        uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET policy request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET policy request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
             </doCatch>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>${exchangeProperty[policyName]} GET
                         Policy status
@@ -90,7 +90,7 @@
             <log loggingLevel="INFO"
                  message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
             </setHeader>
@@ -119,12 +119,12 @@
                 <log loggingLevel="ERROR"
                      message="GET policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
                 <to
-                        uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET policy request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+                        uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET policy request failed, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
             </doCatch>
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>${exchangeProperty[policyName]} GET Policy deployment
                         status
@@ -142,7 +142,7 @@
         <doTry>
             <log loggingLevel="INFO" message="Getting all the policy models"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
             </setHeader>
@@ -166,7 +166,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
@@ -176,7 +176,7 @@
             <log loggingLevel="INFO"
                  message="Getting the policy model: ${exchangeProperty[policyModelName]}/${exchangeProperty[policyModelVersion]}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
             </setHeader>
@@ -200,7 +200,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
@@ -210,7 +210,7 @@
             <log loggingLevel="INFO"
                  message="Creating Policy: ${exchangeProperty[policy].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
             <setBody>
                 <simple>${exchangeProperty[policy].createPolicyPayload()}
                 </simple>
@@ -240,7 +240,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>${exchangeProperty[policy].getName()} creation
                         status
@@ -260,7 +260,7 @@
             <log loggingLevel="INFO"
                  message="Deleting Policy: ${exchangeProperty[policy].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy')"/>
             <setBody>
                 <constant>null</constant>
             </setBody>
@@ -290,7 +290,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>${exchangeProperty[policy].getName()} removal
                         status
@@ -309,7 +309,7 @@
             <log loggingLevel="INFO"
                  message="Adding loop policies to PDP Group: ${exchangeProperty[loopObject].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
             <setBody>
                 <simple>
                     ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")}
@@ -341,7 +341,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>PDP Group push ALL status</simple>
                 </setProperty>
@@ -359,7 +359,7 @@
             <log loggingLevel="INFO"
                  message="Removing loop policies from PDP Group: ${exchangeProperty[loopObject].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Remove policies from PDP group')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Remove policies from PDP group')"/>
             <setBody>
                 <simple>
                     ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")}
@@ -391,7 +391,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
                 <setProperty propertyName="logMessage">
                     <simple>PDP Group remove ALL status</simple>
                 </setProperty>
@@ -408,7 +408,7 @@
             <log loggingLevel="INFO"
                  message="Getting the list of PDP Groups"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
             <setHeader headerName="CamelHttpMethod">
                 <constant>GET</constant>
             </setHeader>
@@ -432,7 +432,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
@@ -442,7 +442,7 @@
             <log loggingLevel="INFO"
                  message="Removing policy from active PDP group for loop: ${exchangeProperty[loopObject].getName()}"/>
             <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing one policy PDP group')"/>
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing one policy PDP group')"/>
             <setBody>
                 <constant>null</constant>
             </setBody>
@@ -489,7 +489,7 @@
             <doFinally>
                 <to uri="direct:reset-raise-http-exception-flag"/>
                 <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
             </doFinally>
         </doTry>
     </route>
diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/src/main/resources/clds/camel/routes/utils-flows.xml
index bbbc46a20..d5da4faee 100644
--- a/src/main/resources/clds/camel/routes/utils-flows.xml
+++ b/src/main/resources/clds/camel/routes/utils-flows.xml
@@ -14,11 +14,11 @@
 			<when>
 				<simple>${exchangeProperty[logComponent]} == null</simple>
 				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO',${exchangeProperty[loopObject]})" />
+					uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO',${exchangeProperty[loopObject]})" />
 			</when>
 			<otherwise>
 				<to
-					uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','${exchangeProperty[logComponent]}',${exchangeProperty[loopObject]})" />
+					uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','${exchangeProperty[logComponent]}',${exchangeProperty[loopObject]})" />
 				<setProperty propertyName="logComponent">
 					<constant>null</constant>
 				</setProperty>
diff --git a/src/main/resources/clds/key.properties b/src/main/resources/clds/key.properties
index dda811040..dda2b87d0 100644
--- a/src/main/resources/clds/key.properties
+++ b/src/main/resources/clds/key.properties
@@ -1 +1 @@
-org.onap.clamp.encryption.aes.key=aa3871669d893c7fb8abbcda31b88b4f
\ No newline at end of file
+org.onap.policy.clamp.encryption.aes.key=aa3871669d893c7fb8abbcda31b88b4f
\ No newline at end of file
diff --git a/src/main/script/SelectNpmRepo.groovy b/src/main/script/SelectNpmRepo.groovy
index 92371cfe9..797d2d003 100644
--- a/src/main/script/SelectNpmRepo.groovy
+++ b/src/main/script/SelectNpmRepo.groovy
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.maven.scripts
+package org.onap.policy.clamp.clds.maven.scripts
 
 println project.properties['clamp.project.version'];
 
diff --git a/src/main/script/TagVersion.groovy b/src/main/script/TagVersion.groovy
index ccfcca3c4..271e2967f 100644
--- a/src/main/script/TagVersion.groovy
+++ b/src/main/script/TagVersion.groovy
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.maven.scripts
+package org.onap.policy.clamp.maven.scripts
 
 println project.properties['clamp.project.version']; 
 def versionArray; 
diff --git a/src/test/java/org/onap/clamp/clds/client/CdsServicesTest.java b/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
index 3d189cf71..6e5300e23 100644
--- a/src/test/java/org/onap/clamp/clds/client/CdsServicesTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
@@ -20,13 +20,13 @@
  *
  */
 
-package org.onap.clamp.clds.client;
+package org.onap.policy.clamp.clds.client;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import org.junit.Test;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 public class CdsServicesTest {
diff --git a/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java b/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
index 7152ee11d..605ab99ae 100644
--- a/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
@@ -24,13 +24,13 @@
  * 
  */
 
-package org.onap.clamp.clds.config;
+package org.onap.policy.clamp.clds.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.onap.clamp.authorization.CldsUser;
-import org.onap.clamp.clds.exception.CldsUsersException;
+import org.onap.policy.clamp.authorization.CldsUser;
+import org.onap.policy.clamp.clds.exception.CldsUsersException;
 
 public class CldsUserJsonDecoderTest {
 
diff --git a/src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java b/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
index 311244f48..89178b778 100644
--- a/src/test/java/org/onap/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.config.sdc;
+package org.onap.policy.clamp.clds.config.sdc;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -34,9 +34,9 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import org.junit.Test;
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 
 /**
  * This class tests the SDC Controller config.
diff --git a/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
index 48338f17c..557a2e96c 100644
--- a/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
@@ -24,7 +24,7 @@
  *
  */
 
-package org.onap.clamp.clds.it;
+package org.onap.policy.clamp.clds.it;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -38,9 +38,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.clamp.authorization.AuthorizationController;
-import org.onap.clamp.authorization.SecureServicePermission;
-import org.onap.clamp.clds.exception.NotAuthorizedException;
+import org.onap.policy.clamp.authorization.AuthorizationController;
+import org.onap.policy.clamp.authorization.SecureServicePermission;
+import org.onap.policy.clamp.clds.exception.NotAuthorizedException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.core.Authentication;
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsHealthcheckServiceItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
index 587b7c915..52da63952 100644
--- a/src/test/java/org/onap/clamp/clds/it/CldsHealthcheckServiceItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
@@ -20,15 +20,15 @@
  * ===================================================================
  */
 
-package org.onap.clamp.clds.it;
+package org.onap.policy.clamp.clds.it;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.model.CldsHealthCheck;
-import org.onap.clamp.clds.service.CldsHealthcheckService;
+import org.onap.policy.clamp.clds.model.CldsHealthCheck;
+import org.onap.policy.clamp.clds.service.CldsHealthcheckService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
diff --git a/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
index 90a240181..9dd2130c6 100644
--- a/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.it;
+package org.onap.policy.clamp.clds.it;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/org/onap/clamp/clds/it/RobotItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
index 5eff96e44..8c06929e1 100644
--- a/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.it;
+package org.onap.policy.clamp.clds.it;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
diff --git a/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
index c4c0c345a..c8b9932cc 100644
--- a/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
@@ -21,22 +21,19 @@
  *
  */
 
-package org.onap.clamp.clds.it.config;
+package org.onap.policy.clamp.clds.it.config;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-/**
- * Test corg.onap.clamp.ClampDesigner.model.refprop package using RefProp.
- */
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class CldsReferencePropertiesItCase {
diff --git a/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
index cfdbe7753..516fc7a09 100644
--- a/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.clamp.clds.it.config;
+package org.onap.policy.clamp.clds.it.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -29,9 +29,9 @@ import java.io.IOException;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.config.sdc.SdcControllersConfiguration;
-import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
-import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.policy.clamp.clds.config.sdc.SdcControllersConfiguration;
+import org.onap.policy.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
index a3aa8b49b..787118902 100644
--- a/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
@@ -23,7 +23,7 @@
  *
  */
 
-package org.onap.clamp.clds.it.sdc.controller;
+package org.onap.policy.clamp.clds.it.sdc.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -38,13 +38,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.config.ClampProperties;
-import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfigurationTest;
-import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
-import org.onap.clamp.clds.sdc.controller.SdcSingleController;
-import org.onap.clamp.clds.sdc.controller.SdcSingleControllerStatus;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.loop.CsarInstaller;
+import org.onap.policy.clamp.clds.config.ClampProperties;
+import org.onap.policy.clamp.clds.config.sdc.SdcSingleControllerConfigurationTest;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.policy.clamp.clds.sdc.controller.SdcSingleController;
+import org.onap.policy.clamp.clds.sdc.controller.SdcSingleControllerStatus;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.loop.CsarInstaller;
 import org.onap.sdc.api.notification.IArtifactInfo;
 import org.onap.sdc.api.notification.INotificationData;
 import org.onap.sdc.api.notification.IResourceInstance;
@@ -132,7 +132,7 @@ public class SdcSingleControllerItCase {
         // given
 
         Class<?> innerClass = Class
-                .forName("org.onap.clamp.clds.sdc.controller.SdcSingleController$SdcNotificationCallBack");
+                .forName("org.onap.policy.clamp.clds.sdc.controller.SdcSingleController$SdcNotificationCallBack");
         Constructor<?> constructor = innerClass.getDeclaredConstructor(SdcSingleController.class,
                 SdcSingleController.class);
         constructor.setAccessible(true);
diff --git a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java b/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
index bd0c94d52..0e7fe6c7e 100644
--- a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -34,7 +34,7 @@ import org.apache.camel.builder.ExchangeBuilder;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
+import org.onap.policy.clamp.clds.Application;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java b/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
index c5217fdc9..a246e0efa 100644
--- a/src/test/java/org/onap/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java b/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
index 86b3497c6..7999709c2 100644
--- a/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
@@ -20,14 +20,14 @@
  *
  */
 
-package org.onap.clamp.clds.model.jsontype;
+package org.onap.policy.clamp.clds.model.jsontype;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.JsonObject;
 import org.hibernate.HibernateException;
 import org.junit.Test;
-import org.onap.clamp.dao.model.jsontype.JsonTypeDescriptor;
+import org.onap.policy.clamp.dao.model.jsontype.JsonTypeDescriptor;
 
 public class JsonTypeDescriptorTest {
 
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
index a768526a0..085b3d187 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
@@ -23,7 +23,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -42,8 +42,8 @@ import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 import org.yaml.snakeyaml.Yaml;
 
 public class BlueprintParserTest {
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
index a6b34f95d..d7a3b3823 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
index f2a9de7a0..08e425abf 100644
--- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.clds.sdc.controller.installer;
+package org.onap.policy.clamp.clds.sdc.controller.installer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -39,9 +39,9 @@ import java.util.List;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 import org.onap.sdc.api.notification.IArtifactInfo;
 import org.onap.sdc.api.notification.INotificationData;
 import org.onap.sdc.api.notification.IResourceInstance;
diff --git a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
index 01dc8404c..f70e74cd6 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryRepository;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java b/src/test/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
index e73547652..6ff82b6d7 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.clds.tosca;
+package org.onap.policy.clamp.clds.tosca;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,11 +32,11 @@ import java.io.IOException;
 import javax.transaction.Transactional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
index 8a81445b2..6f6f5c104 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import com.google.gson.JsonArray;
 import java.io.IOException;
 import java.util.ArrayList;
 import junit.framework.TestCase;
-import org.onap.clamp.clds.tosca.update.elements.ArrayField;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.tosca.update.elements.ArrayField;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 
 public class ArrayFieldTest extends TestCase {
 
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
index f147f404d..493ee992c 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import java.util.ArrayList;
 import junit.framework.TestCase;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 
 public class ConstraintTest extends TestCase {
 
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
index 7f0047e4f..3eaa0ce51 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
@@ -21,10 +21,10 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import junit.framework.TestCase;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateField;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateField;
 
 public class JsonTemplateFieldTest extends TestCase {
 
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
index 504103559..2c8744f33 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
@@ -21,17 +21,17 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.TestCase;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateField;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateField;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 
 public class JsonTemplateManagerTest extends TestCase {
 
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
index dc736a48b..dc27d8aaa 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
@@ -21,14 +21,14 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.TestCase;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateField;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateField;
 
 public class JsonTemplateTest extends TestCase {
 
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
index 4fae89f09..658419d4c 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
@@ -21,23 +21,23 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import javax.transaction.Transactional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
-import org.onap.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.tosca.Dictionary;
-import org.onap.clamp.tosca.DictionaryElement;
-import org.onap.clamp.tosca.DictionaryService;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
+import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.tosca.Dictionary;
+import org.onap.policy.clamp.tosca.DictionaryElement;
+import org.onap.policy.clamp.tosca.DictionaryService;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementPropertyTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
index 52f8444ff..5652fa9cd 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementPropertyTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
@@ -21,18 +21,18 @@
  *
  */
 
-package org.onap.clamp.clds.tosca.update;
+package org.onap.policy.clamp.clds.tosca.update;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import java.util.ArrayList;
 import junit.framework.TestCase;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
 
 public class ToscaElementPropertyTest extends TestCase {
     public ToscaElementPropertyTest() throws IOException {
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
index ba8454bb2..7b17adeec 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
@@ -21,15 +21,15 @@
  *

  */

 

-package org.onap.clamp.clds.tosca.update;

+package org.onap.policy.clamp.clds.tosca.update;

 

 import java.io.IOException;

 import java.util.ArrayList;

 import java.util.Arrays;

 import junit.framework.TestCase;

-import org.onap.clamp.clds.tosca.update.elements.ToscaElement;

-import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;

-import org.onap.clamp.clds.util.ResourceFileUtils;

+import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;

+import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;

+import org.onap.policy.clamp.clds.util.ResourceFileUtils;

 

 public class ToscaElementTest extends TestCase {

 

diff --git a/src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java b/src/test/java/org/onap/policy/clamp/clds/util/CryptoUtilsTest.java
index 42123aaf4..6239fef80 100644
--- a/src/test/java/org/onap/clamp/clds/util/CryptoUtilsTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/util/CryptoUtilsTest.java
@@ -23,7 +23,7 @@
  * 
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
diff --git a/src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java b/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
index a986c159d..b2c6d282a 100644
--- a/src/test/java/org/onap/clamp/clds/util/JsonUtilsTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
@@ -24,7 +24,7 @@
  *
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -62,8 +62,9 @@ public class JsonUtilsTest {
     public void testCreateBeanDeserializer() {
         TestClass test = new TestClass("value1", "value2");
         test.setObject2(new TestObject2("test3"));
-        Object testObject = JsonUtils.GSON.fromJson("[\"org.onap.clamp.clds.util.JsonUtilsTest$TestClass\""
-                + ",{\"test\":\"value1\",\"test2\":\"value2\",\"object2\":[\"org.onap.clamp.clds.util.TestObject2\","
+        Object testObject = JsonUtils.GSON.fromJson("[\"org.onap.policy.clamp.clds.util.JsonUtilsTest$TestClass\""
+                + ",{\"test\":\"value1\",\"test2\":\"value2\","
+                + "\"object2\":[\"org.onap.policy.clamp.clds.util.TestObject2\","
                 + "{\"test3\":\"test3\"}]}]", Object.class);
         assertNotNull(testObject);
         assertFalse(testObject instanceof TestObject);
diff --git a/src/test/java/org/onap/clamp/clds/util/LoggingUtilsTest.java b/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
index 7e823e163..ab6a41bca 100644
--- a/src/test/java/org/onap/clamp/clds/util/LoggingUtilsTest.java
+++ b/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
@@ -19,7 +19,7 @@
 *
 */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/onap/clamp/clds/util/TestObject.java b/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
index 418c80815..02cabd270 100644
--- a/src/test/java/org/onap/clamp/clds/util/TestObject.java
+++ b/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 public class TestObject {
 
diff --git a/src/test/java/org/onap/clamp/clds/util/TestObject2.java b/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
index 4fd77c230..d5abf41d0 100644
--- a/src/test/java/org/onap/clamp/clds/util/TestObject2.java
+++ b/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.clds.util;
+package org.onap.policy.clamp.clds.util;
 
 public class TestObject2 {
 
diff --git a/src/test/java/org/onap/clamp/flow/FlowLogOperationTest.java b/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
index 648c03307..51c4c078a 100644
--- a/src/test/java/org/onap/clamp/flow/FlowLogOperationTest.java
+++ b/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
@@ -20,7 +20,7 @@
  *
  */
 
-package org.onap.clamp.flow;
+package org.onap.policy.clamp.flow;
 
 import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -31,9 +31,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
-import org.onap.clamp.flow.log.FlowLogOperation;
+import org.onap.policy.clamp.clds.util.LoggingUtils;
+import org.onap.policy.clamp.clds.util.OnapLogConstants;
+import org.onap.policy.clamp.flow.log.FlowLogOperation;
 import org.slf4j.MDC;
 import org.slf4j.spi.MDCAdapter;
 import org.springframework.test.util.ReflectionTestUtils;
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
index a9f8f4f5f..8ef0df5e4 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
@@ -24,7 +24,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,26 +36,27 @@ import java.util.Map;
 import java.util.Optional;
 import javax.transaction.Transactional;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.assertj.core.api.Assertions;
 import org.json.JSONException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
-import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.cds.CdsDataInstaller;
-import org.onap.clamp.loop.service.ServicesRepository;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplatesRepository;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.cds.CdsDataInstaller;
+import org.onap.policy.clamp.loop.service.ServicesRepository;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplatesRepository;
+import org.onap.policy.clamp.loop.template.PolicyModelId;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
 import org.onap.sdc.api.notification.IArtifactInfo;
 import org.onap.sdc.api.notification.INotificationData;
 import org.onap.sdc.api.notification.IResourceInstance;
@@ -216,7 +217,7 @@ public class CsarInstallerItCase {
 
         CsarHandler csarHandler = new CsarHandler(notificationData, "", "");
         csarHandler.setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME_CDS)
-                        .getFile());
+                .getFile());
         Assert.assertEquals(csarHandler.getPolicyModelYaml(), Optional
                 .ofNullable(ResourceFileUtils.getResourceAsString("example/sdc/expected-result/policy-data.yaml")));
     }
@@ -279,14 +280,15 @@ public class CsarInstallerItCase {
         LoopTemplate loopTemplate = loopTemplatesRepo.findById(LoopTemplate.generateLoopTemplateName(generatedName,
                 "1.0", RESOURCE_INSTANCE_NAME_RESOURCE1, "tca.yaml")).get();
         assertThat(loopTemplate.getLoopElementModelsUsed()).hasSize(1);
-        assertThat(loopTemplate.getModelService().getServiceUuid()).isEqualTo("63cac700-ab9a-4115-a74f-7eac85e3fce0");
+        Assertions.assertThat(loopTemplate.getModelService().getServiceUuid())
+                .isEqualTo("63cac700-ab9a-4115-a74f-7eac85e3fce0");
         JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/model-properties.json"),
                 JsonUtils.GSON_JPA_MODEL.toJson(loopTemplate.getModelService()), true);
         JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/service-details.json"),
                 JsonUtils.GSON_JPA_MODEL.toJson(loopTemplate.getModelService().getServiceDetails()), true);
         JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/resource-details.json"),
                 JsonUtils.GSON_JPA_MODEL.toJson(loopTemplate.getModelService().getResourceDetails()), true);
-        assertThat(((LoopTemplateLoopElementModel) (loopTemplate.getLoopElementModelsUsed().toArray()[0]))
+        Assertions.assertThat(((LoopTemplateLoopElementModel) (loopTemplate.getLoopElementModelsUsed().toArray()[0]))
                 .getLoopElementModel().getName()).isNotEmpty();
 
         loopTemplate = loopTemplatesRepo.findById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
index 022d10eb2..c94937031 100644
--- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,13 +34,13 @@ import org.apache.camel.Message;
 import org.json.simple.parser.ParseException;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.clamp.clds.model.dcae.DcaeOperationStatusResponse;
-import org.onap.clamp.loop.components.external.DcaeComponent;
-import org.onap.clamp.loop.components.external.ExternalComponentState;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
+import org.onap.policy.clamp.clds.model.dcae.DcaeOperationStatusResponse;
+import org.onap.policy.clamp.loop.components.external.DcaeComponent;
+import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
 
 public class DcaeComponentTest {
 
diff --git a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
index 169db9db1..4d02b10dc 100644
--- a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,11 +36,11 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.ExchangeBuilder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/src/test/java/org/onap/clamp/loop/ExternalComponentStateTest.java b/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
index 34fcc077f..a73b2784b 100644
--- a/src/test/java/org/onap/clamp/loop/ExternalComponentStateTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
@@ -21,12 +21,12 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.onap.clamp.loop.components.external.ExternalComponentState;
+import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
 
 public class ExternalComponentStateTest {
     private ExternalComponentState state =  new ExternalComponentState("NOT_SENT",
diff --git a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
index f170bc6df..6728d292c 100644
--- a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,18 +33,19 @@ import com.google.gson.JsonParser;
 import java.io.IOException;
 import java.util.Set;
 import javax.transaction.Transactional;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -163,8 +164,8 @@ public class LoopControllerTestItCase {
         assertThat(opPolicyList.size()).isEqualTo(1);
         for (OperationalPolicy policy : opPolicyList) {
             assertThat(policy.getName().contains("OPERATIONAL_serviceName")).isTrue();
-            assertThat(policy.getPolicyModel().getPolicyModelType()).isEqualTo("testPolicyModel");
-            assertThat(policy.getPolicyModel().getVersion()).isEqualTo("1.0.0");
+            Assertions.assertThat(policy.getPolicyModel().getPolicyModelType()).isEqualTo("testPolicyModel");
+            Assertions.assertThat(policy.getPolicyModel().getVersion()).isEqualTo("1.0.0");
         }
 
         loopController.removeOperationalPolicy(EXAMPLE_LOOP_NAME, "testPolicyModel", "1.0.0");
diff --git a/src/test/java/org/onap/clamp/loop/LoopLogServiceTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
index ddab7b659..7b0ab8614 100644
--- a/src/test/java/org/onap/clamp/loop/LoopLogServiceTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
@@ -20,20 +20,21 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.JsonObject;
 import java.util.Set;
 import javax.transaction.Transactional;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.log.LogType;
-import org.onap.clamp.loop.log.LoopLog;
-import org.onap.clamp.loop.log.LoopLogService;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.log.LogType;
+import org.onap.policy.clamp.loop.log.LoopLog;
+import org.onap.policy.clamp.loop.log.LoopLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -90,6 +91,6 @@ public class LoopLogServiceTestItCase {
         assertThat(log.getLogType()).isEqualTo(LogType.INFO);
         assertThat(log.getLogComponent()).isEqualTo(CLAMP_COMPONENT);
         assertThat(log.getId()).isEqualTo(id);
-        assertThat(log.getLoop()).isEqualTo(testLoop);
+        Assertions.assertThat(log.getLoop()).isEqualTo(testLoop);
     }
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
index 9815575cc..e18dd2475 100644
--- a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
@@ -23,7 +23,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,25 +31,26 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import java.time.Instant;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.loop.log.LogType;
-import org.onap.clamp.loop.log.LoopLog;
-import org.onap.clamp.loop.log.LoopLogRepository;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.service.ServicesRepository;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopElementModelsRepository;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.LoopTemplatesRepository;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.loop.log.LogType;
+import org.onap.policy.clamp.loop.log.LoopLog;
+import org.onap.policy.clamp.loop.log.LoopLogRepository;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.service.ServicesRepository;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopElementModelsRepository;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.LoopTemplatesRepository;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelId;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -201,13 +202,17 @@ public class LoopRepositoriesItCase {
         assertThat((LoopLog) loopInDbRetrieved.getLoopLogs().toArray()[0]).isEqualToComparingFieldByField(loopLog);
         assertThat((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0])
                 .isEqualToIgnoringGivenFields(opPolicy, "createdDate", "updatedDate", "createdBy", "updatedBy");
-        assertThat(((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getCreatedDate())
+        Assertions.assertThat(
+                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getCreatedDate())
                 .isNotNull();
-        assertThat(((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getUpdatedDate())
+        Assertions.assertThat(
+                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getUpdatedDate())
                 .isNotNull();
-        assertThat(((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getCreatedBy())
+        Assertions.assertThat(
+                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getCreatedBy())
                 .isNotNull();
-        assertThat(((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getUpdatedBy())
+        Assertions.assertThat(
+                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getUpdatedBy())
                 .isNotNull();
 
         assertThat((MicroServicePolicy) loopInDbRetrieved.getMicroServicePolicies().toArray()[0])
diff --git a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
index 15cf59f38..010c4978a 100644
--- a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,21 +29,22 @@ import com.google.gson.JsonObject;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.transaction.Transactional;
+import org.assertj.core.api.Assertions;
 import org.assertj.core.util.Lists;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.log.LogType;
-import org.onap.clamp.loop.log.LoopLog;
-import org.onap.clamp.loop.log.LoopLogService;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.clamp.policy.operational.OperationalPolicy;
-import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.log.LogType;
+import org.onap.policy.clamp.loop.log.LoopLog;
+import org.onap.policy.clamp.loop.log.LoopLogService;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -114,7 +115,7 @@ public class LoopServiceTestItCase {
                 .usingElementComparatorIgnoringFields("loop", "createdBy", "createdDate", "updatedBy", "updatedDate")
                 .contains(operationalPolicy);
         OperationalPolicy savedPolicy = savedPolicies.iterator().next();
-        assertThat(savedPolicy.getLoop().getName()).isEqualTo(EXAMPLE_LOOP_NAME);
+        Assertions.assertThat(savedPolicy.getLoop().getName()).isEqualTo(EXAMPLE_LOOP_NAME);
 
     }
 
@@ -280,7 +281,7 @@ public class LoopServiceTestItCase {
                 .usingElementComparatorIgnoringFields("loop", "createdDate", "updatedDate", "createdBy", "updatedBy")
                 .containsExactly(secondOperationalPolicy);
         OperationalPolicy savedPolicy = savedPolicies.iterator().next();
-        assertThat(savedPolicy.getLoop().getName()).isEqualTo(EXAMPLE_LOOP_NAME);
+        Assertions.assertThat(savedPolicy.getLoop().getName()).isEqualTo(EXAMPLE_LOOP_NAME);
 
     }
 
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java b/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
index 70ff9b118..9dcd71ef1 100644
--- a/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
@@ -23,15 +23,15 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;
-import org.onap.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;
+import org.onap.policy.clamp.loop.template.PolicyModel;
 
 
 public class LoopTemplateLoopElementModelTest {
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
index b8b1144f6..d608075fc 100644
--- a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
@@ -21,7 +21,7 @@
  *

  */

 

-package org.onap.clamp.loop;

+package org.onap.policy.clamp.loop;

 

 import static org.assertj.core.api.Assertions.assertThat;

 import static org.junit.Assert.assertNotNull;

@@ -33,13 +33,13 @@ import java.util.SortedSet;
 import javax.transaction.Transactional;

 import org.junit.Test;

 import org.junit.runner.RunWith;

-import org.onap.clamp.clds.Application;

-import org.onap.clamp.loop.template.LoopElementModel;

-import org.onap.clamp.loop.template.LoopTemplate;

-import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;

-import org.onap.clamp.loop.template.LoopTemplatesService;

-import org.onap.clamp.loop.template.LoopType;

-import org.onap.clamp.loop.template.PolicyModel;

+import org.onap.policy.clamp.clds.Application;

+import org.onap.policy.clamp.loop.template.LoopElementModel;

+import org.onap.policy.clamp.loop.template.LoopTemplate;

+import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;

+import org.onap.policy.clamp.loop.template.LoopTemplatesService;

+import org.onap.policy.clamp.loop.template.LoopType;

+import org.onap.policy.clamp.loop.template.PolicyModel;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.boot.test.context.SpringBootTest;

 import org.springframework.test.context.junit4.SpringRunner;

diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
index 99c8f1ff9..0fc4b0b5c 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
@@ -23,7 +23,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
@@ -35,16 +35,16 @@ import com.google.gson.JsonSyntaxException;
 import java.io.IOException;
 import java.util.Random;
 import org.junit.Test;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.log.LogType;
-import org.onap.clamp.loop.log.LoopLog;
-import org.onap.clamp.loop.service.Service;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.log.LogType;
+import org.onap.policy.clamp.loop.log.LoopLog;
+import org.onap.policy.clamp.loop.service.Service;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
 
 public class LoopToJsonTest {
 
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
index 8afdd0583..ea8785855 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,13 +32,13 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.components.external.ExternalComponentState;
-import org.onap.clamp.loop.components.external.PolicyComponent;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
+import org.onap.policy.clamp.loop.components.external.PolicyComponent;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.policy.operational.OperationalPolicy;
 
 public class PolicyComponentTest {
 
diff --git a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java b/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
index 6f6cad815..e7df80cd8 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
+++ b/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,18 +33,19 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import javax.transaction.Transactional;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
-import org.onap.clamp.loop.template.PolicyModelsService;
-import org.onap.clamp.policy.pdpgroup.PdpGroup;
-import org.onap.clamp.policy.pdpgroup.PdpSubgroup;
-import org.onap.clamp.policy.pdpgroup.PolicyModelKey;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelId;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.loop.template.PolicyModelsService;
+import org.onap.policy.clamp.policy.pdpgroup.PdpGroup;
+import org.onap.policy.clamp.policy.pdpgroup.PdpSubgroup;
+import org.onap.policy.clamp.policy.pdpgroup.PolicyModelKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -69,7 +70,7 @@ public class PolicyModelServiceItCase {
     private static final String POLICY_MODEL_TYPE_2_VERSION_2 = "2.0.0";
 
     private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,
-        String policyAcronym, String policyVariant, String createdBy) {
+                                       String policyAcronym, String policyVariant, String createdBy) {
         PolicyModel policyModel = new PolicyModel();
         policyModel.setCreatedBy(createdBy);
         policyModel.setPolicyAcronym(policyAcronym);
@@ -101,13 +102,13 @@ public class PolicyModelServiceItCase {
             .get());
         assertThat(actualPolicyModel.getPolicyModelType())
             .isEqualTo(policyModel.getPolicyModelType());
-        assertThat(actualPolicyModel.getCreatedBy()).isEqualTo("Not found");
-        assertThat(actualPolicyModel.getCreatedDate()).isNotNull();
+        Assertions.assertThat(actualPolicyModel.getCreatedBy()).isEqualTo("Not found");
+        Assertions.assertThat(actualPolicyModel.getCreatedDate()).isNotNull();
         assertThat(actualPolicyModel.getPolicyAcronym()).isEqualTo(policyModel.getPolicyAcronym());
         assertThat(actualPolicyModel.getPolicyModelTosca())
             .isEqualTo(policyModel.getPolicyModelTosca());
-        assertThat(actualPolicyModel.getUpdatedBy()).isEqualTo("Not found");
-        assertThat(actualPolicyModel.getUpdatedDate()).isNotNull();
+        Assertions.assertThat(actualPolicyModel.getUpdatedBy()).isEqualTo("Not found");
+        Assertions.assertThat(actualPolicyModel.getUpdatedDate()).isNotNull();
         assertThat(actualPolicyModel.getVersion()).isEqualTo(policyModel.getVersion());
 
         assertThat(
diff --git a/src/test/java/org/onap/clamp/loop/ServiceTest.java b/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
index 7507d42e9..8f28299fd 100644
--- a/src/test/java/org/onap/clamp/loop/ServiceTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
@@ -21,14 +21,14 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.JsonObject;
 import org.junit.Test;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.service.Service;
 
 public class ServiceTest {
 
@@ -39,7 +39,7 @@ public class ServiceTest {
         String serviceStr3 = "{\"name\": \"vLoadBalancerMS\",\"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fc11\"}";
         String resourceStr = "{\"CP\": {}}";
 
-        Service service1 = new Service(JsonUtils.GSON.fromJson(serviceStr1, JsonObject.class), 
+        Service service1 = new Service(JsonUtils.GSON.fromJson(serviceStr1, JsonObject.class),
                 JsonUtils.GSON.fromJson(resourceStr, JsonObject.class), "1.0");
 
         Service service2 = new Service(JsonUtils.GSON.fromJson(serviceStr2, JsonObject.class), null, "1.0");
diff --git a/src/test/java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java b/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
index 8a5b5876f..f7f6baa0c 100644
--- a/src/test/java/org/onap/clamp/loop/deploy/BlueprintInputParametersTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
@@ -24,7 +24,7 @@
  *
  */
 
-package org.onap.clamp.loop.deploy;
+package org.onap.policy.clamp.loop.deploy;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
@@ -32,12 +32,12 @@ import java.util.LinkedHashSet;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.Loop;
-import org.onap.clamp.loop.template.LoopElementModel;
-import org.onap.clamp.loop.template.LoopTemplate;
-import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.Loop;
+import org.onap.policy.clamp.loop.template.LoopElementModel;
+import org.onap.policy.clamp.loop.template.LoopTemplate;
+import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 
 public class BlueprintInputParametersTest {
diff --git a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
index 47afb91c4..657adf1d1 100644
--- a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ b/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
@@ -1,4 +1,4 @@
-package org.onap.clamp.policy.downloader;
+package org.onap.policy.clamp.policy.downloader;
 /*-
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
@@ -33,11 +33,11 @@ import javax.transaction.Transactional;
 import org.json.simple.parser.ParseException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
-import org.onap.clamp.loop.template.PolicyModelsRepository;
+import org.onap.policy.clamp.clds.Application;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.loop.template.PolicyModelId;
+import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
diff --git a/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java b/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
index c43e62403..4bb850c35 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
+++ b/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
@@ -21,14 +21,14 @@
  *
  */
 
-package org.onap.clamp.policy.microservice;
+package org.onap.policy.clamp.policy.microservice;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import org.junit.Test;
-import org.onap.clamp.clds.util.JsonUtils;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.template.PolicyModel;
+import org.onap.policy.clamp.clds.util.JsonUtils;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.template.PolicyModel;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 public class MicroServicePayloadTest {
diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
index 322548bb4..136430c8f 100644
--- a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
+++ b/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.operational;
+package org.onap.policy.clamp.policy.operational;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,8 +29,8 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import org.junit.Test;
-import org.onap.clamp.clds.util.ResourceFileUtils;
-import org.onap.clamp.loop.service.Service;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
+import org.onap.policy.clamp.loop.service.Service;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 public class OperationalPolicyRepresentationBuilderTest {
diff --git a/src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupTest.java
index 46980d19f..699693de0 100644
--- a/src/test/java/org/onap/clamp/policy/pdpgroup/PdpGroupTest.java
+++ b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKeyTest.java
index 3befcf2d3..d4cf27392 100644
--- a/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
+++ b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PolicyModelKeyTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java b/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
index 55d347ceb..fdde53a21 100644
--- a/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java
+++ b/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.tosca;
+package org.onap.policy.clamp.tosca;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
@@ -32,7 +32,7 @@ import javax.persistence.EntityNotFoundException;
 import javax.transaction.Transactional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.clamp.clds.Application;
+import org.onap.policy.clamp.clds.Application;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/src/test/java/org/onap/clamp/util/PassDecoderTest.java b/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
index e5de8b0a8..83e894130 100644
--- a/src/test/java/org/onap/clamp/util/PassDecoderTest.java
+++ b/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
@@ -21,7 +21,7 @@
  * 
  */
 
-package org.onap.clamp.util;
+package org.onap.policy.clamp.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java b/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
index 88f2bbe1b..604ce55db 100644
--- a/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
+++ b/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
@@ -21,7 +21,7 @@
  *
  */
 
-package org.onap.clamp.util;
+package org.onap.policy.clamp.util;
 
 import static org.assertj.core.api.Assertions.assertThat;