Merge clamp master into tosca-poc branch

This change mreges changes in  clamp master into the tosca-poc branch
because the two banches have diverged.

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

247 files changed, 5204 insertions, 5275 deletions

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 175febc46..18c1aa6b9 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -6,6 +6,54 @@
 Release Notes
 =============
 
+Version: 5.1.0 (Guilin)
+--------------------------
+
+:Release Date: 2020-11-19
+
+**New Features**
+
+The Guilin release of the Control Loop Automation Management Platform (CLAMP).
+
+The main goal of the Guilin release was to:
+
+    - Complete integration to CDS for Actor/Action selection.
+    - SECCOM Perform Software Composition Analysis - Vulnerability tables (TSC must have).
+    - SECCOM Password removal from OOM HELM charts (TSC must have) - implementation of certinInitializer to get AAF certificates at oom deployment time.
+
+**Bug Fixes**
+
+	- The full list of implemented user stories and epics is available on `CLAMP R7 - M1 release planning <https://wiki.onap.org/display/DW/CLAMP+R7+-+M1+Release+Planning>`_
+	- The full list of issues(bugs) solved, is available on `CLAMP R7 - Guilin list of solved issues(bugs) <https://wiki.onap.org/pages/viewpage.action?pageId=93000705>`_
+
+**Known Issues**
+
+**Security Notes**
+
+*Fixed Security Issues*
+
+*Known Security Issues*
+
+*Known Vulnerabilities in Used Modules*
+
+CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release.
+
+Quick Links:
+ 	- `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_
+
+ 	- `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_
+
+**Upgrade Notes**
+
+    - The Upgrade strategy for Guilin can be found here:`<https://wiki.onap.org/display/DW/Frankfurt+CLAMP+Container+upgrade+strategy>`_
+    - New Docker Containers are available. the list of containers composing this release are below:
+       - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.1.5
+       - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.1.5
+       - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.4
+       - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.4
+       - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.4
+
+
 Version: 5.0.7 (Frankfurt maintenance release tag 6.0.0)
 --------------------------------------------------------
 
@@ -66,7 +114,6 @@ The main goal of the Frankfurt release was to:
     - Document(high level) current upgrade component strategy (TSC must have).
     - SECCOM Perform Software Composition Analysis - Vulnerability tables (TSC must have).
     - SECCOM Password removal from OOM HELM charts (TSC must have).
-    - SECCOM Password removal from OOM HELM charts (TSC must have).
     - SECCOM HTTPS communication vs. HTTP (TSC must have)
 
 **Bug Fixes**
diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index fbd9c48dd..b5e43be92 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,16 +1,16 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "5.1.0-SNAPSHOT",
+    "version" : "5.1.5-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:43065",
+  "host" : "localhost:38837",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/clampInformation" : {
       "get" : {
-        "operationId" : "route142",
+        "operationId" : "route106",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,13 +20,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route142"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route106"
       }
     },
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route127",
+        "operationId" : "route91",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -36,11 +36,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route127"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route91"
       },
       "put" : {
-        "operationId" : "route130",
+        "operationId" : "route94",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -59,13 +59,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route130"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route94"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
       "get" : {
-        "operationId" : "route129",
+        "operationId" : "route93",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "dictionaryName",
@@ -81,13 +81,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route129"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route93"
       }
     },
     "/v2/dictionary/{name}" : {
       "put" : {
-        "operationId" : "route131",
+        "operationId" : "route95",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -111,11 +111,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route131"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route95"
       },
       "delete" : {
-        "operationId" : "route132",
+        "operationId" : "route96",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -126,13 +126,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route132"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route96"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
       "delete" : {
-        "operationId" : "route133",
+        "operationId" : "route97",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -148,13 +148,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route133"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route97"
       }
     },
     "/v2/dictionary/secondary/names" : {
       "get" : {
-        "operationId" : "route128",
+        "operationId" : "route92",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -167,13 +167,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route128"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route92"
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route111",
+        "operationId" : "route75",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -189,13 +189,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route111"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route75"
       }
     },
     "/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" : {
       "put" : {
-        "operationId" : "route124",
+        "operationId" : "route88",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -221,13 +221,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route124"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route88"
       }
     },
     "/v2/loop/create/{loopName}?templateName={templateName}" : {
       "post" : {
-        "operationId" : "route126",
+        "operationId" : "route90",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -244,13 +244,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route126"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route90"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route122",
+        "operationId" : "route86",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -260,13 +260,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route122"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route86"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route115",
+        "operationId" : "route79",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -282,13 +282,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route115"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route79"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route110",
+        "operationId" : "route74",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -301,13 +301,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route110"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route74"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route123",
+        "operationId" : "route87",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -323,13 +323,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route123"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route87"
       }
     },
     "/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}" : {
       "put" : {
-        "operationId" : "route116",
+        "operationId" : "route80",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -350,13 +350,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route116"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route80"
       }
     },
     "/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}" : {
       "put" : {
-        "operationId" : "route117",
+        "operationId" : "route81",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -377,13 +377,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route117"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route81"
       }
     },
     "/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" : {
       "put" : {
-        "operationId" : "route125",
+        "operationId" : "route89",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -414,13 +414,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route125"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route89"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route120",
+        "operationId" : "route84",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -436,13 +436,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route120"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route84"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route119",
+        "operationId" : "route83",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -458,13 +458,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route119"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route83"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route121",
+        "operationId" : "route85",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -480,13 +480,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route121"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route85"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route118",
+        "operationId" : "route82",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -502,13 +502,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route118"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route82"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route112",
+        "operationId" : "route76",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -532,13 +532,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route112"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route76"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route114",
+        "operationId" : "route78",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -562,13 +562,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route114"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route78"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route113",
+        "operationId" : "route77",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -592,13 +592,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route113"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route77"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route134",
+        "operationId" : "route98",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -608,11 +608,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route134"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route98"
       },
       "post" : {
-        "operationId" : "route137",
+        "operationId" : "route101",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -631,13 +631,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route137"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route101"
       }
     },
     "/v2/policyToscaModels/{policyModelType}/{policyModelVersion}" : {
       "get" : {
-        "operationId" : "route135",
+        "operationId" : "route99",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "policyModelType",
@@ -658,11 +658,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route135"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route99"
       },
       "put" : {
-        "operationId" : "route138",
+        "operationId" : "route102",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -691,13 +691,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route138"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route102"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}" : {
       "get" : {
-        "operationId" : "route136",
+        "operationId" : "route100",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "policyModelType",
@@ -718,13 +718,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route136"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route100"
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route139",
+        "operationId" : "route103",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -734,13 +734,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route139"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route103"
       }
     },
     "/v2/templates/{templateName}" : {
       "get" : {
-        "operationId" : "route140",
+        "operationId" : "route104",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -756,13 +756,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route140"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route104"
       }
     },
     "/v2/templates/names" : {
       "get" : {
-        "operationId" : "route141",
+        "operationId" : "route105",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -775,13 +775,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route141"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route105"
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route143",
+        "operationId" : "route107",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -791,19 +791,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route143"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route107"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route144",
+        "operationId" : "route108",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-4",
-        "x-routeId" : "route144"
+        "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,19 +988,15 @@
         "asBoolean" : {
           "type" : "boolean"
         },
+        "boolean" : {
+          "type" : "boolean"
+        },
         "number" : {
           "type" : "boolean"
         },
         "asString" : {
           "type" : "string"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
@@ -1013,6 +1009,13 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1030,35 +1033,32 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "boolean" : {
-          "type" : "boolean"
-        },
         "string" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         }
       }
     },
@@ -1124,14 +1124,11 @@
         },
         "dcaeBlueprintId" : {
           "type" : "string"
-        },
-        "legacy" : {
-          "type" : "boolean"
         }
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.policy.microservice.MicroServicePolicy"
+        "format" : "org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
       }
     },
     "JsonObject" : {
@@ -1140,30 +1137,42 @@
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asString" : {
           "type" : "string"
         },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -1171,17 +1180,8 @@
           "type" : "number",
           "format" : "double"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1199,9 +1199,6 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
         }
       },
       "x-className" : {
@@ -1251,7 +1248,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.loop.template.PolicyModel"
+        "format" : "org.onap.policy.clamp.loop.template.PolicyModel"
       }
     },
     "Service" : {
@@ -1329,9 +1326,6 @@
         },
         "loop" : {
           "$ref" : "#/definitions/Loop"
-        },
-        "legacy" : {
-          "type" : "boolean"
         }
       }
     },
@@ -1341,30 +1335,42 @@
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asString" : {
           "type" : "string"
         },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -1372,17 +1378,8 @@
           "type" : "number",
           "format" : "double"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1400,9 +1397,6 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
         }
       }
     },
@@ -1415,13 +1409,6 @@
         "asString" : {
           "type" : "string"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
@@ -1434,6 +1421,13 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1451,29 +1445,29 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         }
       },
       "x-className" : {
@@ -1571,7 +1565,7 @@
       },
       "x-className" : {
         "type" : "string",
-        "format" : "org.onap.clamp.loop.template.LoopTemplate"
+        "format" : "org.onap.policy.clamp.loop.template.LoopTemplate"
       }
     },
     "ExternalComponentState" : {
@@ -1652,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 abf70b8b2..2502cf1e8 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,16 +4,16 @@
 << /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:20200803152317+02'00')
-/ModDate (D:20200803152317+02'00')
+/CreationDate (D:20201211130920+01'00')
+/ModDate (D:20201211130920+01'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 22 0 R
-/Outlines 676 0 R
-/PageLabels 842 0 R
+/Outlines 677 0 R
+/PageLabels 843 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 793.0]
 /ViewerPreferences << /DisplayDocTitle true
@@ -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 124 0 R 134 0 R 144 0 R 159 0 R 173 0 R 187 0 R 201 0 R 214 0 R 225 0 R 237 0 R 246 0 R 253 0 R 259 0 R 266 0 R 272 0 R 280 0 R 287 0 R 295 0 R 303 0 R 310 0 R 317 0 R 325 0 R 334 0 R 342 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
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 844 0 R
+/FontDescriptor 845 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 846 0 R
-/ToUnicode 845 0 R
+/Widths 847 0 R
+/ToUnicode 846 0 R
 >>
 endobj
 9 0 obj
@@ -1559,7 +1559,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R]
+/Annots [348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R]
 >>
 endobj
 11 0 obj
@@ -3062,7 +3062,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 494 0 R]
+/Annots [420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 495 0 R]
 >>
 endobj
 13 0 obj
@@ -4576,7 +4576,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [493 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R]
+/Annots [494 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R]
 >>
 endobj
 15 0 obj
@@ -6119,7 +6119,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R]
+/Annots [570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R]
 >>
 endobj
 17 0 obj
@@ -6742,7 +6742,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [645 0 R 646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 0 R 674 0 R]
+/Annots [646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 0 R 674 0 R 675 0 R]
 >>
 endobj
 19 0 obj
@@ -6791,7 +6791,7 @@ ET
 BT
 85.136384765625 660.036 Td
 /F1.0 10.5 Tf
-[<203a20352e312e302d534e415053484f> 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
-<203a206c6f63616c686f73743a3433303635> Tj
+<203a206c6f63616c686f73743a3338383337> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6925,7 +6925,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 >>
@@ -6939,18 +6939,18 @@ endobj
 >>
 endobj
 23 0 obj
-<< /Kids [56 0 R 257 0 R 319 0 R 155 0 R 241 0 R 90 0 R 152 0 R 221 0 R 57 0 R 189 0 R 116 0 R 183 0 R 84 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
 << /Type /Font
 /BaseFont /AAAAAB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 848 0 R
+/FontDescriptor 849 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 850 0 R
-/ToUnicode 849 0 R
+/Widths 851 0 R
+/ToUnicode 850 0 R
 >>
 endobj
 25 0 obj
@@ -6960,11 +6960,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAC+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 852 0 R
+/FontDescriptor 853 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 854 0 R
-/ToUnicode 853 0 R
+/Widths 855 0 R
+/ToUnicode 854 0 R
 >>
 endobj
 27 0 obj
@@ -7864,7 +7864,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 35 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [33 0 R 41 0 R]
@@ -7894,11 +7894,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 856 0 R
+/FontDescriptor 857 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 858 0 R
-/ToUnicode 857 0 R
+/Widths 859 0 R
+/ToUnicode 858 0 R
 >>
 endobj
 36 0 obj
@@ -9142,7 +9142,7 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [47 0 R 51 0 R 53 0 R]
@@ -9195,12 +9195,12 @@ endobj
 endobj
 56 0 obj
 << /Limits [(_clampinformation) (_consumes_8)]
-/Names [(_clampinformation) 248 0 R (_cldshealthcheck) 249 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) 191 0 R (_consumes_7) 204 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) 118 0 R (_responses_17) 125 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
@@ -10555,7 +10555,7 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [66 0 R 70 0 R 72 0 R]
@@ -11775,7 +11775,7 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 >>
@@ -11805,8 +11805,8 @@ endobj
 [75 0 R /XYZ 0 198.9600000000004 null]
 endobj
 84 0 obj
-<< /Limits [(_route128) (_version_information)]
-/Names [(_route128) 58 0 R (_route129) 63 0 R (_route130) 49 0 R (_route131) 68 0 R (_route132) 77 0 R (_route133) 81 0 R (_route134) 206 0 R (_route135) 216 0 R (_route136) 210 0 R (_route137) 198 0 R (_route138) 222 0 R (_route139) 230 0 R (_route140) 239 0 R (_route141) 234 0 R (_route142) 39 0 R (_route143) 31 0 R (_route144) 36 0 R (_service) 344 0 R (_uri_scheme) 27 0 R (_version_information) 25 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
@@ -13007,7 +13007,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 35 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [92 0 R]
@@ -13021,7 +13021,7 @@ endobj
 endobj
 90 0 obj
 << /Limits [(_policymodel) (_produces_18)]
-/Names [(_policymodel) 339 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) 120 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
@@ -14375,7 +14375,7 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [99 0 R 108 0 R]
@@ -15409,10 +15409,10 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [119 0 R]
+/Annots [118 0 R]
 >>
 endobj
 111 0 obj
@@ -15431,17 +15431,12 @@ endobj
 [110 0 R /XYZ 0 500.64000000000044 null]
 endobj
 116 0 obj
-<< /Limits [(_responses_6) (_route116)]
-/Names [(_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 71 0 R (_responses_9) 79 0 R (_route110) 112 0 R (_route111) 193 0 R (_route112) 166 0 R (_route113) 182 0 R (_route114) 175 0 R (_route115) 105 0 R (_route116) 121 0 R]
->>
-endobj
-117 0 obj
 [110 0 R /XYZ 0 460.5600000000004 null]
 endobj
-118 0 obj
+117 0 obj
 [110 0 R /XYZ 0 355.44000000000034 null]
 endobj
-119 0 obj
+118 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -15449,16 +15444,16 @@ endobj
 /Type /Annot
 >>
 endobj
-120 0 obj
+119 0 obj
 [110 0 R /XYZ 0 250.32000000000028 null]
 endobj
-121 0 obj
+120 0 obj
 [110 0 R /XYZ 0 194.04000000000025 null]
 endobj
-122 0 obj
+121 0 obj
 [110 0 R /XYZ 0 97.80000000000024 null]
 endobj
-123 0 obj
+122 0 obj
 << /Length 19092
 >>
 stream
@@ -16877,27 +16872,27 @@ Q
 
 endstream
 endobj
-124 0 obj
+123 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 123 0 R
+/Contents 122 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 /F4.0 35 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [126 0 R 131 0 R]
+/Annots [125 0 R 130 0 R]
 >>
 endobj
-125 0 obj
-[124 0 R /XYZ 0 645.5999999999999 null]
+124 0 obj
+[123 0 R /XYZ 0 645.5999999999999 null]
 endobj
-126 0 obj
+125 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -16905,19 +16900,19 @@ endobj
 /Type /Annot
 >>
 endobj
+126 0 obj
+[123 0 R /XYZ 0 540.48 null]
+endobj
 127 0 obj
-[124 0 R /XYZ 0 540.48 null]
+[123 0 R /XYZ 0 484.20000000000016 null]
 endobj
 128 0 obj
-[124 0 R /XYZ 0 484.20000000000016 null]
+[123 0 R /XYZ 0 387.96000000000015 null]
 endobj
 129 0 obj
-[124 0 R /XYZ 0 387.96000000000015 null]
+[123 0 R /XYZ 0 245.28000000000014 null]
 endobj
 130 0 obj
-[124 0 R /XYZ 0 245.28000000000014 null]
-endobj
-131 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -16925,10 +16920,10 @@ endobj
 /Type /Annot
 >>
 endobj
-132 0 obj
-[124 0 R /XYZ 0 140.1600000000001 null]
+131 0 obj
+[123 0 R /XYZ 0 140.1600000000001 null]
 endobj
-133 0 obj
+132 0 obj
 << /Length 17251
 >>
 stream
@@ -18212,33 +18207,33 @@ 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
 /F1.0 8 0 R
 /F4.0 35 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/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
@@ -19679,10 +19679,10 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/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) 192 0 R (_produces_26) 197 0 R (_produces_27) 205 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) 184 0 R (_parameters_21) 194 0 R (_parameters_22) 199 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,36 +21083,36 @@ 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
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/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,33 +22385,33 @@ 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
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [177 0 R 179 0 R 185 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,22 +22430,17 @@ 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
-<< /Limits [(_route117) (_route127)]
-/Names [(_route117) 128 0 R (_route118) 161 0 R (_route119) 147 0 R (_route120) 140 0 R (_route121) 153 0 R (_route122) 102 0 R (_route123) 115 0 R (_route124) 88 0 R (_route125) 135 0 R (_route126) 94 0 R (_route127) 43 0 R]
->>
+[174 0 R /XYZ 0 273.60000000000014 null]
 endobj
 184 0 obj
-[173 0 R /XYZ 0 205.44000000000014 null]
+[174 0 R /XYZ 0 205.44000000000014 null]
 endobj
 185 0 obj
 << /Border [0 0 0]
@@ -23659,21 +23659,16 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [190 0 R 196 0 R]
+/Annots [189 0 R 195 0 R]
 >>
 endobj
 188 0 obj
 [187 0 R /XYZ 0 792.0 null]
 endobj
 189 0 obj
-<< /Limits [(_responses_2) (_responses_5)]
-/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) 188 0 R (_responses_27) 195 0 R (_responses_28) 202 0 R (_responses_29) 207 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
-190 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -23681,22 +23676,22 @@ endobj
 /Type /Annot
 >>
 endobj
-191 0 obj
+190 0 obj
 [187 0 R /XYZ 0 653.2800000000002 null]
 endobj
-192 0 obj
+191 0 obj
 [187 0 R /XYZ 0 597.0000000000003 null]
 endobj
-193 0 obj
+192 0 obj
 [187 0 R /XYZ 0 540.7200000000005 null]
 endobj
-194 0 obj
+193 0 obj
 [187 0 R /XYZ 0 500.6400000000005 null]
 endobj
-195 0 obj
+194 0 obj
 [187 0 R /XYZ 0 395.5200000000005 null]
 endobj
-196 0 obj
+195 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -23704,16 +23699,16 @@ endobj
 /Type /Annot
 >>
 endobj
-197 0 obj
+196 0 obj
 [187 0 R /XYZ 0 290.40000000000043 null]
 endobj
-198 0 obj
+197 0 obj
 [187 0 R /XYZ 0 234.1200000000004 null]
 endobj
-199 0 obj
+198 0 obj
 [187 0 R /XYZ 0 194.0400000000004 null]
 endobj
-200 0 obj
+199 0 obj
 << /Length 15184
 >>
 stream
@@ -24816,27 +24811,27 @@ Q
 
 endstream
 endobj
-201 0 obj
+200 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 200 0 R
+/Contents 199 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [203 0 R 208 0 R]
+/Annots [202 0 R 207 0 R]
 >>
 endobj
-202 0 obj
-[201 0 R /XYZ 0 792.0 null]
+201 0 obj
+[200 0 R /XYZ 0 792.0 null]
 endobj
-203 0 obj
+202 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -24844,19 +24839,19 @@ endobj
 /Type /Annot
 >>
 endobj
+203 0 obj
+[200 0 R /XYZ 0 653.2800000000002 null]
+endobj
 204 0 obj
-[201 0 R /XYZ 0 653.2800000000002 null]
+[200 0 R /XYZ 0 597.0000000000003 null]
 endobj
 205 0 obj
-[201 0 R /XYZ 0 597.0000000000003 null]
+[200 0 R /XYZ 0 540.7200000000005 null]
 endobj
 206 0 obj
-[201 0 R /XYZ 0 540.7200000000005 null]
+[200 0 R /XYZ 0 500.6400000000005 null]
 endobj
 207 0 obj
-[201 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
-[201 0 R /XYZ 0 395.52000000000044 null]
+[200 0 R /XYZ 0 339.2400000000004 null]
 endobj
 210 0 obj
-[201 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
-[201 0 R /XYZ 0 243.00000000000043 null]
+[200 0 R /XYZ 0 243.00000000000043 null]
 endobj
 212 0 obj
-[201 0 R /XYZ 0 100.32000000000039 null]
+[200 0 R /XYZ 0 100.32000000000039 null]
 endobj
 213 0 obj
 << /Length 14693
@@ -25956,7 +25956,7 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [219 0 R]
@@ -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) 238 0 R (_produces_34) 244 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
@@ -27447,7 +27447,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 35 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
 /Annots [227 0 R 232 0 R]
@@ -28137,10 +28137,10 @@ endobj
 /F4.0 35 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [243 0 R]
+/Annots [244 0 R]
 >>
 endobj
 238 0 obj
@@ -28161,6 +28161,11 @@ endobj
 [237 0 R /XYZ 0 556.9200000000003 null]
 endobj
 243 0 obj
+<< /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]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -28168,10 +28173,10 @@ endobj
 /Type /Annot
 >>
 endobj
-244 0 obj
+245 0 obj
 [237 0 R /XYZ 0 451.8000000000004 null]
 endobj
-245 0 obj
+246 0 obj
 << /Length 17145
 >>
 stream
@@ -29492,35 +29497,35 @@ Q
 
 endstream
 endobj
-246 0 obj
+247 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 245 0 R
+/Contents 246 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [251 0 R]
+/Annots [252 0 R]
 >>
 endobj
-247 0 obj
-[246 0 R /XYZ 0 792.0 null]
-endobj
 248 0 obj
-[246 0 R /XYZ 0 712.0799999999999 null]
+[247 0 R /XYZ 0 792.0 null]
 endobj
 249 0 obj
-[246 0 R /XYZ 0 524.04 null]
+[247 0 R /XYZ 0 712.0799999999999 null]
 endobj
 250 0 obj
-[246 0 R /XYZ 0 335.99999999999994 null]
+[247 0 R /XYZ 0 524.04 null]
 endobj
 251 0 obj
+[247 0 R /XYZ 0 335.99999999999994 null]
+endobj
+252 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -29528,7 +29533,7 @@ endobj
 /Type /Annot
 >>
 endobj
-252 0 obj
+253 0 obj
 << /Length 19851
 >>
 stream
@@ -31097,26 +31102,26 @@ Q
 
 endstream
 endobj
-253 0 obj
+254 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 252 0 R
+/Contents 253 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [255 0 R]
+/Annots [256 0 R]
 >>
 endobj
-254 0 obj
-[253 0 R /XYZ 0 608.04 null]
-endobj
 255 0 obj
+[254 0 R /XYZ 0 608.04 null]
+endobj
+256 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -31124,15 +31129,15 @@ endobj
 /Type /Annot
 >>
 endobj
-256 0 obj
-[253 0 R /XYZ 0 157.07999999999998 null]
-endobj
 257 0 obj
+[254 0 R /XYZ 0 157.07999999999998 null]
+endobj
+258 0 obj
 << /Limits [(_definitions) (_loop)]
-/Names [(_definitions) 247 0 R (_dictionary) 250 0 R (_dictionaryelement) 254 0 R (_externalcomponent) 256 0 R (_externalcomponentstate) 261 0 R (_jsonarray) 262 0 R (_jsonnull) 270 0 R (_jsonobject) 278 0 R (_jsonprimitive) 288 0 R (_loop) 296 0 R]
+/Names [(_definitions) 248 0 R (_dictionary) 251 0 R (_dictionaryelement) 255 0 R (_externalcomponent) 257 0 R (_externalcomponentstate) 262 0 R (_jsonarray) 263 0 R (_jsonnull) 271 0 R (_jsonobject) 279 0 R (_jsonprimitive) 289 0 R (_loop) 297 0 R]
 >>
 endobj
-258 0 obj
+259 0 obj
 << /Length 20493
 >>
 stream
@@ -32703,23 +32708,23 @@ Q
 
 endstream
 endobj
-259 0 obj
+260 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 258 0 R
+/Contents 259 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [260 0 R 263 0 R 264 0 R]
+/Annots [261 0 R 264 0 R 265 0 R]
 >>
 endobj
-260 0 obj
+261 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -32727,13 +32732,13 @@ endobj
 /Type /Annot
 >>
 endobj
-261 0 obj
-[259 0 R /XYZ 0 683.1600000000001 null]
-endobj
 262 0 obj
-[259 0 R /XYZ 0 495.1200000000002 null]
+[260 0 R /XYZ 0 683.1600000000001 null]
 endobj
 263 0 obj
+[260 0 R /XYZ 0 495.1200000000002 null]
+endobj
+264 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -32741,7 +32746,7 @@ endobj
 /Type /Annot
 >>
 endobj
-264 0 obj
+265 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -32749,7 +32754,7 @@ endobj
 /Type /Annot
 >>
 endobj
-265 0 obj
+266 0 obj
 << /Length 21348
 >>
 stream
@@ -34411,23 +34416,23 @@ Q
 
 endstream
 endobj
-266 0 obj
+267 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 265 0 R
+/Contents 266 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [267 0 R 268 0 R 269 0 R]
+/Annots [268 0 R 269 0 R 270 0 R]
 >>
 endobj
-267 0 obj
+268 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -34435,7 +34440,7 @@ endobj
 /Type /Annot
 >>
 endobj
-268 0 obj
+269 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -34443,7 +34448,7 @@ endobj
 /Type /Annot
 >>
 endobj
-269 0 obj
+270 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -34451,10 +34456,10 @@ endobj
 /Type /Annot
 >>
 endobj
-270 0 obj
-[266 0 R /XYZ 0 345.1200000000003 null]
-endobj
 271 0 obj
+[267 0 R /XYZ 0 345.1200000000003 null]
+endobj
+272 0 obj
 << /Length 21776
 >>
 stream
@@ -36132,23 +36137,23 @@ Q
 
 endstream
 endobj
-272 0 obj
+273 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 271 0 R
+/Contents 272 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [273 0 R 274 0 R 275 0 R 276 0 R 277 0 R]
+/Annots [274 0 R 275 0 R 276 0 R 277 0 R 278 0 R]
 >>
 endobj
-273 0 obj
+274 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -36156,7 +36161,7 @@ endobj
 /Type /Annot
 >>
 endobj
-274 0 obj
+275 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -36164,7 +36169,7 @@ endobj
 /Type /Annot
 >>
 endobj
-275 0 obj
+276 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -36172,7 +36177,7 @@ endobj
 /Type /Annot
 >>
 endobj
-276 0 obj
+277 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -36180,7 +36185,7 @@ endobj
 /Type /Annot
 >>
 endobj
-277 0 obj
+278 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -36188,10 +36193,10 @@ endobj
 /Type /Annot
 >>
 endobj
-278 0 obj
-[272 0 R /XYZ 0 194.88000000000017 null]
-endobj
 279 0 obj
+[273 0 R /XYZ 0 194.88000000000017 null]
+endobj
+280 0 obj
 << /Length 22905
 >>
 stream
@@ -37960,23 +37965,23 @@ Q
 
 endstream
 endobj
-280 0 obj
+281 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 279 0 R
+/Contents 280 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [281 0 R 282 0 R 283 0 R 284 0 R 285 0 R]
+/Annots [282 0 R 283 0 R 284 0 R 285 0 R 286 0 R]
 >>
 endobj
-281 0 obj
+282 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -37984,7 +37989,7 @@ endobj
 /Type /Annot
 >>
 endobj
-282 0 obj
+283 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -37992,7 +37997,7 @@ endobj
 /Type /Annot
 >>
 endobj
-283 0 obj
+284 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -38000,7 +38005,7 @@ endobj
 /Type /Annot
 >>
 endobj
-284 0 obj
+285 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -38008,7 +38013,7 @@ endobj
 /Type /Annot
 >>
 endobj
-285 0 obj
+286 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -38016,7 +38021,7 @@ endobj
 /Type /Annot
 >>
 endobj
-286 0 obj
+287 0 obj
 << /Length 21594
 >>
 stream
@@ -39706,26 +39711,26 @@ Q
 
 endstream
 endobj
-287 0 obj
+288 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 286 0 R
+/Contents 287 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [289 0 R 290 0 R 291 0 R 292 0 R 293 0 R]
+/Annots [290 0 R 291 0 R 292 0 R 293 0 R 294 0 R]
 >>
 endobj
-288 0 obj
-[287 0 R /XYZ 0 792.0 null]
-endobj
 289 0 obj
+[288 0 R /XYZ 0 792.0 null]
+endobj
+290 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -39733,7 +39738,7 @@ endobj
 /Type /Annot
 >>
 endobj
-290 0 obj
+291 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -39741,7 +39746,7 @@ endobj
 /Type /Annot
 >>
 endobj
-291 0 obj
+292 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -39749,7 +39754,7 @@ endobj
 /Type /Annot
 >>
 endobj
-292 0 obj
+293 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -39757,7 +39762,7 @@ endobj
 /Type /Annot
 >>
 endobj
-293 0 obj
+294 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -39765,7 +39770,7 @@ endobj
 /Type /Annot
 >>
 endobj
-294 0 obj
+295 0 obj
 << /Length 22743
 >>
 stream
@@ -41492,26 +41497,26 @@ Q
 
 endstream
 endobj
-295 0 obj
+296 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 294 0 R
+/Contents 295 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [297 0 R 298 0 R 299 0 R 300 0 R 301 0 R]
+/Annots [298 0 R 299 0 R 300 0 R 301 0 R 302 0 R]
 >>
 endobj
-296 0 obj
-[295 0 R /XYZ 0 495.3600000000003 null]
-endobj
 297 0 obj
+[296 0 R /XYZ 0 495.3600000000003 null]
+endobj
+298 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -41519,7 +41524,7 @@ endobj
 /Type /Annot
 >>
 endobj
-298 0 obj
+299 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -41527,7 +41532,7 @@ endobj
 /Type /Annot
 >>
 endobj
-299 0 obj
+300 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -41535,7 +41540,7 @@ endobj
 /Type /Annot
 >>
 endobj
-300 0 obj
+301 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -41543,7 +41548,7 @@ endobj
 /Type /Annot
 >>
 endobj
-301 0 obj
+302 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -41551,7 +41556,7 @@ endobj
 /Type /Annot
 >>
 endobj
-302 0 obj
+303 0 obj
 << /Length 22218
 >>
 stream
@@ -43263,23 +43268,23 @@ Q
 
 endstream
 endobj
-303 0 obj
+304 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 302 0 R
+/Contents 303 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [304 0 R 305 0 R 307 0 R 308 0 R]
+/Annots [305 0 R 306 0 R 308 0 R 309 0 R]
 >>
 endobj
-304 0 obj
+305 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -43287,7 +43292,7 @@ endobj
 /Type /Annot
 >>
 endobj
-305 0 obj
+306 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -43295,10 +43300,10 @@ endobj
 /Type /Annot
 >>
 endobj
-306 0 obj
-[303 0 R /XYZ 0 532.9200000000001 null]
-endobj
 307 0 obj
+[304 0 R /XYZ 0 532.9200000000001 null]
+endobj
+308 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -43306,7 +43311,7 @@ endobj
 /Type /Annot
 >>
 endobj
-308 0 obj
+309 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -43314,7 +43319,7 @@ endobj
 /Type /Annot
 >>
 endobj
-309 0 obj
+310 0 obj
 << /Length 20618
 >>
 stream
@@ -44911,26 +44916,26 @@ Q
 
 endstream
 endobj
-310 0 obj
+311 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 309 0 R
+/Contents 310 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [312 0 R 314 0 R 315 0 R]
+/Annots [313 0 R 315 0 R 316 0 R]
 >>
 endobj
-311 0 obj
-[310 0 R /XYZ 0 792.0 null]
-endobj
 312 0 obj
+[311 0 R /XYZ 0 792.0 null]
+endobj
+313 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -44938,10 +44943,10 @@ endobj
 /Type /Annot
 >>
 endobj
-313 0 obj
-[310 0 R /XYZ 0 457.68 null]
-endobj
 314 0 obj
+[311 0 R /XYZ 0 457.68 null]
+endobj
+315 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -44949,7 +44954,7 @@ endobj
 /Type /Annot
 >>
 endobj
-315 0 obj
+316 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -44957,7 +44962,7 @@ endobj
 /Type /Annot
 >>
 endobj
-316 0 obj
+317 0 obj
 << /Length 20611
 >>
 stream
@@ -46528,31 +46533,31 @@ Q
 
 endstream
 endobj
-317 0 obj
+318 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 316 0 R
+/Contents 317 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [320 0 R 321 0 R 323 0 R]
+/Annots [321 0 R 322 0 R 324 0 R]
 >>
 endobj
-318 0 obj
-[317 0 R /XYZ 0 608.0400000000002 null]
-endobj
 319 0 obj
+[318 0 R /XYZ 0 608.0400000000002 null]
+endobj
+320 0 obj
 << /Limits [(_loopelementmodel) (_parameters_14)]
-/Names [(_loopelementmodel) 306 0 R (_looplog) 311 0 R (_looptemplate) 313 0 R (_looptemplateloopelementmodel) 318 0 R (_microservicepolicy) 322 0 R (_number) 330 0 R (_operationalpolicy) 331 0 R (_overview) 21 0 R (_parameters) 50 0 R (_parameters_10) 117 0 R (_parameters_11) 122 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
-320 0 obj
+321 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -46560,7 +46565,7 @@ endobj
 /Type /Annot
 >>
 endobj
-321 0 obj
+322 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -46568,10 +46573,10 @@ endobj
 /Type /Annot
 >>
 endobj
-322 0 obj
-[317 0 R /XYZ 0 420.0000000000003 null]
-endobj
 323 0 obj
+[318 0 R /XYZ 0 420.0000000000003 null]
+endobj
+324 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -46579,8 +46584,8 @@ endobj
 /Type /Annot
 >>
 endobj
-324 0 obj
-<< /Length 20167
+325 0 obj
+<< /Length 20279
 >>
 stream
 q
@@ -46673,14 +46678,6 @@ f
 269.177 357.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -46873,7 +46870,7 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-<6c6567616379> Tj
+<6c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 
@@ -46916,13 +46913,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -46955,7 +46960,7 @@ S
 BT
 51.24 641.3529999999998 Td
 /F2.0 10.5 Tf
-<6c6f6f70456c656d656e744d6f64656c> Tj
+<6e616d65> Tj
 ET
 
 
@@ -46998,21 +47003,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 634.2129999999999 Td
 /F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -47045,7 +47042,7 @@ S
 BT
 51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<70647047726f7570> Tj
 ET
 
 
@@ -47127,7 +47124,7 @@ S
 BT
 51.24 566.233 Td
 /F2.0 10.5 Tf
-<70647047726f7570> Tj
+<70647053756267726f7570> Tj
 ET
 
 
@@ -47209,7 +47206,7 @@ S
 BT
 51.24 528.673 Td
 /F2.0 10.5 Tf
-<70647053756267726f7570> Tj
+<706f6c6963794d6f64656c> Tj
 ET
 
 
@@ -47252,13 +47249,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -47291,7 +47296,7 @@ S
 BT
 51.24 491.1129999999999 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<736861726564> Tj
 ET
 
 
@@ -47334,21 +47339,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 483.9729999999999 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -47381,7 +47378,7 @@ S
 BT
 51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
-<736861726564> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
@@ -47428,7 +47425,7 @@ S
 BT
 272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -47463,7 +47460,7 @@ S
 BT
 51.24 415.993 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<7570646174656444617465> Tj
 ET
 
 
@@ -47510,7 +47507,7 @@ S
 BT
 272.17692192000004 408.853 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -47545,7 +47542,7 @@ S
 BT
 51.24 378.43300000000005 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<7573656442> 20.01953125 <794c6f6f7073>] TJ
 ET
 
 
@@ -47588,95 +47585,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 371.29300000000006 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 340.8730000000001 Td
-/F2.0 10.5 Tf
-[<7573656442> 20.01953125 <794c6f6f7073>] TJ
-ET
-
-
-BT
-51.24 326.5930000000001 Td
-ET
-
-
-BT
-51.24 326.5930000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.7330000000001 Td
+272.17692192000004 371.29300000000006 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -47685,7 +47600,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 333.7330000000001 Td
+280.76592192000004 371.29300000000006 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -47694,7 +47609,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-305.86092192000007 333.7330000000001 Td
+305.86092192000007 371.29300000000006 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -47704,7 +47619,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 284.13600000000014 Td
+48.24 321.6960000000001 Td
 /F2.0 18 Tf
 <332e31372e204e756d626572> Tj
 ET
@@ -47715,7 +47630,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 255.51600000000008 Td
+48.24 293.076 Td
 /F3.0 10.5 Tf
 <54797065> Tj
 ET
@@ -47726,7 +47641,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-71.4345 255.51600000000008 Td
+71.4345 293.076 Td
 /F1.0 10.5 Tf
 <203a206f626a656374> Tj
 ET
@@ -47737,7 +47652,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 216.27600000000007 Td
+48.24 253.836 Td
 /F2.0 18 Tf
 [<332e31382e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
@@ -47745,59 +47660,67 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 176.340 220.937 23.280 re
+48.240 213.900 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 176.340 294.583 23.280 re
+269.177 213.900 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 138.780 220.937 37.560 re
+48.240 176.340 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 138.780 294.583 37.560 re
+269.177 176.340 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 101.220 220.937 37.560 re
+48.240 138.780 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 101.220 294.583 37.560 re
+269.177 138.780 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 63.660 220.937 37.560 re
+48.240 101.220 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
+269.177 101.220 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 63.660 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
 269.177 63.660 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 199.620 m
-269.177 199.620 l
+48.240 237.180 m
+269.177 237.180 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 176.340 m
-269.177 176.340 l
+48.240 213.900 m
+269.177 213.900 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 199.870 m
-48.240 175.590 l
+48.240 237.430 m
+48.240 213.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 199.870 m
-269.177 175.590 l
+269.177 237.430 m
+269.177 213.150 l
 S
 [ ] 0 d
 1 w
@@ -47805,7 +47728,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 183.87300000000008 Td
+51.24 221.43300000000002 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -47813,26 +47736,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 199.620 m
-563.760 199.620 l
+269.177 237.180 m
+563.760 237.180 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 176.340 m
-563.760 176.340 l
+269.177 213.900 m
+563.760 213.900 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 199.870 m
-269.177 175.590 l
+269.177 237.430 m
+269.177 213.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 199.870 m
-563.760 175.590 l
+563.760 237.430 m
+563.760 213.150 l
 S
 [ ] 0 d
 1 w
@@ -47840,7 +47763,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.87300000000008 Td
+272.17692192000004 221.43300000000002 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -47848,6 +47771,96 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
+48.240 213.900 m
+269.177 213.900 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 176.340 m
+269.177 176.340 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 214.150 m
+48.240 176.090 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 214.150 m
+269.177 176.090 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 197.65300000000002 Td
+/F2.0 10.5 Tf
+[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
+ET
+
+
+BT
+51.24 183.37300000000002 Td
+ET
+
+
+BT
+51.24 183.37300000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 213.900 m
+563.760 213.900 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 176.340 m
+563.760 176.340 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 214.150 m
+269.177 176.090 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 214.150 m
+563.760 176.090 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 190.513 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
 48.240 176.340 m
 269.177 176.340 l
 S
@@ -47875,19 +47888,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 160.09300000000007 Td
+51.24 160.09300000000002 Td
 /F2.0 10.5 Tf
-[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 145.81300000000007 Td
+51.24 145.81300000000002 Td
 ET
 
 
 BT
-51.24 145.81300000000007 Td
+51.24 145.81300000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47920,21 +47933,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 152.95300000000006 Td
+272.17692192000004 152.953 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -47965,19 +47970,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 122.53300000000007 Td
+51.24 122.53300000000002 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 108.25300000000007 Td
+51.24 108.25300000000001 Td
 ET
 
 
 BT
-51.24 108.25300000000007 Td
+51.24 108.25300000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48012,9 +48017,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 115.39300000000007 Td
+272.17692192000004 115.39300000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -48047,19 +48052,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 84.97300000000006 Td
+51.24 84.973 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+<6a736f6e526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 70.69300000000005 Td
+51.24 70.693 Td
 ET
 
 
 BT
-51.24 70.69300000000005 Td
+51.24 70.693 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48092,13 +48097,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 77.83300000000006 Td
+272.17692192000004 77.833 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -48124,23 +48137,23 @@ Q
 
 endstream
 endobj
-325 0 obj
+326 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 324 0 R
+/Contents 325 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [326 0 R 327 0 R 328 0 R 329 0 R 332 0 R]
+/Annots [327 0 R 328 0 R 329 0 R 330 0 R 333 0 R 334 0 R]
 >>
 endobj
-326 0 obj
+327 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -48148,46 +48161,54 @@ endobj
 /Type /Annot
 >>
 endobj
-327 0 obj
+328 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
-/Rect [272.17692192000004 631.1469999999999 369.88992192000006 645.4269999999999]
+/Rect [272.17692192000004 668.707 369.88992192000006 682.987]
 /Type /Annot
 >>
 endobj
-328 0 obj
+329 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
-/Rect [272.17692192000004 480.90699999999987 333.47592192 495.1869999999999]
+/Rect [272.17692192000004 518.467 333.47592192 532.747]
 /Type /Annot
 >>
 endobj
-329 0 obj
+330 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [280.76592192000004 330.6670000000001 305.86092192000007 344.9470000000001]
+/Rect [280.76592192000004 368.22700000000003 305.86092192000007 382.50700000000006]
 /Type /Annot
 >>
 endobj
-330 0 obj
-[325 0 R /XYZ 0 307.5600000000001 null]
-endobj
 331 0 obj
-[325 0 R /XYZ 0 239.70000000000007 null]
+[326 0 R /XYZ 0 345.12000000000006 null]
 endobj
 332 0 obj
+[326 0 R /XYZ 0 277.26 null]
+endobj
+333 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 149.88700000000009 325.32792192000005 164.1670000000001]
+/Rect [272.17692192000004 187.44700000000003 325.32792192000005 201.72700000000003]
 /Type /Annot
 >>
 endobj
-333 0 obj
-<< /Length 21550
+334 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 74.767 325.32792192000005 89.047]
+/Type /Annot
+>>
+endobj
+335 0 obj
+<< /Length 21618
 >>
 stream
 q
@@ -48264,22 +48285,6 @@ f
 269.177 432.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -48382,7 +48387,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-<6a736f6e526570726573656e746174696f6e> Tj
+<6c6f6f70> Tj
 ET
 
 
@@ -48435,7 +48440,7 @@ S
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -48472,17 +48477,17 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-<6c6567616379> Tj
+<6c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48515,13 +48520,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -48554,7 +48567,7 @@ S
 BT
 51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<6c6f6f70> Tj
+<6e616d65> Tj
 ET
 
 
@@ -48597,21 +48610,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -48642,19 +48647,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7930000000001 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-<6c6f6f70456c656d656e744d6f64656c> Tj
+<70647047726f7570> Tj
 ET
 
 
 BT
-51.24 589.513 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 589.513 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48687,21 +48692,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 596.653 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -48734,7 +48731,7 @@ S
 BT
 51.24 566.233 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<70647053756267726f7570> Tj
 ET
 
 
@@ -48816,17 +48813,17 @@ S
 BT
 51.24 528.673 Td
 /F2.0 10.5 Tf
-<70647047726f7570> Tj
+<706f6c6963794d6f64656c> Tj
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 514.3929999999999 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 514.3929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48859,13 +48856,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -48896,9 +48901,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+51.24 491.11299999999994 Td
 /F2.0 10.5 Tf
-<70647053756267726f7570> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
@@ -48943,7 +48948,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 483.97299999999996 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -48978,19 +48983,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.553 Td
+51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 439.2729999999999 Td
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 439.2729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49023,44 +49028,119 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.413 Td
+272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 396.816 Td
+/F2.0 18 Tf
+<332e31392e20506f6c6963794d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.400 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 380.160 m
+269.177 380.160 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 380.410 m
+48.240 356.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 380.410 m
+269.177 356.130 l
 S
 [ ] 0 d
 1 w
@@ -49068,46 +49148,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 364.4129999999999 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 401.71299999999997 Td
-ET
-
-
-BT
-51.24 401.71299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 380.160 m
+563.760 380.160 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 380.410 m
+269.177 356.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 380.410 m
+563.760 356.130 l
 S
 [ ] 0 d
 1 w
@@ -49115,34 +49183,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.853 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 364.4129999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -49150,19 +49218,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.433 Td
+51.24 340.63299999999987 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 326.35299999999984 Td
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 326.35299999999984 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49170,26 +49238,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -49197,86 +49265,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.293 Td
+272.17692192000004 333.4929999999999 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 321.696 Td
-/F2.0 18 Tf
-<332e31392e20506f6c6963794d6f64656c> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 56.400 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 305.040 m
-269.177 305.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
 48.240 281.760 m
 269.177 281.760 l
@@ -49284,14 +49285,14 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 305.290 m
-48.240 281.010 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 305.290 m
-269.177 281.010 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -49299,19 +49300,31 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 289.29299999999995 Td
+51.24 303.0729999999999 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 288.7929999999999 Td
+ET
+
+
+BT
+51.24 288.7929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 305.040 m
-563.760 305.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
 269.177 281.760 m
 563.760 281.760 l
@@ -49319,14 +49332,14 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 305.290 m
-269.177 281.010 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 305.290 m
-563.760 281.010 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -49334,9 +49347,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 289.29299999999995 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 295.93299999999994 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -49369,19 +49382,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.513 Td
+51.24 265.51299999999986 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
 ET
 
 
 BT
-51.24 251.23299999999998 Td
+51.24 251.23299999999986 Td
 ET
 
 
 BT
-51.24 251.23299999999998 Td
+51.24 251.23299999999986 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49416,7 +49429,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.373 Td
+272.17692192000004 258.3729999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -49451,19 +49464,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95299999999997 Td
+51.24 227.95299999999992 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
 ET
 
 
 BT
-51.24 213.67299999999997 Td
+51.24 213.67299999999992 Td
 ET
 
 
 BT
-51.24 213.67299999999997 Td
+51.24 213.67299999999992 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49498,9 +49511,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.81299999999996 Td
+272.17692192000004 220.8129999999999 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -49533,19 +49546,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39299999999997 Td
+51.24 190.39299999999992 Td
 /F2.0 10.5 Tf
-[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 176.11299999999997 Td
+51.24 176.11299999999991 Td
 ET
 
 
 BT
-51.24 176.11299999999997 Td
+51.24 176.11299999999991 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49580,7 +49593,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25299999999996 Td
+272.17692192000004 183.2529999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -49615,19 +49628,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83299999999997 Td
+51.24 152.8329999999999 Td
 /F2.0 10.5 Tf
-[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
+<706f6c69637950647047726f7570> Tj
 ET
 
 
 BT
-51.24 138.55299999999997 Td
+51.24 138.5529999999999 Td
 ET
 
 
 BT
-51.24 138.55299999999997 Td
+51.24 138.5529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49660,13 +49673,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 145.69299999999996 Td
+272.17692192000004 145.6929999999999 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -49697,19 +49718,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27299999999995 Td
+51.24 115.2729999999999 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c54797065> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 100.99299999999995 Td
+51.24 100.9929999999999 Td
 ET
 
 
 BT
-51.24 100.99299999999995 Td
+51.24 100.9929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49744,7 +49765,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13299999999995 Td
+272.17692192000004 108.1329999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -49779,19 +49800,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71299999999995 Td
+51.24 77.71299999999987 Td
 /F2.0 10.5 Tf
-<706f6c69637950647047726f7570> Tj
+<7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 63.43299999999995 Td
+51.24 63.432999999999865 Td
 ET
 
 
 BT
-51.24 63.43299999999995 Td
+51.24 63.432999999999865 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49824,21 +49845,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.57299999999995 Td
+272.17692192000004 70.57299999999987 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -49864,67 +49877,59 @@ Q
 
 endstream
 endobj
-334 0 obj
+336 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 333 0 R
+/Contents 335 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
->>
+/XObject << /Stamp1 676 0 R
 >>
-/Annots [335 0 R 336 0 R 337 0 R 338 0 R 340 0 R]
 >>
-endobj
-335 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 706.267 325.32792192000005 720.547]
-/Type /Annot
+/Annots [337 0 R 338 0 R 339 0 R 341 0 R]
 >>
 endobj
-336 0 obj
+337 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [272.17692192000004 631.147 297.27192192000007 645.427]
+/Rect [272.17692192000004 706.267 297.27192192000007 720.547]
 /Type /Annot
 >>
 endobj
-337 0 obj
+338 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
-/Rect [272.17692192000004 593.5870000000001 369.88992192000006 607.8670000000001]
+/Rect [272.17692192000004 668.707 369.88992192000006 682.987]
 /Type /Annot
 >>
 endobj
-338 0 obj
+339 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
-/Rect [272.17692192000004 443.347 333.47592192 457.627]
+/Rect [272.17692192000004 518.467 333.47592192 532.747]
 /Type /Annot
 >>
 endobj
-339 0 obj
-[334 0 R /XYZ 0 345.12 null]
-endobj
 340 0 obj
+[336 0 R /XYZ 0 420.23999999999995 null]
+endobj
+341 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 67.50699999999995 325.32792192000005 81.78699999999995]
+/Rect [272.17692192000004 142.62699999999992 325.32792192000005 156.90699999999993]
 /Type /Annot
 >>
 endobj
-341 0 obj
-<< /Length 13509
+342 0 obj
+<< /Length 11146
 >>
 stream
 q
@@ -49953,22 +49958,6 @@ f
 269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -50071,7 +50060,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
 ET
 
 
@@ -50114,177 +50103,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 678.913 Td
-/F2.0 10.5 Tf
-<7570646174656444617465> Tj
-ET
-
-
-BT
-51.24 664.6329999999999 Td
-ET
-
-
-BT
-51.24 664.6329999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 641.3529999999998 Td
-/F2.0 10.5 Tf
-[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
-ET
-
-
-BT
-51.24 627.0729999999999 Td
-ET
-
-
-BT
-51.24 627.0729999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.2129999999999 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -50293,7 +50118,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 634.2129999999999 Td
+280.76592192000004 709.333 Td
 /F1.0 10.5 Tf
 <4c6f6f70456c656d656e744d6f64656c> Tj
 ET
@@ -50302,7 +50127,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-378.47892192000006 634.2129999999999 Td
+378.47892192000006 709.333 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -50310,26 +50135,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -50337,19 +50162,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <76657273696f6e> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50357,26 +50182,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -50384,7 +50209,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -50394,7 +50219,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 547.056 Td
+48.24 622.1759999999999 Td
 /F2.0 18 Tf
 <332e32302e2053657276696365> Tj
 ET
@@ -50402,75 +50227,75 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 507.120 220.937 23.280 re
+48.240 582.240 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 507.120 294.583 23.280 re
+269.177 582.240 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.560 220.937 37.560 re
+48.240 544.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.560 294.583 37.560 re
+269.177 544.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 432.000 220.937 37.560 re
+48.240 507.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 432.000 294.583 37.560 re
+269.177 507.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.440 220.937 37.560 re
+48.240 469.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.440 294.583 37.560 re
+269.177 469.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 356.880 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 356.880 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.320 220.937 37.560 re
+48.240 394.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.320 294.583 37.560 re
+269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 530.400 m
-269.177 530.400 l
+48.240 605.520 m
+269.177 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 530.650 m
-48.240 506.370 l
+48.240 605.770 m
+48.240 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.650 m
-269.177 506.370 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 1 w
@@ -50478,7 +50303,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 514.653 Td
+51.24 589.7729999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -50486,26 +50311,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.400 m
-563.760 530.400 l
+269.177 605.520 m
+563.760 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.650 m
-269.177 506.370 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 530.650 m
-563.760 506.370 l
+563.760 605.770 m
+563.760 581.490 l
 S
 [ ] 0 d
 1 w
@@ -50513,7 +50338,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 514.653 Td
+272.17692192000004 589.7729999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -50521,26 +50346,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -50548,19 +50373,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000001 Td
+51.24 565.9929999999999 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 551.713 Td
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 551.713 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50568,26 +50393,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -50595,7 +50420,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.7330000000001 Td
+272.17692192000004 558.853 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -50603,26 +50428,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -50630,19 +50455,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000005 Td
+51.24 528.433 Td
 /F2.0 10.5 Tf
 <7265736f7572636544657461696c73> Tj
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 514.1529999999999 Td
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 514.1529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50650,26 +50475,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -50683,7 +50508,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.17300000000006 Td
+272.17692192000004 521.2929999999999 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -50693,26 +50518,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -50720,19 +50545,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000001 Td
+51.24 490.873 Td
 /F2.0 10.5 Tf
 <7365727669636544657461696c73> Tj
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 476.59299999999996 Td
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 476.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50740,26 +50565,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -50773,7 +50598,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.6130000000001 Td
+272.17692192000004 483.733 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -50783,26 +50608,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -50810,19 +50635,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000004 Td
+51.24 453.31299999999993 Td
 /F2.0 10.5 Tf
 <7365727669636555756964> Tj
 ET
 
 
 BT
-51.24 363.913 Td
+51.24 439.0329999999999 Td
 ET
 
 
 BT
-51.24 363.913 Td
+51.24 439.0329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50830,26 +50655,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -50857,7 +50682,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05300000000005 Td
+272.17692192000004 446.17299999999994 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -50865,26 +50690,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -50892,19 +50717,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000001 Td
+51.24 415.753 Td
 /F2.0 10.5 Tf
 <76657273696f6e> Tj
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 401.47299999999996 Td
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 401.47299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50912,26 +50737,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -50939,7 +50764,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.4930000000001 Td
+272.17692192000004 408.613 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -50969,50 +50794,50 @@ Q
 
 endstream
 endobj
-342 0 obj
+343 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 341 0 R
+/Contents 342 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 675 0 R
+/XObject << /Stamp1 676 0 R
 >>
 >>
-/Annots [343 0 R 345 0 R 346 0 R]
+/Annots [344 0 R 346 0 R 347 0 R]
 >>
 endobj
-343 0 obj
+344 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
-/Rect [280.76592192000004 631.1469999999999 378.47892192000006 645.4269999999999]
+/Rect [280.76592192000004 706.267 378.47892192000006 720.547]
 /Type /Annot
 >>
 endobj
-344 0 obj
-[342 0 R /XYZ 0 570.48 null]
-endobj
 345 0 obj
+[343 0 R /XYZ 0 645.5999999999999 null]
+endobj
+346 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 443.107 325.32792192000005 457.38700000000006]
+/Rect [272.17692192000004 518.227 325.32792192000005 532.507]
 /Type /Annot
 >>
 endobj
-346 0 obj
+347 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 405.5470000000001 325.32792192000005 419.8270000000001]
+/Rect [272.17692192000004 480.667 325.32792192000005 494.947]
 /Type /Annot
 >>
 endobj
-347 0 obj
+348 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -51020,7 +50845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-348 0 obj
+349 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -51028,7 +50853,7 @@ endobj
 /Type /Annot
 >>
 endobj
-349 0 obj
+350 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -51036,7 +50861,7 @@ endobj
 /Type /Annot
 >>
 endobj
-350 0 obj
+351 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -51044,7 +50869,7 @@ endobj
 /Type /Annot
 >>
 endobj
-351 0 obj
+352 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -51052,7 +50877,7 @@ endobj
 /Type /Annot
 >>
 endobj
-352 0 obj
+353 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -51060,7 +50885,7 @@ endobj
 /Type /Annot
 >>
 endobj
-353 0 obj
+354 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -51068,7 +50893,7 @@ endobj
 /Type /Annot
 >>
 endobj
-354 0 obj
+355 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -51076,23 +50901,23 @@ endobj
 /Type /Annot
 >>
 endobj
-355 0 obj
+356 0 obj
 << /Border [0 0 0]
-/Dest (_route143)
+/Dest (_route107)
 /Subtype /Link
 /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998]
 /Type /Annot
 >>
 endobj
-356 0 obj
+357 0 obj
 << /Border [0 0 0]
-/Dest (_route143)
+/Dest (_route107)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
 >>
 endobj
-357 0 obj
+358 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -51100,7 +50925,7 @@ endobj
 /Type /Annot
 >>
 endobj
-358 0 obj
+359 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -51108,7 +50933,7 @@ endobj
 /Type /Annot
 >>
 endobj
-359 0 obj
+360 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -51116,7 +50941,7 @@ endobj
 /Type /Annot
 >>
 endobj
-360 0 obj
+361 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -51124,23 +50949,23 @@ endobj
 /Type /Annot
 >>
 endobj
-361 0 obj
+362 0 obj
 << /Border [0 0 0]
-/Dest (_route144)
+/Dest (_route108)
 /Subtype /Link
 /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998]
 /Type /Annot
 >>
 endobj
-362 0 obj
+363 0 obj
 << /Border [0 0 0]
-/Dest (_route144)
+/Dest (_route108)
 /Subtype /Link
 /Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
 /Type /Annot
 >>
 endobj
-363 0 obj
+364 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -51148,7 +50973,7 @@ endobj
 /Type /Annot
 >>
 endobj
-364 0 obj
+365 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -51156,7 +50981,7 @@ endobj
 /Type /Annot
 >>
 endobj
-365 0 obj
+366 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -51164,7 +50989,7 @@ endobj
 /Type /Annot
 >>
 endobj
-366 0 obj
+367 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -51172,23 +50997,23 @@ endobj
 /Type /Annot
 >>
 endobj
-367 0 obj
+368 0 obj
 << /Border [0 0 0]
-/Dest (_route142)
+/Dest (_route106)
 /Subtype /Link
 /Rect [60.24000000000001 510.89999999999975 212.98350000000002 525.1799999999997]
 /Type /Annot
 >>
 endobj
-368 0 obj
+369 0 obj
 << /Border [0 0 0]
-/Dest (_route142)
+/Dest (_route106)
 /Subtype /Link
 /Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
 /Type /Annot
 >>
 endobj
-369 0 obj
+370 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -51196,7 +51021,7 @@ endobj
 /Type /Annot
 >>
 endobj
-370 0 obj
+371 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -51204,7 +51029,7 @@ endobj
 /Type /Annot
 >>
 endobj
-371 0 obj
+372 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -51212,7 +51037,7 @@ endobj
 /Type /Annot
 >>
 endobj
-372 0 obj
+373 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -51220,23 +51045,23 @@ endobj
 /Type /Annot
 >>
 endobj
-373 0 obj
+374 0 obj
 << /Border [0 0 0]
-/Dest (_route127)
+/Dest (_route91)
 /Subtype /Link
 /Rect [60.24000000000001 455.4599999999997 172.716 469.73999999999967]
 /Type /Annot
 >>
 endobj
-374 0 obj
+375 0 obj
 << /Border [0 0 0]
-/Dest (_route127)
+/Dest (_route91)
 /Subtype /Link
 /Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
 /Type /Annot
 >>
 endobj
-375 0 obj
+376 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -51244,7 +51069,7 @@ endobj
 /Type /Annot
 >>
 endobj
-376 0 obj
+377 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -51252,7 +51077,7 @@ endobj
 /Type /Annot
 >>
 endobj
-377 0 obj
+378 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -51260,7 +51085,7 @@ endobj
 /Type /Annot
 >>
 endobj
-378 0 obj
+379 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -51268,23 +51093,23 @@ endobj
 /Type /Annot
 >>
 endobj
-379 0 obj
+380 0 obj
 << /Border [0 0 0]
-/Dest (_route130)
+/Dest (_route94)
 /Subtype /Link
 /Rect [60.24000000000001 400.01999999999964 172.548 414.2999999999996]
 /Type /Annot
 >>
 endobj
-380 0 obj
+381 0 obj
 << /Border [0 0 0]
-/Dest (_route130)
+/Dest (_route94)
 /Subtype /Link
 /Rect [557.8905 400.01999999999964 563.76 414.2999999999996]
 /Type /Annot
 >>
 endobj
-381 0 obj
+382 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -51292,7 +51117,7 @@ endobj
 /Type /Annot
 >>
 endobj
-382 0 obj
+383 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -51300,7 +51125,7 @@ endobj
 /Type /Annot
 >>
 endobj
-383 0 obj
+384 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -51308,7 +51133,7 @@ endobj
 /Type /Annot
 >>
 endobj
-384 0 obj
+385 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -51316,7 +51141,7 @@ endobj
 /Type /Annot
 >>
 endobj
-385 0 obj
+386 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -51324,7 +51149,7 @@ endobj
 /Type /Annot
 >>
 endobj
-386 0 obj
+387 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -51332,7 +51157,7 @@ endobj
 /Type /Annot
 >>
 endobj
-387 0 obj
+388 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -51340,7 +51165,7 @@ endobj
 /Type /Annot
 >>
 endobj
-388 0 obj
+389 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -51348,23 +51173,23 @@ endobj
 /Type /Annot
 >>
 endobj
-389 0 obj
+390 0 obj
 << /Border [0 0 0]
-/Dest (_route128)
+/Dest (_route92)
 /Subtype /Link
 /Rect [60.24000000000001 307.61999999999955 263.25750000000005 321.8999999999995]
 /Type /Annot
 >>
 endobj
-390 0 obj
+391 0 obj
 << /Border [0 0 0]
-/Dest (_route128)
+/Dest (_route92)
 /Subtype /Link
 /Rect [557.8905 307.61999999999955 563.76 321.8999999999995]
 /Type /Annot
 >>
 endobj
-391 0 obj
+392 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -51372,7 +51197,7 @@ endobj
 /Type /Annot
 >>
 endobj
-392 0 obj
+393 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -51380,7 +51205,7 @@ endobj
 /Type /Annot
 >>
 endobj
-393 0 obj
+394 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -51388,7 +51213,7 @@ endobj
 /Type /Annot
 >>
 endobj
-394 0 obj
+395 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -51396,23 +51221,23 @@ endobj
 /Type /Annot
 >>
 endobj
-395 0 obj
+396 0 obj
 << /Border [0 0 0]
-/Dest (_route129)
+/Dest (_route93)
 /Subtype /Link
 /Rect [60.24000000000001 252.17999999999947 265.76700000000005 266.45999999999947]
 /Type /Annot
 >>
 endobj
-396 0 obj
+397 0 obj
 << /Border [0 0 0]
-/Dest (_route129)
+/Dest (_route93)
 /Subtype /Link
 /Rect [557.8905 252.17999999999947 563.76 266.45999999999947]
 /Type /Annot
 >>
 endobj
-397 0 obj
+398 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -51420,7 +51245,7 @@ endobj
 /Type /Annot
 >>
 endobj
-398 0 obj
+399 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -51428,7 +51253,7 @@ endobj
 /Type /Annot
 >>
 endobj
-399 0 obj
+400 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -51436,7 +51261,7 @@ endobj
 /Type /Annot
 >>
 endobj
-400 0 obj
+401 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -51444,7 +51269,7 @@ endobj
 /Type /Annot
 >>
 endobj
-401 0 obj
+402 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -51452,7 +51277,7 @@ endobj
 /Type /Annot
 >>
 endobj
-402 0 obj
+403 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -51460,23 +51285,23 @@ endobj
 /Type /Annot
 >>
 endobj
-403 0 obj
+404 0 obj
 << /Border [0 0 0]
-/Dest (_route131)
+/Dest (_route95)
 /Subtype /Link
 /Rect [60.24000000000001 178.2599999999995 212.763 192.5399999999995]
 /Type /Annot
 >>
 endobj
-404 0 obj
+405 0 obj
 << /Border [0 0 0]
-/Dest (_route131)
+/Dest (_route95)
 /Subtype /Link
 /Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
 /Type /Annot
 >>
 endobj
-405 0 obj
+406 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -51484,7 +51309,7 @@ endobj
 /Type /Annot
 >>
 endobj
-406 0 obj
+407 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -51492,7 +51317,7 @@ endobj
 /Type /Annot
 >>
 endobj
-407 0 obj
+408 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -51500,7 +51325,7 @@ endobj
 /Type /Annot
 >>
 endobj
-408 0 obj
+409 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -51508,7 +51333,7 @@ endobj
 /Type /Annot
 >>
 endobj
-409 0 obj
+410 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -51516,7 +51341,7 @@ endobj
 /Type /Annot
 >>
 endobj
-410 0 obj
+411 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -51524,7 +51349,7 @@ endobj
 /Type /Annot
 >>
 endobj
-411 0 obj
+412 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -51532,7 +51357,7 @@ endobj
 /Type /Annot
 >>
 endobj
-412 0 obj
+413 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -51540,23 +51365,23 @@ endobj
 /Type /Annot
 >>
 endobj
-413 0 obj
+414 0 obj
 << /Border [0 0 0]
-/Dest (_route132)
+/Dest (_route96)
 /Subtype /Link
 /Rect [60.24000000000001 85.85999999999956 232.70250000000001 100.13999999999956]
 /Type /Annot
 >>
 endobj
-414 0 obj
+415 0 obj
 << /Border [0 0 0]
-/Dest (_route132)
+/Dest (_route96)
 /Subtype /Link
 /Rect [557.8905 85.85999999999956 563.76 100.13999999999956]
 /Type /Annot
 >>
 endobj
-415 0 obj
+416 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -51564,7 +51389,7 @@ endobj
 /Type /Annot
 >>
 endobj
-416 0 obj
+417 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -51572,7 +51397,7 @@ endobj
 /Type /Annot
 >>
 endobj
-417 0 obj
+418 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -51580,7 +51405,7 @@ endobj
 /Type /Annot
 >>
 endobj
-418 0 obj
+419 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -51588,7 +51413,7 @@ endobj
 /Type /Annot
 >>
 endobj
-419 0 obj
+420 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -51596,7 +51421,7 @@ endobj
 /Type /Annot
 >>
 endobj
-420 0 obj
+421 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -51604,23 +51429,23 @@ endobj
 /Type /Annot
 >>
 endobj
-421 0 obj
+422 0 obj
 << /Border [0 0 0]
-/Dest (_route133)
+/Dest (_route97)
 /Subtype /Link
 /Rect [60.24000000000001 723.2399999999999 354.36600000000004 737.52]
 /Type /Annot
 >>
 endobj
-422 0 obj
+423 0 obj
 << /Border [0 0 0]
-/Dest (_route133)
+/Dest (_route97)
 /Subtype /Link
 /Rect [557.8905 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
-423 0 obj
+424 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -51628,7 +51453,7 @@ endobj
 /Type /Annot
 >>
 endobj
-424 0 obj
+425 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -51636,7 +51461,7 @@ endobj
 /Type /Annot
 >>
 endobj
-425 0 obj
+426 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -51644,7 +51469,7 @@ endobj
 /Type /Annot
 >>
 endobj
-426 0 obj
+427 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -51652,7 +51477,7 @@ endobj
 /Type /Annot
 >>
 endobj
-427 0 obj
+428 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -51660,7 +51485,7 @@ endobj
 /Type /Annot
 >>
 endobj
-428 0 obj
+429 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -51668,23 +51493,23 @@ endobj
 /Type /Annot
 >>
 endobj
-429 0 obj
+430 0 obj
 << /Border [0 0 0]
-/Dest (_route124)
+/Dest (_route88)
 /Subtype /Link
 /Rect [60.24000000000001 649.3199999999998 531.1851796875001 663.5999999999999]
 /Type /Annot
 >>
 endobj
-430 0 obj
+431 0 obj
 << /Border [0 0 0]
-/Dest (_route124)
+/Dest (_route88)
 /Subtype /Link
 /Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
-431 0 obj
+432 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -51692,7 +51517,7 @@ endobj
 /Type /Annot
 >>
 endobj
-432 0 obj
+433 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -51700,7 +51525,7 @@ endobj
 /Type /Annot
 >>
 endobj
-433 0 obj
+434 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -51708,7 +51533,7 @@ endobj
 /Type /Annot
 >>
 endobj
-434 0 obj
+435 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -51716,7 +51541,7 @@ endobj
 /Type /Annot
 >>
 endobj
-435 0 obj
+436 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -51724,7 +51549,7 @@ endobj
 /Type /Annot
 >>
 endobj
-436 0 obj
+437 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -51732,23 +51557,23 @@ endobj
 /Type /Annot
 >>
 endobj
-437 0 obj
+438 0 obj
 << /Border [0 0 0]
-/Dest (_route126)
+/Dest (_route90)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 418.877794921875 589.6799999999998]
 /Type /Annot
 >>
 endobj
-438 0 obj
+439 0 obj
 << /Border [0 0 0]
-/Dest (_route126)
+/Dest (_route90)
 /Subtype /Link
 /Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-439 0 obj
+440 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -51756,7 +51581,7 @@ endobj
 /Type /Annot
 >>
 endobj
-440 0 obj
+441 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -51764,7 +51589,7 @@ endobj
 /Type /Annot
 >>
 endobj
-441 0 obj
+442 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -51772,7 +51597,7 @@ endobj
 /Type /Annot
 >>
 endobj
-442 0 obj
+443 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -51780,7 +51605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-443 0 obj
+444 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -51788,7 +51613,7 @@ endobj
 /Type /Annot
 >>
 endobj
-444 0 obj
+445 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -51796,7 +51621,7 @@ endobj
 /Type /Annot
 >>
 endobj
-445 0 obj
+446 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -51804,7 +51629,7 @@ endobj
 /Type /Annot
 >>
 endobj
-446 0 obj
+447 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -51812,23 +51637,23 @@ endobj
 /Type /Annot
 >>
 endobj
-447 0 obj
+448 0 obj
 << /Border [0 0 0]
-/Dest (_route122)
+/Dest (_route86)
 /Subtype /Link
 /Rect [60.24000000000001 482.9999999999998 245.15550000000002 497.27999999999975]
 /Type /Annot
 >>
 endobj
-448 0 obj
+449 0 obj
 << /Border [0 0 0]
-/Dest (_route122)
+/Dest (_route86)
 /Subtype /Link
 /Rect [557.8905 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
-449 0 obj
+450 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -51836,7 +51661,7 @@ endobj
 /Type /Annot
 >>
 endobj
-450 0 obj
+451 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -51844,7 +51669,7 @@ endobj
 /Type /Annot
 >>
 endobj
-451 0 obj
+452 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -51852,7 +51677,7 @@ endobj
 /Type /Annot
 >>
 endobj
-452 0 obj
+453 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -51860,23 +51685,23 @@ endobj
 /Type /Annot
 >>
 endobj
-453 0 obj
+454 0 obj
 << /Border [0 0 0]
-/Dest (_route115)
+/Dest (_route79)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 248.431294921875 441.8399999999997]
 /Type /Annot
 >>
 endobj
-454 0 obj
+455 0 obj
 << /Border [0 0 0]
-/Dest (_route115)
+/Dest (_route79)
 /Subtype /Link
 /Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-455 0 obj
+456 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -51884,7 +51709,7 @@ endobj
 /Type /Annot
 >>
 endobj
-456 0 obj
+457 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -51892,7 +51717,7 @@ endobj
 /Type /Annot
 >>
 endobj
-457 0 obj
+458 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -51900,7 +51725,7 @@ endobj
 /Type /Annot
 >>
 endobj
-458 0 obj
+459 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -51908,7 +51733,7 @@ endobj
 /Type /Annot
 >>
 endobj
-459 0 obj
+460 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -51916,7 +51741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-460 0 obj
+461 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -51924,23 +51749,23 @@ endobj
 /Type /Annot
 >>
 endobj
-461 0 obj
+462 0 obj
 << /Border [0 0 0]
-/Dest (_route110)
+/Dest (_route74)
 /Subtype /Link
 /Rect [60.24000000000001 353.63999999999965 214.8735 367.9199999999996]
 /Type /Annot
 >>
 endobj
-462 0 obj
+463 0 obj
 << /Border [0 0 0]
-/Dest (_route110)
+/Dest (_route74)
 /Subtype /Link
 /Rect [557.8905 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
-463 0 obj
+464 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -51948,7 +51773,7 @@ endobj
 /Type /Annot
 >>
 endobj
-464 0 obj
+465 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -51956,7 +51781,7 @@ endobj
 /Type /Annot
 >>
 endobj
-465 0 obj
+466 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -51964,7 +51789,7 @@ endobj
 /Type /Annot
 >>
 endobj
-466 0 obj
+467 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -51972,23 +51797,23 @@ endobj
 /Type /Annot
 >>
 endobj
-467 0 obj
+468 0 obj
 << /Border [0 0 0]
-/Dest (_route123)
+/Dest (_route87)
 /Subtype /Link
 /Rect [60.24000000000001 298.1999999999996 259.467 312.47999999999956]
 /Type /Annot
 >>
 endobj
-468 0 obj
+469 0 obj
 << /Border [0 0 0]
-/Dest (_route123)
+/Dest (_route87)
 /Subtype /Link
 /Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
-469 0 obj
+470 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -51996,7 +51821,7 @@ endobj
 /Type /Annot
 >>
 endobj
-470 0 obj
+471 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -52004,7 +51829,7 @@ endobj
 /Type /Annot
 >>
 endobj
-471 0 obj
+472 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -52012,7 +51837,7 @@ endobj
 /Type /Annot
 >>
 endobj
-472 0 obj
+473 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -52020,7 +51845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-473 0 obj
+474 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -52028,7 +51853,7 @@ endobj
 /Type /Annot
 >>
 endobj
-474 0 obj
+475 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -52036,23 +51861,23 @@ endobj
 /Type /Annot
 >>
 endobj
-475 0 obj
+476 0 obj
 << /Border [0 0 0]
-/Dest (_route116)
+/Dest (_route80)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 544.9515000000001 238.55999999999952]
 /Type /Annot
 >>
 endobj
-476 0 obj
+477 0 obj
 << /Border [0 0 0]
-/Dest (_route116)
+/Dest (_route80)
 /Subtype /Link
 /Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-477 0 obj
+478 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -52060,7 +51885,7 @@ endobj
 /Type /Annot
 >>
 endobj
-478 0 obj
+479 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -52068,7 +51893,7 @@ endobj
 /Type /Annot
 >>
 endobj
-479 0 obj
+480 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -52076,7 +51901,7 @@ endobj
 /Type /Annot
 >>
 endobj
-480 0 obj
+481 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -52084,7 +51909,7 @@ endobj
 /Type /Annot
 >>
 endobj
-481 0 obj
+482 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -52092,7 +51917,7 @@ endobj
 /Type /Annot
 >>
 endobj
-482 0 obj
+483 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -52100,23 +51925,23 @@ endobj
 /Type /Annot
 >>
 endobj
-483 0 obj
+484 0 obj
 << /Border [0 0 0]
-/Dest (_route117)
+/Dest (_route81)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 530.5030898437501 164.63999999999956]
 /Type /Annot
 >>
 endobj
-484 0 obj
+485 0 obj
 << /Border [0 0 0]
-/Dest (_route117)
+/Dest (_route81)
 /Subtype /Link
 /Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-485 0 obj
+486 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -52124,7 +51949,7 @@ endobj
 /Type /Annot
 >>
 endobj
-486 0 obj
+487 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -52132,7 +51957,7 @@ endobj
 /Type /Annot
 >>
 endobj
-487 0 obj
+488 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -52140,7 +51965,7 @@ endobj
 /Type /Annot
 >>
 endobj
-488 0 obj
+489 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -52148,7 +51973,7 @@ endobj
 /Type /Annot
 >>
 endobj
-489 0 obj
+490 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -52156,7 +51981,7 @@ endobj
 /Type /Annot
 >>
 endobj
-490 0 obj
+491 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -52164,39 +51989,39 @@ endobj
 /Type /Annot
 >>
 endobj
-491 0 obj
+492 0 obj
 << /Border [0 0 0]
-/Dest (_route125)
+/Dest (_route89)
 /Subtype /Link
 /Rect [60.24000000000001 76.4399999999996 106.10400000000001 90.7199999999996]
 /Type /Annot
 >>
 endobj
-492 0 obj
+493 0 obj
 << /Border [0 0 0]
-/Dest (_route125)
+/Dest (_route89)
 /Subtype /Link
 /Rect [60.24000000000001 57.959999999999596 553.6761796875 72.2399999999996]
 /Type /Annot
 >>
 endobj
-493 0 obj
+494 0 obj
 << /Border [0 0 0]
-/Dest (_route125)
+/Dest (_route89)
 /Subtype /Link
 /Rect [60.24 741.7199999999999 80.26350000000001 756.0]
 /Type /Annot
 >>
 endobj
-494 0 obj
+495 0 obj
 << /Border [0 0 0]
-/Dest (_route125)
+/Dest (_route89)
 /Subtype /Link
 /Rect [552.021 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
-495 0 obj
+496 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -52204,7 +52029,7 @@ endobj
 /Type /Annot
 >>
 endobj
-496 0 obj
+497 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -52212,7 +52037,7 @@ endobj
 /Type /Annot
 >>
 endobj
-497 0 obj
+498 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -52220,7 +52045,7 @@ endobj
 /Type /Annot
 >>
 endobj
-498 0 obj
+499 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -52228,7 +52053,7 @@ endobj
 /Type /Annot
 >>
 endobj
-499 0 obj
+500 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -52236,7 +52061,7 @@ endobj
 /Type /Annot
 >>
 endobj
-500 0 obj
+501 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -52244,23 +52069,23 @@ endobj
 /Type /Annot
 >>
 endobj
-501 0 obj
+502 0 obj
 << /Border [0 0 0]
-/Dest (_route120)
+/Dest (_route84)
 /Subtype /Link
 /Rect [60.24000000000001 667.7999999999998 248.45250000000001 682.0799999999999]
 /Type /Annot
 >>
 endobj
-502 0 obj
+503 0 obj
 << /Border [0 0 0]
-/Dest (_route120)
+/Dest (_route84)
 /Subtype /Link
 /Rect [552.021 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
-503 0 obj
+504 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -52268,7 +52093,7 @@ endobj
 /Type /Annot
 >>
 endobj
-504 0 obj
+505 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -52276,7 +52101,7 @@ endobj
 /Type /Annot
 >>
 endobj
-505 0 obj
+506 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -52284,7 +52109,7 @@ endobj
 /Type /Annot
 >>
 endobj
-506 0 obj
+507 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -52292,7 +52117,7 @@ endobj
 /Type /Annot
 >>
 endobj
-507 0 obj
+508 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -52300,7 +52125,7 @@ endobj
 /Type /Annot
 >>
 endobj
-508 0 obj
+509 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -52308,23 +52133,23 @@ endobj
 /Type /Annot
 >>
 endobj
-509 0 obj
+510 0 obj
 << /Border [0 0 0]
-/Dest (_route119)
+/Dest (_route83)
 /Subtype /Link
 /Rect [60.24000000000001 593.8799999999998 235.842 608.1599999999999]
 /Type /Annot
 >>
 endobj
-510 0 obj
+511 0 obj
 << /Border [0 0 0]
-/Dest (_route119)
+/Dest (_route83)
 /Subtype /Link
 /Rect [552.021 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
 >>
 endobj
-511 0 obj
+512 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -52332,7 +52157,7 @@ endobj
 /Type /Annot
 >>
 endobj
-512 0 obj
+513 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -52340,7 +52165,7 @@ endobj
 /Type /Annot
 >>
 endobj
-513 0 obj
+514 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -52348,7 +52173,7 @@ endobj
 /Type /Annot
 >>
 endobj
-514 0 obj
+515 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -52356,7 +52181,7 @@ endobj
 /Type /Annot
 >>
 endobj
-515 0 obj
+516 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -52364,7 +52189,7 @@ endobj
 /Type /Annot
 >>
 endobj
-516 0 obj
+517 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -52372,23 +52197,23 @@ endobj
 /Type /Annot
 >>
 endobj
-517 0 obj
+518 0 obj
 << /Border [0 0 0]
-/Dest (_route121)
+/Dest (_route85)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 249.70200000000003 534.2399999999998]
 /Type /Annot
 >>
 endobj
-518 0 obj
+519 0 obj
 << /Border [0 0 0]
-/Dest (_route121)
+/Dest (_route85)
 /Subtype /Link
 /Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-519 0 obj
+520 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -52396,7 +52221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-520 0 obj
+521 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -52404,7 +52229,7 @@ endobj
 /Type /Annot
 >>
 endobj
-521 0 obj
+522 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -52412,7 +52237,7 @@ endobj
 /Type /Annot
 >>
 endobj
-522 0 obj
+523 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -52420,7 +52245,7 @@ endobj
 /Type /Annot
 >>
 endobj
-523 0 obj
+524 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -52428,7 +52253,7 @@ endobj
 /Type /Annot
 >>
 endobj
-524 0 obj
+525 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -52436,23 +52261,23 @@ endobj
 /Type /Annot
 >>
 endobj
-525 0 obj
+526 0 obj
 << /Border [0 0 0]
-/Dest (_route118)
+/Dest (_route82)
 /Subtype /Link
 /Rect [60.24000000000001 446.03999999999974 261.860794921875 460.3199999999997]
 /Type /Annot
 >>
 endobj
-526 0 obj
+527 0 obj
 << /Border [0 0 0]
-/Dest (_route118)
+/Dest (_route82)
 /Subtype /Link
 /Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-527 0 obj
+528 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -52460,7 +52285,7 @@ endobj
 /Type /Annot
 >>
 endobj
-528 0 obj
+529 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -52468,7 +52293,7 @@ endobj
 /Type /Annot
 >>
 endobj
-529 0 obj
+530 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -52476,7 +52301,7 @@ endobj
 /Type /Annot
 >>
 endobj
-530 0 obj
+531 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -52484,7 +52309,7 @@ endobj
 /Type /Annot
 >>
 endobj
-531 0 obj
+532 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -52492,7 +52317,7 @@ endobj
 /Type /Annot
 >>
 endobj
-532 0 obj
+533 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -52500,23 +52325,23 @@ endobj
 /Type /Annot
 >>
 endobj
-533 0 obj
+534 0 obj
 << /Border [0 0 0]
-/Dest (_route112)
+/Dest (_route76)
 /Subtype /Link
 /Rect [60.24000000000001 372.11999999999966 339.560794921875 386.39999999999964]
 /Type /Annot
 >>
 endobj
-534 0 obj
+535 0 obj
 << /Border [0 0 0]
-/Dest (_route112)
+/Dest (_route76)
 /Subtype /Link
 /Rect [552.021 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-535 0 obj
+536 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -52524,7 +52349,7 @@ endobj
 /Type /Annot
 >>
 endobj
-536 0 obj
+537 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -52532,7 +52357,7 @@ endobj
 /Type /Annot
 >>
 endobj
-537 0 obj
+538 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -52540,7 +52365,7 @@ endobj
 /Type /Annot
 >>
 endobj
-538 0 obj
+539 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -52548,7 +52373,7 @@ endobj
 /Type /Annot
 >>
 endobj
-539 0 obj
+540 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -52556,7 +52381,7 @@ endobj
 /Type /Annot
 >>
 endobj
-540 0 obj
+541 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -52564,7 +52389,7 @@ endobj
 /Type /Annot
 >>
 endobj
-541 0 obj
+542 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -52572,7 +52397,7 @@ endobj
 /Type /Annot
 >>
 endobj
-542 0 obj
+543 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -52580,23 +52405,23 @@ endobj
 /Type /Annot
 >>
 endobj
-543 0 obj
+544 0 obj
 << /Border [0 0 0]
-/Dest (_route114)
+/Dest (_route78)
 /Subtype /Link
 /Rect [60.24000000000001 279.7199999999996 350.38629492187505 293.99999999999955]
 /Type /Annot
 >>
 endobj
-544 0 obj
+545 0 obj
 << /Border [0 0 0]
-/Dest (_route114)
+/Dest (_route78)
 /Subtype /Link
 /Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
-545 0 obj
+546 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -52604,7 +52429,7 @@ endobj
 /Type /Annot
 >>
 endobj
-546 0 obj
+547 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -52612,7 +52437,7 @@ endobj
 /Type /Annot
 >>
 endobj
-547 0 obj
+548 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -52620,7 +52445,7 @@ endobj
 /Type /Annot
 >>
 endobj
-548 0 obj
+549 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -52628,7 +52453,7 @@ endobj
 /Type /Annot
 >>
 endobj
-549 0 obj
+550 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -52636,7 +52461,7 @@ endobj
 /Type /Annot
 >>
 endobj
-550 0 obj
+551 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -52644,7 +52469,7 @@ endobj
 /Type /Annot
 >>
 endobj
-551 0 obj
+552 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -52652,7 +52477,7 @@ endobj
 /Type /Annot
 >>
 endobj
-552 0 obj
+553 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -52660,23 +52485,23 @@ endobj
 /Type /Annot
 >>
 endobj
-553 0 obj
+554 0 obj
 << /Border [0 0 0]
-/Dest (_route113)
+/Dest (_route77)
 /Subtype /Link
 /Rect [60.24000000000001 187.31999999999954 352.81158984375 201.59999999999954]
 /Type /Annot
 >>
 endobj
-554 0 obj
+555 0 obj
 << /Border [0 0 0]
-/Dest (_route113)
+/Dest (_route77)
 /Subtype /Link
 /Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
-555 0 obj
+556 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -52684,7 +52509,7 @@ endobj
 /Type /Annot
 >>
 endobj
-556 0 obj
+557 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -52692,7 +52517,7 @@ endobj
 /Type /Annot
 >>
 endobj
-557 0 obj
+558 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -52700,7 +52525,7 @@ endobj
 /Type /Annot
 >>
 endobj
-558 0 obj
+559 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -52708,7 +52533,7 @@ endobj
 /Type /Annot
 >>
 endobj
-559 0 obj
+560 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -52716,7 +52541,7 @@ endobj
 /Type /Annot
 >>
 endobj
-560 0 obj
+561 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -52724,7 +52549,7 @@ endobj
 /Type /Annot
 >>
 endobj
-561 0 obj
+562 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -52732,7 +52557,7 @@ endobj
 /Type /Annot
 >>
 endobj
-562 0 obj
+563 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -52740,23 +52565,23 @@ endobj
 /Type /Annot
 >>
 endobj
-563 0 obj
+564 0 obj
 << /Border [0 0 0]
-/Dest (_route111)
+/Dest (_route75)
 /Subtype /Link
 /Rect [60.24000000000001 94.91999999999959 212.0595 109.19999999999959]
 /Type /Annot
 >>
 endobj
-564 0 obj
+565 0 obj
 << /Border [0 0 0]
-/Dest (_route111)
+/Dest (_route75)
 /Subtype /Link
 /Rect [552.021 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
-565 0 obj
+566 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -52764,7 +52589,7 @@ endobj
 /Type /Annot
 >>
 endobj
-566 0 obj
+567 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -52772,7 +52597,7 @@ endobj
 /Type /Annot
 >>
 endobj
-567 0 obj
+568 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -52780,7 +52605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-568 0 obj
+569 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -52788,7 +52613,7 @@ endobj
 /Type /Annot
 >>
 endobj
-569 0 obj
+570 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -52796,7 +52621,7 @@ endobj
 /Type /Annot
 >>
 endobj
-570 0 obj
+571 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -52804,23 +52629,23 @@ endobj
 /Type /Annot
 >>
 endobj
-571 0 obj
+572 0 obj
 << /Border [0 0 0]
-/Dest (_route137)
+/Dest (_route101)
 /Subtype /Link
 /Rect [60.24000000000001 723.2399999999999 226.68805078125 737.52]
 /Type /Annot
 >>
 endobj
-572 0 obj
+573 0 obj
 << /Border [0 0 0]
-/Dest (_route137)
+/Dest (_route101)
 /Subtype /Link
 /Rect [552.021 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
-573 0 obj
+574 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -52828,7 +52653,7 @@ endobj
 /Type /Annot
 >>
 endobj
-574 0 obj
+575 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -52836,7 +52661,7 @@ endobj
 /Type /Annot
 >>
 endobj
-575 0 obj
+576 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -52844,7 +52669,7 @@ endobj
 /Type /Annot
 >>
 endobj
-576 0 obj
+577 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -52852,7 +52677,7 @@ endobj
 /Type /Annot
 >>
 endobj
-577 0 obj
+578 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_7)
 /Subtype /Link
@@ -52860,7 +52685,7 @@ endobj
 /Type /Annot
 >>
 endobj
-578 0 obj
+579 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_7)
 /Subtype /Link
@@ -52868,7 +52693,7 @@ endobj
 /Type /Annot
 >>
 endobj
-579 0 obj
+580 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -52876,7 +52701,7 @@ endobj
 /Type /Annot
 >>
 endobj
-580 0 obj
+581 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -52884,23 +52709,23 @@ endobj
 /Type /Annot
 >>
 endobj
-581 0 obj
+582 0 obj
 << /Border [0 0 0]
-/Dest (_route134)
+/Dest (_route98)
 /Subtype /Link
 /Rect [60.24000000000001 630.8399999999998 221.091755859375 645.1199999999999]
 /Type /Annot
 >>
 endobj
-582 0 obj
+583 0 obj
 << /Border [0 0 0]
-/Dest (_route134)
+/Dest (_route98)
 /Subtype /Link
 /Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
-583 0 obj
+584 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -52908,7 +52733,7 @@ endobj
 /Type /Annot
 >>
 endobj
-584 0 obj
+585 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -52916,7 +52741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-585 0 obj
+586 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -52924,7 +52749,7 @@ endobj
 /Type /Annot
 >>
 endobj
-586 0 obj
+587 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -52932,23 +52757,23 @@ endobj
 /Type /Annot
 >>
 endobj
-587 0 obj
+588 0 obj
 << /Border [0 0 0]
-/Dest (_route136)
+/Dest (_route100)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 458.24414062500006 589.6799999999998]
 /Type /Annot
 >>
 endobj
-588 0 obj
+589 0 obj
 << /Border [0 0 0]
-/Dest (_route136)
+/Dest (_route100)
 /Subtype /Link
 /Rect [552.021 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-589 0 obj
+590 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_23)
 /Subtype /Link
@@ -52956,7 +52781,7 @@ endobj
 /Type /Annot
 >>
 endobj
-590 0 obj
+591 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_23)
 /Subtype /Link
@@ -52964,7 +52789,7 @@ endobj
 /Type /Annot
 >>
 endobj
-591 0 obj
+592 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -52972,7 +52797,7 @@ endobj
 /Type /Annot
 >>
 endobj
-592 0 obj
+593 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -52980,7 +52805,7 @@ endobj
 /Type /Annot
 >>
 endobj
-593 0 obj
+594 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -52988,7 +52813,7 @@ endobj
 /Type /Annot
 >>
 endobj
-594 0 obj
+595 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -52996,23 +52821,23 @@ endobj
 /Type /Annot
 >>
 endobj
-595 0 obj
+596 0 obj
 << /Border [0 0 0]
-/Dest (_route135)
+/Dest (_route99)
 /Subtype /Link
 /Rect [60.24000000000001 501.4799999999998 430.23014062500005 515.7599999999998]
 /Type /Annot
 >>
 endobj
-596 0 obj
+597 0 obj
 << /Border [0 0 0]
-/Dest (_route135)
+/Dest (_route99)
 /Subtype /Link
 /Rect [552.021 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
-597 0 obj
+598 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_24)
 /Subtype /Link
@@ -53020,7 +52845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-598 0 obj
+599 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_24)
 /Subtype /Link
@@ -53028,7 +52853,7 @@ endobj
 /Type /Annot
 >>
 endobj
-599 0 obj
+600 0 obj
 << /Border [0 0 0]
 /Dest (_responses_31)
 /Subtype /Link
@@ -53036,7 +52861,7 @@ endobj
 /Type /Annot
 >>
 endobj
-600 0 obj
+601 0 obj
 << /Border [0 0 0]
 /Dest (_responses_31)
 /Subtype /Link
@@ -53044,7 +52869,7 @@ endobj
 /Type /Annot
 >>
 endobj
-601 0 obj
+602 0 obj
 << /Border [0 0 0]
 /Dest (_produces_30)
 /Subtype /Link
@@ -53052,7 +52877,7 @@ endobj
 /Type /Annot
 >>
 endobj
-602 0 obj
+603 0 obj
 << /Border [0 0 0]
 /Dest (_produces_30)
 /Subtype /Link
@@ -53060,23 +52885,23 @@ endobj
 /Type /Annot
 >>
 endobj
-603 0 obj
+604 0 obj
 << /Border [0 0 0]
-/Dest (_route138)
+/Dest (_route102)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 430.06214062500004 441.8399999999997]
 /Type /Annot
 >>
 endobj
-604 0 obj
+605 0 obj
 << /Border [0 0 0]
-/Dest (_route138)
+/Dest (_route102)
 /Subtype /Link
 /Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-605 0 obj
+606 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_25)
 /Subtype /Link
@@ -53084,7 +52909,7 @@ endobj
 /Type /Annot
 >>
 endobj
-606 0 obj
+607 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_25)
 /Subtype /Link
@@ -53092,7 +52917,7 @@ endobj
 /Type /Annot
 >>
 endobj
-607 0 obj
+608 0 obj
 << /Border [0 0 0]
 /Dest (_responses_32)
 /Subtype /Link
@@ -53100,7 +52925,7 @@ endobj
 /Type /Annot
 >>
 endobj
-608 0 obj
+609 0 obj
 << /Border [0 0 0]
 /Dest (_responses_32)
 /Subtype /Link
@@ -53108,7 +52933,7 @@ endobj
 /Type /Annot
 >>
 endobj
-609 0 obj
+610 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_8)
 /Subtype /Link
@@ -53116,7 +52941,7 @@ endobj
 /Type /Annot
 >>
 endobj
-610 0 obj
+611 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_8)
 /Subtype /Link
@@ -53124,7 +52949,7 @@ endobj
 /Type /Annot
 >>
 endobj
-611 0 obj
+612 0 obj
 << /Border [0 0 0]
 /Dest (_produces_31)
 /Subtype /Link
@@ -53132,7 +52957,7 @@ endobj
 /Type /Annot
 >>
 endobj
-612 0 obj
+613 0 obj
 << /Border [0 0 0]
 /Dest (_produces_31)
 /Subtype /Link
@@ -53140,23 +52965,23 @@ endobj
 /Type /Annot
 >>
 endobj
-613 0 obj
+614 0 obj
 << /Border [0 0 0]
-/Dest (_route139)
+/Dest (_route103)
 /Subtype /Link
 /Rect [60.24000000000001 335.1599999999996 175.8555 349.4399999999996]
 /Type /Annot
 >>
 endobj
-614 0 obj
+615 0 obj
 << /Border [0 0 0]
-/Dest (_route139)
+/Dest (_route103)
 /Subtype /Link
 /Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
-615 0 obj
+616 0 obj
 << /Border [0 0 0]
 /Dest (_responses_33)
 /Subtype /Link
@@ -53164,7 +52989,7 @@ endobj
 /Type /Annot
 >>
 endobj
-616 0 obj
+617 0 obj
 << /Border [0 0 0]
 /Dest (_responses_33)
 /Subtype /Link
@@ -53172,7 +52997,7 @@ endobj
 /Type /Annot
 >>
 endobj
-617 0 obj
+618 0 obj
 << /Border [0 0 0]
 /Dest (_produces_32)
 /Subtype /Link
@@ -53180,7 +53005,7 @@ endobj
 /Type /Annot
 >>
 endobj
-618 0 obj
+619 0 obj
 << /Border [0 0 0]
 /Dest (_produces_32)
 /Subtype /Link
@@ -53188,23 +53013,23 @@ endobj
 /Type /Annot
 >>
 endobj
-619 0 obj
+620 0 obj
 << /Border [0 0 0]
-/Dest (_route141)
+/Dest (_route105)
 /Subtype /Link
 /Rect [60.24000000000001 279.7199999999996 211.818 293.99999999999955]
 /Type /Annot
 >>
 endobj
-620 0 obj
+621 0 obj
 << /Border [0 0 0]
-/Dest (_route141)
+/Dest (_route105)
 /Subtype /Link
 /Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
-621 0 obj
+622 0 obj
 << /Border [0 0 0]
 /Dest (_responses_34)
 /Subtype /Link
@@ -53212,7 +53037,7 @@ endobj
 /Type /Annot
 >>
 endobj
-622 0 obj
+623 0 obj
 << /Border [0 0 0]
 /Dest (_responses_34)
 /Subtype /Link
@@ -53220,7 +53045,7 @@ endobj
 /Type /Annot
 >>
 endobj
-623 0 obj
+624 0 obj
 << /Border [0 0 0]
 /Dest (_produces_33)
 /Subtype /Link
@@ -53228,7 +53053,7 @@ endobj
 /Type /Annot
 >>
 endobj
-624 0 obj
+625 0 obj
 << /Border [0 0 0]
 /Dest (_produces_33)
 /Subtype /Link
@@ -53236,23 +53061,23 @@ endobj
 /Type /Annot
 >>
 endobj
-625 0 obj
+626 0 obj
 << /Border [0 0 0]
-/Dest (_route140)
+/Dest (_route104)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 261.44100000000003 238.55999999999952]
 /Type /Annot
 >>
 endobj
-626 0 obj
+627 0 obj
 << /Border [0 0 0]
-/Dest (_route140)
+/Dest (_route104)
 /Subtype /Link
 /Rect [552.021 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-627 0 obj
+628 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_26)
 /Subtype /Link
@@ -53260,7 +53085,7 @@ endobj
 /Type /Annot
 >>
 endobj
-628 0 obj
+629 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_26)
 /Subtype /Link
@@ -53268,7 +53093,7 @@ endobj
 /Type /Annot
 >>
 endobj
-629 0 obj
+630 0 obj
 << /Border [0 0 0]
 /Dest (_responses_35)
 /Subtype /Link
@@ -53276,7 +53101,7 @@ endobj
 /Type /Annot
 >>
 endobj
-630 0 obj
+631 0 obj
 << /Border [0 0 0]
 /Dest (_responses_35)
 /Subtype /Link
@@ -53284,7 +53109,7 @@ endobj
 /Type /Annot
 >>
 endobj
-631 0 obj
+632 0 obj
 << /Border [0 0 0]
 /Dest (_produces_34)
 /Subtype /Link
@@ -53292,7 +53117,7 @@ endobj
 /Type /Annot
 >>
 endobj
-632 0 obj
+633 0 obj
 << /Border [0 0 0]
 /Dest (_produces_34)
 /Subtype /Link
@@ -53300,7 +53125,7 @@ endobj
 /Type /Annot
 >>
 endobj
-633 0 obj
+634 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -53308,7 +53133,7 @@ endobj
 /Type /Annot
 >>
 endobj
-634 0 obj
+635 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -53316,7 +53141,7 @@ endobj
 /Type /Annot
 >>
 endobj
-635 0 obj
+636 0 obj
 << /Border [0 0 0]
 /Dest (_clampinformation)
 /Subtype /Link
@@ -53324,7 +53149,7 @@ endobj
 /Type /Annot
 >>
 endobj
-636 0 obj
+637 0 obj
 << /Border [0 0 0]
 /Dest (_clampinformation)
 /Subtype /Link
@@ -53332,7 +53157,7 @@ endobj
 /Type /Annot
 >>
 endobj
-637 0 obj
+638 0 obj
 << /Border [0 0 0]
 /Dest (_cldshealthcheck)
 /Subtype /Link
@@ -53340,7 +53165,7 @@ endobj
 /Type /Annot
 >>
 endobj
-638 0 obj
+639 0 obj
 << /Border [0 0 0]
 /Dest (_cldshealthcheck)
 /Subtype /Link
@@ -53348,7 +53173,7 @@ endobj
 /Type /Annot
 >>
 endobj
-639 0 obj
+640 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -53356,7 +53181,7 @@ endobj
 /Type /Annot
 >>
 endobj
-640 0 obj
+641 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -53364,7 +53189,7 @@ endobj
 /Type /Annot
 >>
 endobj
-641 0 obj
+642 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -53372,7 +53197,7 @@ endobj
 /Type /Annot
 >>
 endobj
-642 0 obj
+643 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -53380,7 +53205,7 @@ endobj
 /Type /Annot
 >>
 endobj
-643 0 obj
+644 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -53388,7 +53213,7 @@ endobj
 /Type /Annot
 >>
 endobj
-644 0 obj
+645 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -53396,7 +53221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-645 0 obj
+646 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -53404,7 +53229,7 @@ endobj
 /Type /Annot
 >>
 endobj
-646 0 obj
+647 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -53412,7 +53237,7 @@ endobj
 /Type /Annot
 >>
 endobj
-647 0 obj
+648 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -53420,7 +53245,7 @@ endobj
 /Type /Annot
 >>
 endobj
-648 0 obj
+649 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -53428,7 +53253,7 @@ endobj
 /Type /Annot
 >>
 endobj
-649 0 obj
+650 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -53436,7 +53261,7 @@ endobj
 /Type /Annot
 >>
 endobj
-650 0 obj
+651 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -53444,7 +53269,7 @@ endobj
 /Type /Annot
 >>
 endobj
-651 0 obj
+652 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -53452,7 +53277,7 @@ endobj
 /Type /Annot
 >>
 endobj
-652 0 obj
+653 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -53460,7 +53285,7 @@ endobj
 /Type /Annot
 >>
 endobj
-653 0 obj
+654 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -53468,7 +53293,7 @@ endobj
 /Type /Annot
 >>
 endobj
-654 0 obj
+655 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -53476,7 +53301,7 @@ endobj
 /Type /Annot
 >>
 endobj
-655 0 obj
+656 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -53484,7 +53309,7 @@ endobj
 /Type /Annot
 >>
 endobj
-656 0 obj
+657 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -53492,7 +53317,7 @@ endobj
 /Type /Annot
 >>
 endobj
-657 0 obj
+658 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -53500,7 +53325,7 @@ endobj
 /Type /Annot
 >>
 endobj
-658 0 obj
+659 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -53508,7 +53333,7 @@ endobj
 /Type /Annot
 >>
 endobj
-659 0 obj
+660 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -53516,7 +53341,7 @@ endobj
 /Type /Annot
 >>
 endobj
-660 0 obj
+661 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -53524,7 +53349,7 @@ endobj
 /Type /Annot
 >>
 endobj
-661 0 obj
+662 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -53532,7 +53357,7 @@ endobj
 /Type /Annot
 >>
 endobj
-662 0 obj
+663 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -53540,7 +53365,7 @@ endobj
 /Type /Annot
 >>
 endobj
-663 0 obj
+664 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -53548,7 +53373,7 @@ endobj
 /Type /Annot
 >>
 endobj
-664 0 obj
+665 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -53556,7 +53381,7 @@ endobj
 /Type /Annot
 >>
 endobj
-665 0 obj
+666 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -53564,7 +53389,7 @@ endobj
 /Type /Annot
 >>
 endobj
-666 0 obj
+667 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -53572,7 +53397,7 @@ endobj
 /Type /Annot
 >>
 endobj
-667 0 obj
+668 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -53580,7 +53405,7 @@ endobj
 /Type /Annot
 >>
 endobj
-668 0 obj
+669 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -53588,7 +53413,7 @@ endobj
 /Type /Annot
 >>
 endobj
-669 0 obj
+670 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -53596,7 +53421,7 @@ endobj
 /Type /Annot
 >>
 endobj
-670 0 obj
+671 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -53604,7 +53429,7 @@ endobj
 /Type /Annot
 >>
 endobj
-671 0 obj
+672 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -53612,7 +53437,7 @@ endobj
 /Type /Annot
 >>
 endobj
-672 0 obj
+673 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -53620,7 +53445,7 @@ endobj
 /Type /Annot
 >>
 endobj
-673 0 obj
+674 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -53628,7 +53453,7 @@ endobj
 /Type /Annot
 >>
 endobj
-674 0 obj
+675 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -53636,7 +53461,7 @@ endobj
 /Type /Annot
 >>
 endobj
-675 0 obj
+676 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 612.0 792.0]
@@ -53664,1497 +53489,1497 @@ Q
 
 endstream
 endobj
-676 0 obj
+677 0 obj
 << /Type /Outlines
 /Count 165
-/First 677 0 R
-/Last 821 0 R
+/First 678 0 R
+/Last 822 0 R
 >>
 endobj
-677 0 obj
+678 0 obj
 << /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
-/Parent 676 0 R
+/Parent 677 0 R
 /Count 0
-/Next 678 0 R
+/Next 679 0 R
 /Dest [7 0 R /XYZ 0 792.0 null]
 >>
 endobj
-678 0 obj
+679 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 676 0 R
+/Parent 677 0 R
 /Count 0
-/Next 679 0 R
-/Prev 677 0 R
+/Next 680 0 R
+/Prev 678 0 R
 /Dest [10 0 R /XYZ 0 792.0 null]
 >>
 endobj
-679 0 obj
+680 0 obj
 << /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
-/Parent 676 0 R
+/Parent 677 0 R
 /Count 2
-/First 680 0 R
-/Last 681 0 R
-/Next 682 0 R
-/Prev 678 0 R
+/First 681 0 R
+/Last 682 0 R
+/Next 683 0 R
+/Prev 679 0 R
 /Dest [20 0 R /XYZ 0 792.0 null]
 >>
 endobj
-680 0 obj
+681 0 obj
 << /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
-/Parent 679 0 R
+/Parent 680 0 R
 /Count 0
-/Next 681 0 R
+/Next 682 0 R
 /Dest [20 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-681 0 obj
+682 0 obj
 << /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
-/Parent 679 0 R
+/Parent 680 0 R
 /Count 0
-/Prev 680 0 R
+/Prev 681 0 R
 /Dest [20 0 R /XYZ 0 644.22 null]
 >>
 endobj
-682 0 obj
+683 0 obj
 << /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
-/Parent 676 0 R
+/Parent 677 0 R
 /Count 138
-/First 683 0 R
-/Last 817 0 R
-/Next 821 0 R
-/Prev 679 0 R
+/First 684 0 R
+/Last 818 0 R
+/Next 822 0 R
+/Prev 680 0 R
 /Dest [29 0 R /XYZ 0 792.0 null]
 >>
 endobj
-683 0 obj
+684 0 obj
 << /Title <feff0032002e0031002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 684 0 R
-/Last 685 0 R
-/Next 686 0 R
+/First 685 0 R
+/Last 686 0 R
+/Next 687 0 R
 /Dest [29 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-684 0 obj
+685 0 obj
 << /Title <feff0032002e0031002e0031002e00200052006500730070006f006e007300650073>
-/Parent 683 0 R
+/Parent 684 0 R
 /Count 0
-/Next 685 0 R
+/Next 686 0 R
 /Dest [29 0 R /XYZ 0 672.0 null]
 >>
 endobj
-685 0 obj
+686 0 obj
 << /Title <feff0032002e0031002e0032002e002000500072006f00640075006300650073>
-/Parent 683 0 R
+/Parent 684 0 R
 /Count 0
-/Prev 684 0 R
+/Prev 685 0 R
 /Dest [29 0 R /XYZ 0 566.8800000000001 null]
 >>
 endobj
-686 0 obj
+687 0 obj
 << /Title <feff0032002e0032002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 687 0 R
-/Last 688 0 R
-/Next 689 0 R
-/Prev 683 0 R
+/First 688 0 R
+/Last 689 0 R
+/Next 690 0 R
+/Prev 684 0 R
 /Dest [29 0 R /XYZ 0 510.60000000000025 null]
 >>
 endobj
-687 0 obj
+688 0 obj
 << /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 686 0 R
+/Parent 687 0 R
 /Count 0
-/Next 688 0 R
+/Next 689 0 R
 /Dest [29 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-688 0 obj
+689 0 obj
 << /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
-/Parent 686 0 R
+/Parent 687 0 R
 /Count 0
-/Prev 687 0 R
+/Prev 688 0 R
 /Dest [29 0 R /XYZ 0 379.6800000000002 null]
 >>
 endobj
-689 0 obj
+690 0 obj
 << /Title <feff0032002e0033002e00200047004500540020002f00760032002f0063006c0061006d00700049006e0066006f0072006d006100740069006f006e>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 690 0 R
-/Last 691 0 R
-/Next 692 0 R
-/Prev 686 0 R
+/First 691 0 R
+/Last 692 0 R
+/Next 693 0 R
+/Prev 687 0 R
 /Dest [29 0 R /XYZ 0 323.40000000000015 null]
 >>
 endobj
-690 0 obj
+691 0 obj
 << /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 689 0 R
+/Parent 690 0 R
 /Count 0
-/Next 691 0 R
+/Next 692 0 R
 /Dest [29 0 R /XYZ 0 283.3200000000001 null]
 >>
 endobj
-691 0 obj
+692 0 obj
 << /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
-/Parent 689 0 R
+/Parent 690 0 R
 /Count 0
-/Prev 690 0 R
+/Prev 691 0 R
 /Dest [29 0 R /XYZ 0 178.2000000000001 null]
 >>
 endobj
-692 0 obj
+693 0 obj
 << /Title <feff0032002e0034002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 693 0 R
-/Last 694 0 R
-/Next 695 0 R
-/Prev 689 0 R
+/First 694 0 R
+/Last 695 0 R
+/Next 696 0 R
+/Prev 690 0 R
 /Dest [29 0 R /XYZ 0 121.92000000000007 null]
 >>
 endobj
-693 0 obj
+694 0 obj
 << /Title <feff0032002e0034002e0031002e00200052006500730070006f006e007300650073>
-/Parent 692 0 R
+/Parent 693 0 R
 /Count 0
-/Next 694 0 R
+/Next 695 0 R
 /Dest [45 0 R /XYZ 0 792.0 null]
 >>
 endobj
-694 0 obj
+695 0 obj
 << /Title <feff0032002e0034002e0032002e002000500072006f00640075006300650073>
-/Parent 692 0 R
+/Parent 693 0 R
 /Count 0
-/Prev 693 0 R
+/Prev 694 0 R
 /Dest [45 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-695 0 obj
+696 0 obj
 << /Title <feff0032002e0035002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 4
-/First 696 0 R
-/Last 699 0 R
-/Next 700 0 R
-/Prev 692 0 R
+/First 697 0 R
+/Last 700 0 R
+/Next 701 0 R
+/Prev 693 0 R
 /Dest [45 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-696 0 obj
+697 0 obj
 << /Title <feff0032002e0035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 695 0 R
+/Parent 696 0 R
 /Count 0
-/Next 697 0 R
+/Next 698 0 R
 /Dest [45 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-697 0 obj
+698 0 obj
 << /Title <feff0032002e0035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 695 0 R
+/Parent 696 0 R
 /Count 0
-/Next 698 0 R
-/Prev 696 0 R
+/Next 699 0 R
+/Prev 697 0 R
 /Dest [45 0 R /XYZ 0 451.8000000000006 null]
 >>
 endobj
-698 0 obj
+699 0 obj
 << /Title <feff0032002e0035002e0033002e00200043006f006e00730075006d00650073>
-/Parent 695 0 R
+/Parent 696 0 R
 /Count 0
-/Next 699 0 R
-/Prev 697 0 R
+/Next 700 0 R
+/Prev 698 0 R
 /Dest [45 0 R /XYZ 0 346.6800000000005 null]
 >>
 endobj
-699 0 obj
+700 0 obj
 << /Title <feff0032002e0035002e0034002e002000500072006f00640075006300650073>
-/Parent 695 0 R
+/Parent 696 0 R
 /Count 0
-/Prev 698 0 R
+/Prev 699 0 R
 /Dest [45 0 R /XYZ 0 290.4000000000005 null]
 >>
 endobj
-700 0 obj
+701 0 obj
 << /Title <feff0032002e0036002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007300650063006f006e0064006100720079002f006e0061006d00650073>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 701 0 R
-/Last 702 0 R
-/Next 703 0 R
-/Prev 695 0 R
+/First 702 0 R
+/Last 703 0 R
+/Next 704 0 R
+/Prev 696 0 R
 /Dest [45 0 R /XYZ 0 234.12000000000046 null]
 >>
 endobj
-701 0 obj
+702 0 obj
 << /Title <feff0032002e0036002e0031002e00200052006500730070006f006e007300650073>
-/Parent 700 0 R
+/Parent 701 0 R
 /Count 0
-/Next 702 0 R
+/Next 703 0 R
 /Dest [45 0 R /XYZ 0 194.04000000000045 null]
 >>
 endobj
-702 0 obj
+703 0 obj
 << /Title <feff0032002e0036002e0032002e002000500072006f00640075006300650073>
-/Parent 700 0 R
+/Parent 701 0 R
 /Count 0
-/Prev 701 0 R
+/Prev 702 0 R
 /Dest [61 0 R /XYZ 0 792.0 null]
 >>
 endobj
-703 0 obj
+704 0 obj
 << /Title <feff0032002e0037002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 704 0 R
-/Last 706 0 R
-/Next 707 0 R
-/Prev 700 0 R
+/First 705 0 R
+/Last 707 0 R
+/Next 708 0 R
+/Prev 701 0 R
 /Dest [61 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-704 0 obj
+705 0 obj
 << /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 703 0 R
+/Parent 704 0 R
 /Count 0
-/Next 705 0 R
+/Next 706 0 R
 /Dest [61 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-705 0 obj
+706 0 obj
 << /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 703 0 R
+/Parent 704 0 R
 /Count 0
-/Next 706 0 R
-/Prev 704 0 R
+/Next 707 0 R
+/Prev 705 0 R
 /Dest [61 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-706 0 obj
+707 0 obj
 << /Title <feff0032002e0037002e0033002e002000500072006f00640075006300650073>
-/Parent 703 0 R
+/Parent 704 0 R
 /Count 0
-/Prev 705 0 R
+/Prev 706 0 R
 /Dest [61 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
-707 0 obj
+708 0 obj
 << /Title <feff0032002e0038002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 4
-/First 708 0 R
-/Last 711 0 R
-/Next 712 0 R
-/Prev 703 0 R
+/First 709 0 R
+/Last 712 0 R
+/Next 713 0 R
+/Prev 704 0 R
 /Dest [61 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
-708 0 obj
+709 0 obj
 << /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 707 0 R
+/Parent 708 0 R
 /Count 0
-/Next 709 0 R
+/Next 710 0 R
 /Dest [61 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
-709 0 obj
+710 0 obj
 << /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 707 0 R
+/Parent 708 0 R
 /Count 0
-/Next 710 0 R
-/Prev 708 0 R
+/Next 711 0 R
+/Prev 709 0 R
 /Dest [61 0 R /XYZ 0 212.76000000000028 null]
 >>
 endobj
-710 0 obj
+711 0 obj
 << /Title <feff0032002e0038002e0033002e00200043006f006e00730075006d00650073>
-/Parent 707 0 R
+/Parent 708 0 R
 /Count 0
-/Next 711 0 R
-/Prev 709 0 R
+/Next 712 0 R
+/Prev 710 0 R
 /Dest [61 0 R /XYZ 0 107.64000000000024 null]
 >>
 endobj
-711 0 obj
+712 0 obj
 << /Title <feff0032002e0038002e0034002e002000500072006f00640075006300650073>
-/Parent 707 0 R
+/Parent 708 0 R
 /Count 0
-/Prev 710 0 R
+/Prev 711 0 R
 /Dest [75 0 R /XYZ 0 792.0 null]
 >>
 endobj
-712 0 obj
+713 0 obj
 << /Title <feff0032002e0039002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 713 0 R
-/Last 715 0 R
-/Next 716 0 R
-/Prev 707 0 R
+/First 714 0 R
+/Last 716 0 R
+/Next 717 0 R
+/Prev 708 0 R
 /Dest [75 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-713 0 obj
+714 0 obj
 << /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 712 0 R
+/Parent 713 0 R
 /Count 0
-/Next 714 0 R
+/Next 715 0 R
 /Dest [75 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-714 0 obj
+715 0 obj
 << /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 712 0 R
+/Parent 713 0 R
 /Count 0
-/Next 715 0 R
-/Prev 713 0 R
+/Next 716 0 R
+/Prev 714 0 R
 /Dest [75 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-715 0 obj
+716 0 obj
 << /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
-/Parent 712 0 R
+/Parent 713 0 R
 /Count 0
-/Prev 714 0 R
+/Prev 715 0 R
 /Dest [75 0 R /XYZ 0 466.0800000000005 null]
 >>
 endobj
-716 0 obj
+717 0 obj
 << /Title <feff0032002e00310030002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d002f0065006c0065006d0065006e00740073002f007b00730068006f00720074004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 717 0 R
-/Last 719 0 R
-/Next 720 0 R
-/Prev 712 0 R
+/First 718 0 R
+/Last 720 0 R
+/Next 721 0 R
+/Prev 713 0 R
 /Dest [75 0 R /XYZ 0 409.80000000000047 null]
 >>
 endobj
-717 0 obj
+718 0 obj
 << /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 716 0 R
+/Parent 717 0 R
 /Count 0
-/Next 718 0 R
+/Next 719 0 R
 /Dest [75 0 R /XYZ 0 341.64000000000044 null]
 >>
 endobj
-718 0 obj
+719 0 obj
 << /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 716 0 R
+/Parent 717 0 R
 /Count 0
-/Next 719 0 R
-/Prev 717 0 R
+/Next 720 0 R
+/Prev 718 0 R
 /Dest [75 0 R /XYZ 0 198.9600000000004 null]
 >>
 endobj
-719 0 obj
+720 0 obj
 << /Title <feff0032002e00310030002e0033002e002000500072006f00640075006300650073>
-/Parent 716 0 R
+/Parent 717 0 R
 /Count 0
-/Prev 718 0 R
+/Prev 719 0 R
 /Dest [75 0 R /XYZ 0 108.12000000000037 null]
 >>
 endobj
-720 0 obj
+721 0 obj
 << /Title <feff0032002e00310031002e00200050005500540020002f00760032002f006c006f006f0070002f006100640064004f007000650072006100740069006f006e00610050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d002f0070006f006c006900630079004d006f00640065006c002f007b0070006f006c0069006300790054007900700065007d002f007b0070006f006c00690063007900560065007200730069006f006e007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 721 0 R
-/Last 723 0 R
-/Next 724 0 R
-/Prev 716 0 R
+/First 722 0 R
+/Last 724 0 R
+/Next 725 0 R
+/Prev 717 0 R
 /Dest [87 0 R /XYZ 0 792.0 null]
 >>
 endobj
-721 0 obj
+722 0 obj
 << /Title <feff0032002e00310031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 720 0 R
+/Parent 721 0 R
 /Count 0
-/Next 722 0 R
+/Next 723 0 R
 /Dest [87 0 R /XYZ 0 662.1600000000001 null]
 >>
 endobj
-722 0 obj
+723 0 obj
 << /Title <feff0032002e00310031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 720 0 R
+/Parent 721 0 R
 /Count 0
-/Next 723 0 R
-/Prev 721 0 R
+/Next 724 0 R
+/Prev 722 0 R
 /Dest [87 0 R /XYZ 0 481.92000000000024 null]
 >>
 endobj
-723 0 obj
+724 0 obj
 << /Title <feff0032002e00310031002e0033002e002000500072006f00640075006300650073>
-/Parent 720 0 R
+/Parent 721 0 R
 /Count 0
-/Prev 722 0 R
+/Prev 723 0 R
 /Dest [87 0 R /XYZ 0 376.8000000000002 null]
 >>
 endobj
-724 0 obj
+725 0 obj
 << /Title <feff0032002e00310032002e00200050004f005300540020002f00760032002f006c006f006f0070002f006300720065006100740065002f007b006c006f006f0070004e0061006d0065007d003f00740065006d0070006c006100740065004e0061006d0065003d007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 4
-/First 725 0 R
-/Last 728 0 R
-/Next 729 0 R
-/Prev 720 0 R
+/First 726 0 R
+/Last 729 0 R
+/Next 730 0 R
+/Prev 721 0 R
 /Dest [87 0 R /XYZ 0 320.52000000000015 null]
 >>
 endobj
-725 0 obj
+726 0 obj
 << /Title <feff0032002e00310032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 724 0 R
+/Parent 725 0 R
 /Count 0
-/Next 726 0 R
+/Next 727 0 R
 /Dest [87 0 R /XYZ 0 224.28000000000017 null]
 >>
 endobj
-726 0 obj
+727 0 obj
 << /Title <feff0032002e00310032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 724 0 R
+/Parent 725 0 R
 /Count 0
-/Next 727 0 R
-/Prev 725 0 R
+/Next 728 0 R
+/Prev 726 0 R
 /Dest [87 0 R /XYZ 0 104.88000000000014 null]
 >>
 endobj
-727 0 obj
+728 0 obj
 << /Title <feff0032002e00310032002e0033002e00200043006f006e00730075006d00650073>
-/Parent 724 0 R
+/Parent 725 0 R
 /Count 0
-/Next 728 0 R
-/Prev 726 0 R
+/Next 729 0 R
+/Prev 727 0 R
 /Dest [98 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-728 0 obj
+729 0 obj
 << /Title <feff0032002e00310032002e0034002e002000500072006f00640075006300650073>
-/Parent 724 0 R
+/Parent 725 0 R
 /Count 0
-/Prev 727 0 R
+/Prev 728 0 R
 /Dest [98 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-729 0 obj
+730 0 obj
 << /Title <feff0032002e00310033002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 730 0 R
-/Last 731 0 R
-/Next 732 0 R
-/Prev 724 0 R
+/First 731 0 R
+/Last 732 0 R
+/Next 733 0 R
+/Prev 725 0 R
 /Dest [98 0 R /XYZ 0 570.6000000000004 null]
 >>
 endobj
-730 0 obj
+731 0 obj
 << /Title <feff0032002e00310033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 729 0 R
+/Parent 730 0 R
 /Count 0
-/Next 731 0 R
+/Next 732 0 R
 /Dest [98 0 R /XYZ 0 530.5200000000004 null]
 >>
 endobj
-731 0 obj
+732 0 obj
 << /Title <feff0032002e00310033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 729 0 R
+/Parent 730 0 R
 /Count 0
-/Prev 730 0 R
+/Prev 731 0 R
 /Dest [98 0 R /XYZ 0 425.4000000000005 null]
 >>
 endobj
-732 0 obj
+733 0 obj
 << /Title <feff0032002e00310034002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 733 0 R
-/Last 735 0 R
-/Next 736 0 R
-/Prev 729 0 R
+/First 734 0 R
+/Last 736 0 R
+/Next 737 0 R
+/Prev 730 0 R
 /Dest [98 0 R /XYZ 0 334.5600000000005 null]
 >>
 endobj
-733 0 obj
+734 0 obj
 << /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 732 0 R
+/Parent 733 0 R
 /Count 0
-/Next 734 0 R
+/Next 735 0 R
 /Dest [98 0 R /XYZ 0 294.4800000000005 null]
 >>
 endobj
-734 0 obj
+735 0 obj
 << /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 732 0 R
+/Parent 733 0 R
 /Count 0
-/Next 735 0 R
-/Prev 733 0 R
+/Next 736 0 R
+/Prev 734 0 R
 /Dest [98 0 R /XYZ 0 189.36000000000044 null]
 >>
 endobj
-735 0 obj
+736 0 obj
 << /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
-/Parent 732 0 R
+/Parent 733 0 R
 /Count 0
-/Prev 734 0 R
+/Prev 735 0 R
 /Dest [110 0 R /XYZ 0 792.0 null]
 >>
 endobj
-736 0 obj
+737 0 obj
 << /Title <feff0032002e00310035002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 737 0 R
-/Last 738 0 R
-/Next 739 0 R
-/Prev 732 0 R
+/First 738 0 R
+/Last 739 0 R
+/Next 740 0 R
+/Prev 733 0 R
 /Dest [110 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-737 0 obj
+738 0 obj
 << /Title <feff0032002e00310035002e0031002e00200052006500730070006f006e007300650073>
-/Parent 736 0 R
+/Parent 737 0 R
 /Count 0
-/Next 738 0 R
+/Next 739 0 R
 /Dest [110 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-738 0 obj
+739 0 obj
 << /Title <feff0032002e00310035002e0032002e002000500072006f00640075006300650073>
-/Parent 736 0 R
+/Parent 737 0 R
 /Count 0
-/Prev 737 0 R
+/Prev 738 0 R
 /Dest [110 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-739 0 obj
+740 0 obj
 << /Title <feff0032002e00310036002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 740 0 R
-/Last 742 0 R
-/Next 743 0 R
-/Prev 736 0 R
+/First 741 0 R
+/Last 743 0 R
+/Next 744 0 R
+/Prev 737 0 R
 /Dest [110 0 R /XYZ 0 500.64000000000044 null]
 >>
 endobj
-740 0 obj
+741 0 obj
 << /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 739 0 R
+/Parent 740 0 R
 /Count 0
-/Next 741 0 R
+/Next 742 0 R
 /Dest [110 0 R /XYZ 0 460.5600000000004 null]
 >>
 endobj
-741 0 obj
+742 0 obj
 << /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 739 0 R
+/Parent 740 0 R
 /Count 0
-/Next 742 0 R
-/Prev 740 0 R
+/Next 743 0 R
+/Prev 741 0 R
 /Dest [110 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
-742 0 obj
+743 0 obj
 << /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
-/Parent 739 0 R
+/Parent 740 0 R
 /Count 0
-/Prev 741 0 R
+/Prev 742 0 R
 /Dest [110 0 R /XYZ 0 250.32000000000028 null]
 >>
 endobj
-743 0 obj
+744 0 obj
 << /Title <feff0032002e00310037002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004d006900630072006f00530065007200760069006300650050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d002f007b006d006900630072006f00530065007200760069006300650050006f006c006900630079004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 744 0 R
-/Last 746 0 R
-/Next 747 0 R
-/Prev 739 0 R
+/First 745 0 R
+/Last 747 0 R
+/Next 748 0 R
+/Prev 740 0 R
 /Dest [110 0 R /XYZ 0 194.04000000000025 null]
 >>
 endobj
-744 0 obj
+745 0 obj
 << /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 743 0 R
+/Parent 744 0 R
 /Count 0
-/Next 745 0 R
+/Next 746 0 R
 /Dest [110 0 R /XYZ 0 97.80000000000024 null]
 >>
 endobj
-745 0 obj
+746 0 obj
 << /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 743 0 R
+/Parent 744 0 R
 /Count 0
-/Next 746 0 R
-/Prev 744 0 R
-/Dest [124 0 R /XYZ 0 645.5999999999999 null]
+/Next 747 0 R
+/Prev 745 0 R
+/Dest [123 0 R /XYZ 0 645.5999999999999 null]
 >>
 endobj
-746 0 obj
+747 0 obj
 << /Title <feff0032002e00310037002e0033002e002000500072006f00640075006300650073>
-/Parent 743 0 R
+/Parent 744 0 R
 /Count 0
-/Prev 745 0 R
-/Dest [124 0 R /XYZ 0 540.48 null]
+/Prev 746 0 R
+/Dest [123 0 R /XYZ 0 540.48 null]
 >>
 endobj
-747 0 obj
+748 0 obj
 << /Title <feff0032002e00310038002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004f007000650072006100740069006f006e0061006c0050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d002f007b006f007000650072006100740069006f006e0061006c0050006f006c006900630079004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 748 0 R
-/Last 750 0 R
-/Next 751 0 R
-/Prev 743 0 R
-/Dest [124 0 R /XYZ 0 484.20000000000016 null]
+/First 749 0 R
+/Last 751 0 R
+/Next 752 0 R
+/Prev 744 0 R
+/Dest [123 0 R /XYZ 0 484.20000000000016 null]
 >>
 endobj
-748 0 obj
+749 0 obj
 << /Title <feff0032002e00310038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 747 0 R
+/Parent 748 0 R
 /Count 0
-/Next 749 0 R
-/Dest [124 0 R /XYZ 0 387.96000000000015 null]
+/Next 750 0 R
+/Dest [123 0 R /XYZ 0 387.96000000000015 null]
 >>
 endobj
-749 0 obj
+750 0 obj
 << /Title <feff0032002e00310038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 747 0 R
+/Parent 748 0 R
 /Count 0
-/Next 750 0 R
-/Prev 748 0 R
-/Dest [124 0 R /XYZ 0 245.28000000000014 null]
+/Next 751 0 R
+/Prev 749 0 R
+/Dest [123 0 R /XYZ 0 245.28000000000014 null]
 >>
 endobj
-750 0 obj
+751 0 obj
 << /Title <feff0032002e00310038002e0033002e002000500072006f00640075006300650073>
-/Parent 747 0 R
+/Parent 748 0 R
 /Count 0
-/Prev 749 0 R
-/Dest [124 0 R /XYZ 0 140.1600000000001 null]
+/Prev 750 0 R
+/Dest [123 0 R /XYZ 0 140.1600000000001 null]
 >>
 endobj
-751 0 obj
+752 0 obj
 << /Title <feff0032002e00310039002e00200050005500540020002f00760032002f006c006f006f0070002f00720065006d006f00760065004f007000650072006100740069006f006e00610050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d002f0070006f006c006900630079004d006f00640065006c002f007b0070006f006c0069006300790054007900700065007d002f007b0070006f006c00690063007900560065007200730069006f006e007d002f007b0070006f006c006900630079004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 752 0 R
-/Last 754 0 R
-/Next 755 0 R
-/Prev 747 0 R
-/Dest [134 0 R /XYZ 0 792.0 null]
+/First 753 0 R
+/Last 755 0 R
+/Next 756 0 R
+/Prev 748 0 R
+/Dest [133 0 R /XYZ 0 792.0 null]
 >>
 endobj
-752 0 obj
+753 0 obj
 << /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 751 0 R
+/Parent 752 0 R
 /Count 0
-/Next 753 0 R
-/Dest [134 0 R /XYZ 0 662.1600000000001 null]
+/Next 754 0 R
+/Dest [133 0 R /XYZ 0 662.1600000000001 null]
 >>
 endobj
-753 0 obj
+754 0 obj
 << /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 751 0 R
+/Parent 752 0 R
 /Count 0
-/Next 754 0 R
-/Prev 752 0 R
-/Dest [134 0 R /XYZ 0 444.3600000000002 null]
+/Next 755 0 R
+/Prev 753 0 R
+/Dest [133 0 R /XYZ 0 444.3600000000002 null]
 >>
 endobj
-754 0 obj
+755 0 obj
 << /Title <feff0032002e00310039002e0033002e002000500072006f00640075006300650073>
-/Parent 751 0 R
+/Parent 752 0 R
 /Count 0
-/Prev 753 0 R
-/Dest [134 0 R /XYZ 0 339.2400000000001 null]
+/Prev 754 0 R
+/Dest [133 0 R /XYZ 0 339.2400000000001 null]
 >>
 endobj
-755 0 obj
+756 0 obj
 << /Title <feff0032002e00320030002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 756 0 R
-/Last 758 0 R
-/Next 759 0 R
-/Prev 751 0 R
-/Dest [134 0 R /XYZ 0 282.9600000000001 null]
+/First 757 0 R
+/Last 759 0 R
+/Next 760 0 R
+/Prev 752 0 R
+/Dest [133 0 R /XYZ 0 282.9600000000001 null]
 >>
 endobj
-756 0 obj
+757 0 obj
 << /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 755 0 R
+/Parent 756 0 R
 /Count 0
-/Next 757 0 R
-/Dest [134 0 R /XYZ 0 242.8800000000001 null]
+/Next 758 0 R
+/Dest [133 0 R /XYZ 0 242.8800000000001 null]
 >>
 endobj
-757 0 obj
+758 0 obj
 << /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 755 0 R
+/Parent 756 0 R
 /Count 0
-/Next 758 0 R
-/Prev 756 0 R
-/Dest [134 0 R /XYZ 0 137.76000000000008 null]
+/Next 759 0 R
+/Prev 757 0 R
+/Dest [133 0 R /XYZ 0 137.76000000000008 null]
 >>
 endobj
-758 0 obj
+759 0 obj
 << /Title <feff0032002e00320030002e0033002e002000500072006f00640075006300650073>
-/Parent 755 0 R
+/Parent 756 0 R
 /Count 0
-/Prev 757 0 R
+/Prev 758 0 R
 /Dest [144 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-759 0 obj
+760 0 obj
 << /Title <feff0032002e00320031002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 760 0 R
-/Last 762 0 R
-/Next 763 0 R
-/Prev 755 0 R
+/First 761 0 R
+/Last 763 0 R
+/Next 764 0 R
+/Prev 756 0 R
 /Dest [144 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-760 0 obj
+761 0 obj
 << /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 759 0 R
+/Parent 760 0 R
 /Count 0
-/Next 761 0 R
+/Next 762 0 R
 /Dest [144 0 R /XYZ 0 586.8000000000003 null]
 >>
 endobj
-761 0 obj
+762 0 obj
 << /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 759 0 R
+/Parent 760 0 R
 /Count 0
-/Next 762 0 R
-/Prev 760 0 R
+/Next 763 0 R
+/Prev 761 0 R
 /Dest [144 0 R /XYZ 0 481.68000000000046 null]
 >>
 endobj
-762 0 obj
+763 0 obj
 << /Title <feff0032002e00320031002e0033002e002000500072006f00640075006300650073>
-/Parent 759 0 R
+/Parent 760 0 R
 /Count 0
-/Prev 761 0 R
+/Prev 762 0 R
 /Dest [144 0 R /XYZ 0 376.5600000000004 null]
 >>
 endobj
-763 0 obj
+764 0 obj
 << /Title <feff0032002e00320032002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 764 0 R
-/Last 766 0 R
-/Next 767 0 R
-/Prev 759 0 R
+/First 765 0 R
+/Last 767 0 R
+/Next 768 0 R
+/Prev 760 0 R
 /Dest [144 0 R /XYZ 0 320.28000000000037 null]
 >>
 endobj
-764 0 obj
+765 0 obj
 << /Title <feff0032002e00320032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 763 0 R
+/Parent 764 0 R
 /Count 0
-/Next 765 0 R
+/Next 766 0 R
 /Dest [144 0 R /XYZ 0 280.20000000000033 null]
 >>
 endobj
-765 0 obj
+766 0 obj
 << /Title <feff0032002e00320032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 763 0 R
+/Parent 764 0 R
 /Count 0
-/Next 766 0 R
-/Prev 764 0 R
+/Next 767 0 R
+/Prev 765 0 R
 /Dest [144 0 R /XYZ 0 175.08000000000033 null]
 >>
 endobj
-766 0 obj
+767 0 obj
 << /Title <feff0032002e00320032002e0033002e002000500072006f00640075006300650073>
-/Parent 763 0 R
+/Parent 764 0 R
 /Count 0
-/Prev 765 0 R
-/Dest [159 0 R /XYZ 0 792.0 null]
+/Prev 766 0 R
+/Dest [160 0 R /XYZ 0 792.0 null]
 >>
 endobj
-767 0 obj
+768 0 obj
 << /Title <feff0032002e00320033002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 768 0 R
-/Last 770 0 R
-/Next 771 0 R
-/Prev 763 0 R
-/Dest [159 0 R /XYZ 0 702.1200000000001 null]
->>
-endobj
-768 0 obj
-<< /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 767 0 R
-/Count 0
-/Next 769 0 R
-/Dest [159 0 R /XYZ 0 662.0400000000002 null]
+/First 769 0 R
+/Last 771 0 R
+/Next 772 0 R
+/Prev 764 0 R
+/Dest [160 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 769 0 obj
-<< /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 767 0 R
+<< /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 768 0 R
 /Count 0
 /Next 770 0 R
-/Prev 768 0 R
-/Dest [159 0 R /XYZ 0 556.9200000000003 null]
+/Dest [160 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
 770 0 obj
-<< /Title <feff0032002e00320033002e0033002e002000500072006f00640075006300650073>
-/Parent 767 0 R
+<< /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
+/Parent 768 0 R
 /Count 0
+/Next 771 0 R
 /Prev 769 0 R
-/Dest [159 0 R /XYZ 0 451.8000000000004 null]
+/Dest [160 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
 771 0 obj
-<< /Title <feff0032002e00320034002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
-/Count 4
-/First 772 0 R
-/Last 775 0 R
-/Next 776 0 R
-/Prev 767 0 R
-/Dest [159 0 R /XYZ 0 395.5200000000004 null]
+<< /Title <feff0032002e00320033002e0033002e002000500072006f00640075006300650073>
+/Parent 768 0 R
+/Count 0
+/Prev 770 0 R
+/Dest [160 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
 772 0 obj
-<< /Title <feff0032002e00320034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 771 0 R
-/Count 0
-/Next 773 0 R
-/Dest [159 0 R /XYZ 0 355.44000000000034 null]
+<< /Title <feff0032002e00320034002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 683 0 R
+/Count 4
+/First 773 0 R
+/Last 776 0 R
+/Next 777 0 R
+/Prev 768 0 R
+/Dest [160 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
 773 0 obj
-<< /Title <feff0032002e00320034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 771 0 R
+<< /Title <feff0032002e00320034002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 772 0 R
 /Count 0
 /Next 774 0 R
-/Prev 772 0 R
-/Dest [159 0 R /XYZ 0 212.76000000000028 null]
+/Dest [160 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
 774 0 obj
-<< /Title <feff0032002e00320034002e0033002e00200043006f006e00730075006d00650073>
-/Parent 771 0 R
+<< /Title <feff0032002e00320034002e0032002e00200052006500730070006f006e007300650073>
+/Parent 772 0 R
 /Count 0
 /Next 775 0 R
 /Prev 773 0 R
-/Dest [159 0 R /XYZ 0 107.64000000000024 null]
+/Dest [160 0 R /XYZ 0 212.76000000000028 null]
 >>
 endobj
 775 0 obj
-<< /Title <feff0032002e00320034002e0034002e002000500072006f00640075006300650073>
-/Parent 771 0 R
+<< /Title <feff0032002e00320034002e0033002e00200043006f006e00730075006d00650073>
+/Parent 772 0 R
 /Count 0
+/Next 776 0 R
 /Prev 774 0 R
-/Dest [173 0 R /XYZ 0 792.0 null]
+/Dest [160 0 R /XYZ 0 107.64000000000024 null]
 >>
 endobj
 776 0 obj
-<< /Title <feff0032002e00320035002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
-/Count 4
-/First 777 0 R
-/Last 780 0 R
-/Next 781 0 R
-/Prev 771 0 R
-/Dest [173 0 R /XYZ 0 702.1200000000001 null]
+<< /Title <feff0032002e00320034002e0034002e002000500072006f00640075006300650073>
+/Parent 772 0 R
+/Count 0
+/Prev 775 0 R
+/Dest [174 0 R /XYZ 0 792.0 null]
 >>
 endobj
 777 0 obj
-<< /Title <feff0032002e00320035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 776 0 R
-/Count 0
-/Next 778 0 R
-/Dest [173 0 R /XYZ 0 633.9600000000002 null]
+<< /Title <feff0032002e00320035002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 683 0 R
+/Count 4
+/First 778 0 R
+/Last 781 0 R
+/Next 782 0 R
+/Prev 772 0 R
+/Dest [174 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 778 0 obj
-<< /Title <feff0032002e00320035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 776 0 R
+<< /Title <feff0032002e00320035002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 777 0 R
 /Count 0
 /Next 779 0 R
-/Prev 777 0 R
-/Dest [173 0 R /XYZ 0 491.28000000000026 null]
+/Dest [174 0 R /XYZ 0 633.9600000000002 null]
 >>
 endobj
 779 0 obj
-<< /Title <feff0032002e00320035002e0033002e00200043006f006e00730075006d00650073>
-/Parent 776 0 R
+<< /Title <feff0032002e00320035002e0032002e00200052006500730070006f006e007300650073>
+/Parent 777 0 R
 /Count 0
 /Next 780 0 R
 /Prev 778 0 R
-/Dest [173 0 R /XYZ 0 386.1600000000002 null]
+/Dest [174 0 R /XYZ 0 491.28000000000026 null]
 >>
 endobj
 780 0 obj
-<< /Title <feff0032002e00320035002e0034002e002000500072006f00640075006300650073>
-/Parent 776 0 R
+<< /Title <feff0032002e00320035002e0033002e00200043006f006e00730075006d00650073>
+/Parent 777 0 R
 /Count 0
+/Next 781 0 R
 /Prev 779 0 R
-/Dest [173 0 R /XYZ 0 329.88000000000017 null]
+/Dest [174 0 R /XYZ 0 386.1600000000002 null]
 >>
 endobj
 781 0 obj
+<< /Title <feff0032002e00320035002e0034002e002000500072006f00640075006300650073>
+/Parent 777 0 R
+/Count 0
+/Prev 780 0 R
+/Dest [174 0 R /XYZ 0 329.88000000000017 null]
+>>
+endobj
+782 0 obj
 << /Title <feff0032002e00320036002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 4
-/First 782 0 R
-/Last 785 0 R
-/Next 786 0 R
-/Prev 776 0 R
-/Dest [173 0 R /XYZ 0 273.60000000000014 null]
+/First 783 0 R
+/Last 786 0 R
+/Next 787 0 R
+/Prev 777 0 R
+/Dest [174 0 R /XYZ 0 273.60000000000014 null]
 >>
 endobj
-782 0 obj
+783 0 obj
 << /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 781 0 R
+/Parent 782 0 R
 /Count 0
-/Next 783 0 R
-/Dest [173 0 R /XYZ 0 205.44000000000014 null]
+/Next 784 0 R
+/Dest [174 0 R /XYZ 0 205.44000000000014 null]
 >>
 endobj
-783 0 obj
+784 0 obj
 << /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 781 0 R
+/Parent 782 0 R
 /Count 0
-/Next 784 0 R
-/Prev 782 0 R
+/Next 785 0 R
+/Prev 783 0 R
 /Dest [187 0 R /XYZ 0 792.0 null]
 >>
 endobj
-784 0 obj
+785 0 obj
 << /Title <feff0032002e00320036002e0033002e00200043006f006e00730075006d00650073>
-/Parent 781 0 R
+/Parent 782 0 R
 /Count 0
-/Next 785 0 R
-/Prev 783 0 R
+/Next 786 0 R
+/Prev 784 0 R
 /Dest [187 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-785 0 obj
+786 0 obj
 << /Title <feff0032002e00320036002e0034002e002000500072006f00640075006300650073>
-/Parent 781 0 R
+/Parent 782 0 R
 /Count 0
-/Prev 784 0 R
+/Prev 785 0 R
 /Dest [187 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-786 0 obj
+787 0 obj
 << /Title <feff0032002e00320037002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 787 0 R
-/Last 789 0 R
-/Next 790 0 R
-/Prev 781 0 R
+/First 788 0 R
+/Last 790 0 R
+/Next 791 0 R
+/Prev 782 0 R
 /Dest [187 0 R /XYZ 0 540.7200000000005 null]
 >>
 endobj
-787 0 obj
+788 0 obj
 << /Title <feff0032002e00320037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 786 0 R
+/Parent 787 0 R
 /Count 0
-/Next 788 0 R
+/Next 789 0 R
 /Dest [187 0 R /XYZ 0 500.6400000000005 null]
 >>
 endobj
-788 0 obj
+789 0 obj
 << /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 786 0 R
+/Parent 787 0 R
 /Count 0
-/Next 789 0 R
-/Prev 787 0 R
+/Next 790 0 R
+/Prev 788 0 R
 /Dest [187 0 R /XYZ 0 395.5200000000005 null]
 >>
 endobj
-789 0 obj
+790 0 obj
 << /Title <feff0032002e00320037002e0033002e002000500072006f00640075006300650073>
-/Parent 786 0 R
+/Parent 787 0 R
 /Count 0
-/Prev 788 0 R
+/Prev 789 0 R
 /Dest [187 0 R /XYZ 0 290.40000000000043 null]
 >>
 endobj
-790 0 obj
+791 0 obj
 << /Title <feff0032002e00320038002e00200050004f005300540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 4
-/First 791 0 R
-/Last 794 0 R
-/Next 795 0 R
-/Prev 786 0 R
+/First 792 0 R
+/Last 795 0 R
+/Next 796 0 R
+/Prev 787 0 R
 /Dest [187 0 R /XYZ 0 234.1200000000004 null]
 >>
 endobj
-791 0 obj
-<< /Title <feff0032002e00320038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 790 0 R
-/Count 0
-/Next 792 0 R
-/Dest [187 0 R /XYZ 0 194.0400000000004 null]
->>
-endobj
 792 0 obj
-<< /Title <feff0032002e00320038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 790 0 R
+<< /Title <feff0032002e00320038002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 791 0 R
 /Count 0
 /Next 793 0 R
-/Prev 791 0 R
-/Dest [201 0 R /XYZ 0 792.0 null]
+/Dest [187 0 R /XYZ 0 194.0400000000004 null]
 >>
 endobj
 793 0 obj
-<< /Title <feff0032002e00320038002e0033002e00200043006f006e00730075006d00650073>
-/Parent 790 0 R
+<< /Title <feff0032002e00320038002e0032002e00200052006500730070006f006e007300650073>
+/Parent 791 0 R
 /Count 0
 /Next 794 0 R
 /Prev 792 0 R
-/Dest [201 0 R /XYZ 0 653.2800000000002 null]
+/Dest [200 0 R /XYZ 0 792.0 null]
 >>
 endobj
 794 0 obj
-<< /Title <feff0032002e00320038002e0034002e002000500072006f00640075006300650073>
-/Parent 790 0 R
+<< /Title <feff0032002e00320038002e0033002e00200043006f006e00730075006d00650073>
+/Parent 791 0 R
 /Count 0
+/Next 795 0 R
 /Prev 793 0 R
-/Dest [201 0 R /XYZ 0 597.0000000000003 null]
+/Dest [200 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 795 0 obj
+<< /Title <feff0032002e00320038002e0034002e002000500072006f00640075006300650073>
+/Parent 791 0 R
+/Count 0
+/Prev 794 0 R
+/Dest [200 0 R /XYZ 0 597.0000000000003 null]
+>>
+endobj
+796 0 obj
 << /Title <feff0032002e00320039002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 796 0 R
-/Last 797 0 R
-/Next 798 0 R
-/Prev 790 0 R
-/Dest [201 0 R /XYZ 0 540.7200000000005 null]
+/First 797 0 R
+/Last 798 0 R
+/Next 799 0 R
+/Prev 791 0 R
+/Dest [200 0 R /XYZ 0 540.7200000000005 null]
 >>
 endobj
-796 0 obj
+797 0 obj
 << /Title <feff0032002e00320039002e0031002e00200052006500730070006f006e007300650073>
-/Parent 795 0 R
+/Parent 796 0 R
 /Count 0
-/Next 797 0 R
-/Dest [201 0 R /XYZ 0 500.6400000000005 null]
+/Next 798 0 R
+/Dest [200 0 R /XYZ 0 500.6400000000005 null]
 >>
 endobj
-797 0 obj
+798 0 obj
 << /Title <feff0032002e00320039002e0032002e002000500072006f00640075006300650073>
-/Parent 795 0 R
+/Parent 796 0 R
 /Count 0
-/Prev 796 0 R
-/Dest [201 0 R /XYZ 0 395.52000000000044 null]
+/Prev 797 0 R
+/Dest [200 0 R /XYZ 0 395.52000000000044 null]
 >>
 endobj
-798 0 obj
+799 0 obj
 << /Title <feff0032002e00330030002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f00790061006d006c002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d002f007b0070006f006c006900630079004d006f00640065006c00560065007200730069006f006e007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 799 0 R
-/Last 801 0 R
-/Next 802 0 R
-/Prev 795 0 R
-/Dest [201 0 R /XYZ 0 339.2400000000004 null]
+/First 800 0 R
+/Last 802 0 R
+/Next 803 0 R
+/Prev 796 0 R
+/Dest [200 0 R /XYZ 0 339.2400000000004 null]
 >>
 endobj
-799 0 obj
+800 0 obj
 << /Title <feff0032002e00330030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 798 0 R
+/Parent 799 0 R
 /Count 0
-/Next 800 0 R
-/Dest [201 0 R /XYZ 0 243.00000000000043 null]
+/Next 801 0 R
+/Dest [200 0 R /XYZ 0 243.00000000000043 null]
 >>
 endobj
-800 0 obj
+801 0 obj
 << /Title <feff0032002e00330030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 798 0 R
+/Parent 799 0 R
 /Count 0
-/Next 801 0 R
-/Prev 799 0 R
-/Dest [201 0 R /XYZ 0 100.32000000000039 null]
+/Next 802 0 R
+/Prev 800 0 R
+/Dest [200 0 R /XYZ 0 100.32000000000039 null]
 >>
 endobj
-801 0 obj
+802 0 obj
 << /Title <feff0032002e00330030002e0033002e002000500072006f00640075006300650073>
-/Parent 798 0 R
+/Parent 799 0 R
 /Count 0
-/Prev 800 0 R
+/Prev 801 0 R
 /Dest [214 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-802 0 obj
+803 0 obj
 << /Title <feff0032002e00330031002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d002f007b0070006f006c006900630079004d006f00640065006c00560065007200730069006f006e007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 803 0 R
-/Last 805 0 R
-/Next 806 0 R
-/Prev 798 0 R
+/First 804 0 R
+/Last 806 0 R
+/Next 807 0 R
+/Prev 799 0 R
 /Dest [214 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-803 0 obj
+804 0 obj
 << /Title <feff0032002e00330031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 802 0 R
+/Parent 803 0 R
 /Count 0
-/Next 804 0 R
+/Next 805 0 R
 /Dest [214 0 R /XYZ 0 530.6400000000003 null]
 >>
 endobj
-804 0 obj
+805 0 obj
 << /Title <feff0032002e00330031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 802 0 R
+/Parent 803 0 R
 /Count 0
-/Next 805 0 R
-/Prev 803 0 R
+/Next 806 0 R
+/Prev 804 0 R
 /Dest [214 0 R /XYZ 0 387.9600000000003 null]
 >>
 endobj
-805 0 obj
+806 0 obj
 << /Title <feff0032002e00330031002e0033002e002000500072006f00640075006300650073>
-/Parent 802 0 R
+/Parent 803 0 R
 /Count 0
-/Prev 804 0 R
+/Prev 805 0 R
 /Dest [214 0 R /XYZ 0 282.84000000000026 null]
 >>
 endobj
-806 0 obj
+807 0 obj
 << /Title <feff0032002e00330032002e00200050005500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d002f007b0070006f006c006900630079004d006f00640065006c00560065007200730069006f006e007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 4
-/First 807 0 R
-/Last 810 0 R
-/Next 811 0 R
-/Prev 802 0 R
+/First 808 0 R
+/Last 811 0 R
+/Next 812 0 R
+/Prev 803 0 R
 /Dest [214 0 R /XYZ 0 226.56000000000026 null]
 >>
 endobj
-807 0 obj
+808 0 obj
 << /Title <feff0032002e00330032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 806 0 R
+/Parent 807 0 R
 /Count 0
-/Next 808 0 R
+/Next 809 0 R
 /Dest [214 0 R /XYZ 0 130.32000000000025 null]
 >>
 endobj
-808 0 obj
+809 0 obj
 << /Title <feff0032002e00330032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 806 0 R
+/Parent 807 0 R
 /Count 0
-/Next 809 0 R
-/Prev 807 0 R
+/Next 810 0 R
+/Prev 808 0 R
 /Dest [225 0 R /XYZ 0 608.04 null]
 >>
 endobj
-809 0 obj
+810 0 obj
 << /Title <feff0032002e00330032002e0033002e00200043006f006e00730075006d00650073>
-/Parent 806 0 R
+/Parent 807 0 R
 /Count 0
-/Next 810 0 R
-/Prev 808 0 R
+/Next 811 0 R
+/Prev 809 0 R
 /Dest [225 0 R /XYZ 0 502.9200000000001 null]
 >>
 endobj
-810 0 obj
+811 0 obj
 << /Title <feff0032002e00330032002e0034002e002000500072006f00640075006300650073>
-/Parent 806 0 R
+/Parent 807 0 R
 /Count 0
-/Prev 809 0 R
+/Prev 810 0 R
 /Dest [225 0 R /XYZ 0 446.64000000000004 null]
 >>
 endobj
-811 0 obj
+812 0 obj
 << /Title <feff0032002e00330033002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 812 0 R
-/Last 813 0 R
-/Next 814 0 R
-/Prev 806 0 R
+/First 813 0 R
+/Last 814 0 R
+/Next 815 0 R
+/Prev 807 0 R
 /Dest [225 0 R /XYZ 0 390.36 null]
 >>
 endobj
-812 0 obj
+813 0 obj
 << /Title <feff0032002e00330033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 811 0 R
+/Parent 812 0 R
 /Count 0
-/Next 813 0 R
+/Next 814 0 R
 /Dest [225 0 R /XYZ 0 350.28 null]
 >>
 endobj
-813 0 obj
+814 0 obj
 << /Title <feff0032002e00330033002e0032002e002000500072006f00640075006300650073>
-/Parent 811 0 R
+/Parent 812 0 R
 /Count 0
-/Prev 812 0 R
+/Prev 813 0 R
 /Dest [225 0 R /XYZ 0 245.15999999999997 null]
 >>
 endobj
-814 0 obj
+815 0 obj
 << /Title <feff0032002e00330034002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f006e0061006d00650073>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 2
-/First 815 0 R
-/Last 816 0 R
-/Next 817 0 R
-/Prev 811 0 R
+/First 816 0 R
+/Last 817 0 R
+/Next 818 0 R
+/Prev 812 0 R
 /Dest [225 0 R /XYZ 0 188.87999999999994 null]
 >>
 endobj
-815 0 obj
+816 0 obj
 << /Title <feff0032002e00330034002e0031002e00200052006500730070006f006e007300650073>
-/Parent 814 0 R
+/Parent 815 0 R
 /Count 0
-/Next 816 0 R
+/Next 817 0 R
 /Dest [225 0 R /XYZ 0 148.79999999999993 null]
 >>
 endobj
-816 0 obj
+817 0 obj
 << /Title <feff0032002e00330034002e0032002e002000500072006f00640075006300650073>
-/Parent 814 0 R
+/Parent 815 0 R
 /Count 0
-/Prev 815 0 R
+/Prev 816 0 R
 /Dest [237 0 R /XYZ 0 792.0 null]
 >>
 endobj
-817 0 obj
+818 0 obj
 << /Title <feff0032002e00330035002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 682 0 R
+/Parent 683 0 R
 /Count 3
-/First 818 0 R
-/Last 820 0 R
-/Prev 814 0 R
+/First 819 0 R
+/Last 821 0 R
+/Prev 815 0 R
 /Dest [237 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-818 0 obj
+819 0 obj
 << /Title <feff0032002e00330035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 817 0 R
+/Parent 818 0 R
 /Count 0
-/Next 819 0 R
+/Next 820 0 R
 /Dest [237 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-819 0 obj
+820 0 obj
 << /Title <feff0032002e00330035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 817 0 R
+/Parent 818 0 R
 /Count 0
-/Next 820 0 R
-/Prev 818 0 R
+/Next 821 0 R
+/Prev 819 0 R
 /Dest [237 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-820 0 obj
+821 0 obj
 << /Title <feff0032002e00330035002e0033002e002000500072006f00640075006300650073>
-/Parent 817 0 R
+/Parent 818 0 R
 /Count 0
-/Prev 819 0 R
+/Prev 820 0 R
 /Dest [237 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
-821 0 obj
+822 0 obj
 << /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
-/Parent 676 0 R
+/Parent 677 0 R
 /Count 20
-/First 822 0 R
-/Last 841 0 R
-/Prev 682 0 R
-/Dest [246 0 R /XYZ 0 792.0 null]
->>
-endobj
-822 0 obj
-<< /Title <feff0033002e0031002e00200043006c0061006d00700049006e0066006f0072006d006100740069006f006e>
-/Parent 821 0 R
-/Count 0
-/Next 823 0 R
-/Dest [246 0 R /XYZ 0 712.0799999999999 null]
+/First 823 0 R
+/Last 842 0 R
+/Prev 683 0 R
+/Dest [247 0 R /XYZ 0 792.0 null]
 >>
 endobj
 823 0 obj
-<< /Title <feff0033002e0032002e00200043006c00640073004800650061006c007400680043006800650063006b>
-/Parent 821 0 R
+<< /Title <feff0033002e0031002e00200043006c0061006d00700049006e0066006f0072006d006100740069006f006e>
+/Parent 822 0 R
 /Count 0
 /Next 824 0 R
-/Prev 822 0 R
-/Dest [246 0 R /XYZ 0 524.04 null]
+/Dest [247 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
 824 0 obj
-<< /Title <feff0033002e0033002e002000440069006300740069006f006e006100720079>
-/Parent 821 0 R
+<< /Title <feff0033002e0032002e00200043006c00640073004800650061006c007400680043006800650063006b>
+/Parent 822 0 R
 /Count 0
 /Next 825 0 R
 /Prev 823 0 R
-/Dest [246 0 R /XYZ 0 335.99999999999994 null]
+/Dest [247 0 R /XYZ 0 524.04 null]
 >>
 endobj
 825 0 obj
-<< /Title <feff0033002e0034002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
-/Parent 821 0 R
+<< /Title <feff0033002e0033002e002000440069006300740069006f006e006100720079>
+/Parent 822 0 R
 /Count 0
 /Next 826 0 R
 /Prev 824 0 R
-/Dest [253 0 R /XYZ 0 608.04 null]
+/Dest [247 0 R /XYZ 0 335.99999999999994 null]
 >>
 endobj
 826 0 obj
-<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
-/Parent 821 0 R
+<< /Title <feff0033002e0034002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
+/Parent 822 0 R
 /Count 0
 /Next 827 0 R
 /Prev 825 0 R
-/Dest [253 0 R /XYZ 0 157.07999999999998 null]
+/Dest [254 0 R /XYZ 0 608.04 null]
 >>
 endobj
 827 0 obj
-<< /Title <feff0033002e0036002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
-/Parent 821 0 R
+<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
+/Parent 822 0 R
 /Count 0
 /Next 828 0 R
 /Prev 826 0 R
-/Dest [259 0 R /XYZ 0 683.1600000000001 null]
+/Dest [254 0 R /XYZ 0 157.07999999999998 null]
 >>
 endobj
 828 0 obj
-<< /Title <feff0033002e0037002e0020004a0073006f006e00410072007200610079>
-/Parent 821 0 R
+<< /Title <feff0033002e0036002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
+/Parent 822 0 R
 /Count 0
 /Next 829 0 R
 /Prev 827 0 R
-/Dest [259 0 R /XYZ 0 495.1200000000002 null]
+/Dest [260 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
 829 0 obj
-<< /Title <feff0033002e0038002e0020004a0073006f006e004e0075006c006c>
-/Parent 821 0 R
+<< /Title <feff0033002e0037002e0020004a0073006f006e00410072007200610079>
+/Parent 822 0 R
 /Count 0
 /Next 830 0 R
 /Prev 828 0 R
-/Dest [266 0 R /XYZ 0 345.1200000000003 null]
+/Dest [260 0 R /XYZ 0 495.1200000000002 null]
 >>
 endobj
 830 0 obj
-<< /Title <feff0033002e0039002e0020004a0073006f006e004f0062006a006500630074>
-/Parent 821 0 R
+<< /Title <feff0033002e0038002e0020004a0073006f006e004e0075006c006c>
+/Parent 822 0 R
 /Count 0
 /Next 831 0 R
 /Prev 829 0 R
-/Dest [272 0 R /XYZ 0 194.88000000000017 null]
+/Dest [267 0 R /XYZ 0 345.1200000000003 null]
 >>
 endobj
 831 0 obj
-<< /Title <feff0033002e00310030002e0020004a0073006f006e005000720069006d00690074006900760065>
-/Parent 821 0 R
+<< /Title <feff0033002e0039002e0020004a0073006f006e004f0062006a006500630074>
+/Parent 822 0 R
 /Count 0
 /Next 832 0 R
 /Prev 830 0 R
-/Dest [287 0 R /XYZ 0 792.0 null]
+/Dest [273 0 R /XYZ 0 194.88000000000017 null]
 >>
 endobj
 832 0 obj
-<< /Title <feff0033002e00310031002e0020004c006f006f0070>
-/Parent 821 0 R
+<< /Title <feff0033002e00310030002e0020004a0073006f006e005000720069006d00690074006900760065>
+/Parent 822 0 R
 /Count 0
 /Next 833 0 R
 /Prev 831 0 R
-/Dest [295 0 R /XYZ 0 495.3600000000003 null]
+/Dest [288 0 R /XYZ 0 792.0 null]
 >>
 endobj
 833 0 obj
-<< /Title <feff0033002e00310032002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 821 0 R
+<< /Title <feff0033002e00310031002e0020004c006f006f0070>
+/Parent 822 0 R
 /Count 0
 /Next 834 0 R
 /Prev 832 0 R
-/Dest [303 0 R /XYZ 0 532.9200000000001 null]
+/Dest [296 0 R /XYZ 0 495.3600000000003 null]
 >>
 endobj
 834 0 obj
-<< /Title <feff0033002e00310033002e0020004c006f006f0070004c006f0067>
-/Parent 821 0 R
+<< /Title <feff0033002e00310032002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 822 0 R
 /Count 0
 /Next 835 0 R
 /Prev 833 0 R
-/Dest [310 0 R /XYZ 0 792.0 null]
+/Dest [304 0 R /XYZ 0 532.9200000000001 null]
 >>
 endobj
 835 0 obj
-<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065>
-/Parent 821 0 R
+<< /Title <feff0033002e00310033002e0020004c006f006f0070004c006f0067>
+/Parent 822 0 R
 /Count 0
 /Next 836 0 R
 /Prev 834 0 R
-/Dest [310 0 R /XYZ 0 457.68 null]
+/Dest [311 0 R /XYZ 0 792.0 null]
 >>
 endobj
 836 0 obj
-<< /Title <feff0033002e00310035002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 821 0 R
+<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065>
+/Parent 822 0 R
 /Count 0
 /Next 837 0 R
 /Prev 835 0 R
-/Dest [317 0 R /XYZ 0 608.0400000000002 null]
+/Dest [311 0 R /XYZ 0 457.68 null]
 >>
 endobj
 837 0 obj
-<< /Title <feff0033002e00310036002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
-/Parent 821 0 R
+<< /Title <feff0033002e00310035002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 822 0 R
 /Count 0
 /Next 838 0 R
 /Prev 836 0 R
-/Dest [317 0 R /XYZ 0 420.0000000000003 null]
+/Dest [318 0 R /XYZ 0 608.0400000000002 null]
 >>
 endobj
 838 0 obj
-<< /Title <feff0033002e00310037002e0020004e0075006d006200650072>
-/Parent 821 0 R
+<< /Title <feff0033002e00310036002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
+/Parent 822 0 R
 /Count 0
 /Next 839 0 R
 /Prev 837 0 R
-/Dest [325 0 R /XYZ 0 307.5600000000001 null]
+/Dest [318 0 R /XYZ 0 420.0000000000003 null]
 >>
 endobj
 839 0 obj
-<< /Title <feff0033002e00310038002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
-/Parent 821 0 R
+<< /Title <feff0033002e00310037002e0020004e0075006d006200650072>
+/Parent 822 0 R
 /Count 0
 /Next 840 0 R
 /Prev 838 0 R
-/Dest [325 0 R /XYZ 0 239.70000000000007 null]
+/Dest [326 0 R /XYZ 0 345.12000000000006 null]
 >>
 endobj
 840 0 obj
-<< /Title <feff0033002e00310039002e00200050006f006c006900630079004d006f00640065006c>
-/Parent 821 0 R
+<< /Title <feff0033002e00310038002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
+/Parent 822 0 R
 /Count 0
 /Next 841 0 R
 /Prev 839 0 R
-/Dest [334 0 R /XYZ 0 345.12 null]
+/Dest [326 0 R /XYZ 0 277.26 null]
 >>
 endobj
 841 0 obj
-<< /Title <feff0033002e00320030002e00200053006500720076006900630065>
-/Parent 821 0 R
+<< /Title <feff0033002e00310039002e00200050006f006c006900630079004d006f00640065006c>
+/Parent 822 0 R
 /Count 0
+/Next 842 0 R
 /Prev 840 0 R
-/Dest [342 0 R /XYZ 0 570.48 null]
+/Dest [336 0 R /XYZ 0 420.23999999999995 null]
 >>
 endobj
 842 0 obj
+<< /Title <feff0033002e00320030002e00200053006500720076006900630065>
+/Parent 822 0 R
+/Count 0
+/Prev 841 0 R
+/Dest [343 0 R /XYZ 0 645.5999999999999 null]
+>>
+endobj
+843 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (iii)
@@ -55195,7 +55020,7 @@ endobj
 >>]
 >>
 endobj
-843 0 obj
+844 0 obj
 << /Length1 12332
 /Length 7916
 /Filter [/FlateDecode]
@@ -55232,10 +55057,10 @@ MR��Z϶��S���Rp|���rЭo�󷾡�#�Ւ_
���B���(��C&�i��������z>�"Y�C(����S�
 �.���
Z�bh
 endstream
 endobj
-844 0 obj
+845 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAA+NotoSerif
-/FontFile2 843 0 R
+/FontFile2 844 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -55246,7 +55071,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-845 0 obj
+846 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -55256,10 +55081,10 @@ x�e��n�F�ὮB�tHs&
�@�n��
u{
stԒ +�}���i �/��y�_�!u������t�~�]�s�����n��
 ���J���J��특���x��x��x��+�!Êw��B�x�b�x��+ށ
�r�;��2��k��J�Y�e�Y��7+|��
x�oS��7+[ƛețךyޢoV��浖-㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x����V�z�����[YE�V�Y���_}
/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W	R��VJS�����:(u@c��D�]a*��f)�9J���)�o,#�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���;�2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ>�M��Bi2.Ħ����ԇ!���d�k�`���=o��qWޕwdJF(�L164�U��)�x0E�~
��Z?
 endstream
 endobj
-846 0 obj
+847 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 559 559 500 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-847 0 obj
+848 0 obj
 << /Length1 11528
 /Length 7660
 /Filter [/FlateDecode]
@@ -55301,10 +55126,10 @@ g��>�q�R��m#}�Q�RD���`H[�^�dž0e�r#�M� +sl��QV�[߿���ڹ;|E�z�޸-K�ܺw9
 �za\�n�;��vd'������"�ML�#13����ʦ�J+�����]&���A�v��r�3@i
 endstream
 endobj
-848 0 obj
+849 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAB+NotoSerif-Bold
-/FontFile2 847 0 R
+/FontFile2 848 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -55315,7 +55140,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-849 0 obj
+850 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -55325,10 +55150,10 @@ x�e��n�F�ὮB�tHs&
�@�n��
u{
stԒ +�}���i �/��y�_�!u������t�~�]�s�����n��
 ���J���J��특���x��x��x��+�!Êw��B�x�b�x��+ށ
�r�;��2��k��J�Y�e�Y��7+|��
x�oS��7+[ƛețךyޢoV��浖-㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x����V�z�����[YE�V�Y���_}
/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W	R��VJS�����:(u@c��D�]a*��f)�9J���)�o,#�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���;�2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ>�M��Bi2.Ħ����ԇ!���d�k�`���=o��qWޕwdJF(�L164�U��)�x0E�~
��Z?
 endstream
 endobj
-850 0 obj
+851 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 559 1000 549 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-851 0 obj
+852 0 obj
 << /Length1 5116
 /Length 3170
 /Filter [/FlateDecode]
@@ -55348,10 +55173,10 @@ a�R����r��r�̚����m'���Or׸��G����M�� #8�M��nz�95��6G��`#%��	xH�����+�h�Qr�D
 �:�2�]�^�5�w,�º*�Ӌ�58�m�g��nk��7c��B4��a���D[Na�U�<V���`��@V����{K���r����S������3��e'�(���ϫ-{�S}`-�y���/����79�]�p$xr뒤���'��"Z��/iz���]�W�~ �ݖ�&��T
 endstream
 endobj
-852 0 obj
+853 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAC+NotoSerif-Italic
-/FontFile2 851 0 R
+/FontFile2 852 0 R
 /FontBBox [-254 -250 1238 1047]
 /Flags 70
 /StemV 0
@@ -55362,7 +55187,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-853 0 obj
+854 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -55372,10 +55197,10 @@ x�e��n�F�ὮB�tHs&
�@�n��
u{
stԒ +�}���i �/��y�_�!u������t�~�]�s�����n��
 ���J���J��특���x��x��x��+�!Êw��B�x�b�x��+ށ
�r�;��2��k��J�Y�e�Y��7+|��
x�oS��7+[ƛețךyޢoV��浖-㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x����V�z�����[YE�V�Y���_}
/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W	R��VJS�����:(u@c��D�]a*��f)�9J���)�o,#�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���;�2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ>�M��Bi2.Ħ����ԇ!���d�k�`���=o��qWޕwdJF(�L164�U��)�x0E�~
��Z?
 endstream
 endobj
-854 0 obj
+855 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-855 0 obj
+856 0 obj
 << /Length1 3188
 /Length 2052
 /Filter [/FlateDecode]
@@ -55393,10 +55218,10 @@ f�zz�=�bn�}�kP��-;8�b��YK΅+
��c��]=�k� ����T������DS�8v"�[���9�MD��u���
 hž�dc����S�w�_M
�
 endstream
 endobj
-856 0 obj
+857 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAD+mplus1mn-regular
-/FontFile2 855 0 R
+/FontFile2 856 0 R
 /FontBBox [0 -230 1000 860]
 /Flags 4
 /StemV 0
@@ -55407,7 +55232,7 @@ endobj
 /XHeight 0
 >>
 endobj
-857 0 obj
+858 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -55417,11 +55242,11 @@ x�e��n�F�ὮB�tHs&
�@�n��
u{
stԒ +�}���i �/��y�_�!u������t�~�]�s�����n��
 ���J���J��특���x��x��x��+�!Êw��B�x�b�x��+ށ
�r�;��2��k��J�Y�e�Y��7+|��
x�oS��7+[ƛețךyޢoV��浖-㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x����V�z�����[YE�V�Y���_}
/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W	R��VJS�����:(u@c��D�]a*��f)�9J���)�o,#�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���;�2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ>�M��Bi2.Ħ����ԇ!���d�k�`���=o��qWޕwdJF(�L164�U��)�x0E�~
��Z?
 endstream
 endobj
-858 0 obj
+859 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 1000 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
 xref
-0 859
+0 860
 0000000000 65535 f 
 0000000015 00000 n 
 0000000264 00000 n 
@@ -55446,846 +55271,847 @@ xref
 0000146751 00000 n 
 0000146794 00000 n 
 0000146843 00000 n 
-0000146973 00000 n 
-0000147146 00000 n 
-0000147201 00000 n 
-0000147376 00000 n 
-0000147420 00000 n 
-0000159625 00000 n 
-0000159886 00000 n 
-0000159929 00000 n 
-0000159984 00000 n 
-0000160027 00000 n 
-0000160199 00000 n 
-0000160254 00000 n 
-0000160429 00000 n 
-0000160485 00000 n 
-0000160540 00000 n 
-0000160595 00000 n 
-0000160651 00000 n 
-0000160706 00000 n 
-0000160871 00000 n 
-0000160926 00000 n 
-0000160982 00000 n 
-0000177457 00000 n 
-0000177738 00000 n 
-0000177781 00000 n 
-0000177937 00000 n 
-0000177992 00000 n 
-0000178047 00000 n 
-0000178102 00000 n 
-0000178257 00000 n 
-0000178312 00000 n 
-0000178470 00000 n 
-0000178525 00000 n 
-0000178580 00000 n 
-0000178882 00000 n 
-0000179192 00000 n 
-0000179248 00000 n 
-0000179304 00000 n 
-0000197589 00000 n 
-0000197870 00000 n 
-0000197913 00000 n 
-0000197968 00000 n 
-0000198023 00000 n 
-0000198078 00000 n 
-0000198235 00000 n 
-0000198290 00000 n 
-0000198345 00000 n 
-0000198401 00000 n 
-0000198557 00000 n 
-0000198613 00000 n 
-0000198771 00000 n 
-0000198827 00000 n 
-0000214555 00000 n 
-0000214805 00000 n 
-0000214848 00000 n 
-0000214903 00000 n 
-0000214958 00000 n 
-0000215013 00000 n 
-0000215068 00000 n 
-0000215124 00000 n 
-0000215180 00000 n 
-0000215235 00000 n 
-0000215712 00000 n 
-0000215768 00000 n 
-0000231871 00000 n 
-0000232138 00000 n 
-0000232181 00000 n 
-0000232236 00000 n 
-0000232554 00000 n 
-0000232610 00000 n 
-0000232771 00000 n 
-0000232826 00000 n 
-0000232882 00000 n 
-0000232938 00000 n 
-0000232994 00000 n 
-0000250890 00000 n 
-0000251165 00000 n 
-0000251316 00000 n 
-0000251372 00000 n 
-0000251428 00000 n 
-0000251484 00000 n 
-0000251540 00000 n 
-0000251596 00000 n 
-0000251652 00000 n 
-0000251708 00000 n 
-0000251765 00000 n 
-0000251927 00000 n 
-0000265584 00000 n 
-0000265854 00000 n 
-0000265899 00000 n 
-0000265956 00000 n 
-0000266013 00000 n 
-0000266070 00000 n 
-0000266128 00000 n 
-0000266425 00000 n 
-0000266482 00000 n 
-0000266540 00000 n 
-0000266702 00000 n 
-0000266760 00000 n 
-0000266818 00000 n 
-0000266875 00000 n 
-0000286022 00000 n 
-0000286300 00000 n 
-0000286357 00000 n 
-0000286499 00000 n 
-0000286545 00000 n 
-0000286603 00000 n 
-0000286661 00000 n 
-0000286719 00000 n 
-0000286883 00000 n 
-0000286940 00000 n 
-0000304246 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 
+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 
-0000304561 00000 n 
-0000304618 00000 n 
-0000304675 00000 n 
-0000304839 00000 n 
-0000304896 00000 n 
-0000304953 00000 n 
-0000305010 00000 n 
-0000305068 00000 n 
-0000324196 00000 n 
-0000324482 00000 n 
-0000324634 00000 n 
-0000324691 00000 n 
-0000324748 00000 n 
-0000324805 00000 n 
-0000324863 00000 n 
-0000325026 00000 n 
-0000325083 00000 n 
-0000325383 00000 n 
-0000325441 00000 n 
-0000325499 00000 n 
-0000325823 00000 n 
-0000325881 00000 n 
-0000326044 00000 n 
-0000344394 00000 n 
-0000344680 00000 n 
-0000344725 00000 n 
-0000344782 00000 n 
-0000344839 00000 n 
-0000344896 00000 n 
-0000345059 00000 n 
-0000345116 00000 n 
-0000345173 00000 n 
-0000345231 00000 n 
-0000345388 00000 n 
-0000345446 00000 n 
-0000345610 00000 n 
-0000345668 00000 n 
-0000362759 00000 n 
-0000363045 00000 n 
-0000363090 00000 n 
-0000363147 00000 n 
-0000363204 00000 n 
-0000363367 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 
-0000363602 00000 n 
-0000363659 00000 n 
-0000363717 00000 n 
-0000363775 00000 n 
-0000364058 00000 n 
-0000364116 00000 n 
-0000364273 00000 n 
-0000380607 00000 n 
-0000380885 00000 n 
-0000380930 00000 n 
-0000381474 00000 n 
-0000381636 00000 n 
-0000381693 00000 n 
-0000381750 00000 n 
-0000381807 00000 n 
-0000381864 00000 n 
-0000381921 00000 n 
-0000382084 00000 n 
-0000382142 00000 n 
-0000382199 00000 n 
-0000382256 00000 n 
-0000397495 00000 n 
-0000397773 00000 n 
-0000397818 00000 n 
-0000397977 00000 n 
-0000398034 00000 n 
-0000398091 00000 n 
-0000398148 00000 n 
-0000398205 00000 n 
-0000398365 00000 n 
-0000398423 00000 n 
-0000398480 00000 n 
-0000398538 00000 n 
-0000398596 00000 n 
-0000413344 00000 n 
-0000413614 00000 n 
-0000413671 00000 n 
-0000413728 00000 n 
-0000413785 00000 n 
-0000413842 00000 n 
-0000414001 00000 n 
-0000414059 00000 n 
-0000414457 00000 n 
-0000414515 00000 n 
-0000414573 00000 n 
-0000433834 00000 n 
-0000434112 00000 n 
-0000434158 00000 n 
-0000434307 00000 n 
-0000434364 00000 n 
-0000434422 00000 n 
-0000434468 00000 n 
-0000434514 00000 n 
-0000434685 00000 n 
-0000434743 00000 n 
-0000434801 00000 n 
-0000434859 00000 n 
-0000443511 00000 n 
-0000443781 00000 n 
-0000443826 00000 n 
-0000443883 00000 n 
-0000443940 00000 n 
-0000444262 00000 n 
-0000444319 00000 n 
-0000444490 00000 n 
-0000444547 00000 n 
-0000461747 00000 n 
-0000462004 00000 n 
-0000462049 00000 n 
-0000462106 00000 n 
-0000462152 00000 n 
-0000462210 00000 n 
-0000462388 00000 n 
-0000482294 00000 n 
-0000482551 00000 n 
-0000482597 00000 n 
-0000482751 00000 n 
-0000482809 00000 n 
-0000483115 00000 n 
-0000503663 00000 n 
-0000503936 00000 n 
-0000504097 00000 n 
-0000504154 00000 n 
-0000504211 00000 n 
-0000504381 00000 n 
-0000504548 00000 n 
-0000525951 00000 n 
-0000526224 00000 n 
-0000526373 00000 n 
-0000526544 00000 n 
-0000526703 00000 n 
-0000526760 00000 n 
-0000548591 00000 n 
-0000548880 00000 n 
-0000549048 00000 n 
-0000549195 00000 n 
-0000549344 00000 n 
-0000549495 00000 n 
-0000549655 00000 n 
-0000549713 00000 n 
-0000572673 00000 n 
-0000572962 00000 n 
-0000573131 00000 n 
-0000573299 00000 n 
-0000573469 00000 n 
-0000573641 00000 n 
-0000573801 00000 n 
-0000595450 00000 n 
-0000595739 00000 n 
-0000595784 00000 n 
-0000595943 00000 n 
-0000596101 00000 n 
-0000596261 00000 n 
-0000596412 00000 n 
-0000596562 00000 n 
-0000619360 00000 n 
-0000619649 00000 n 
-0000619706 00000 n 
-0000619876 00000 n 
-0000620047 00000 n 
-0000620214 00000 n 
-0000620386 00000 n 
-0000620561 00000 n 
-0000642834 00000 n 
-0000643115 00000 n 
-0000643255 00000 n 
-0000643431 00000 n 
-0000643488 00000 n 
-0000643657 00000 n 
-0000643844 00000 n 
-0000664517 00000 n 
-0000664790 00000 n 
-0000664835 00000 n 
-0000664998 00000 n 
-0000665044 00000 n 
-0000665233 00000 n 
-0000665395 00000 n 
-0000686061 00000 n 
-0000686334 00000 n 
-0000686391 00000 n 
-0000686823 00000 n 
-0000686999 00000 n 
-0000687171 00000 n 
-0000687228 00000 n 
-0000687397 00000 n 
-0000707619 00000 n 
-0000707908 00000 n 
-0000708057 00000 n 
-0000708232 00000 n 
-0000708397 00000 n 
-0000708560 00000 n 
-0000708617 00000 n 
-0000708675 00000 n 
-0000708845 00000 n 
-0000730450 00000 n 
-0000730739 00000 n 
-0000730888 00000 n 
-0000731031 00000 n 
-0000731206 00000 n 
-0000731350 00000 n 
-0000731396 00000 n 
-0000731565 00000 n 
-0000745129 00000 n 
-0000745402 00000 n 
-0000745577 00000 n 
-0000745623 00000 n 
-0000745783 00000 n 
-0000745952 00000 n 
-0000746096 00000 n 
-0000746241 00000 n 
-0000746406 00000 n 
-0000746562 00000 n 
-0000746720 00000 n 
-0000746867 00000 n 
-0000747029 00000 n 
-0000747171 00000 n 
-0000747337 00000 n 
-0000747482 00000 n 
-0000747639 00000 n 
-0000747785 00000 n 
-0000747941 00000 n 
-0000748086 00000 n 
-0000748242 00000 n 
-0000748387 00000 n 
-0000748546 00000 n 
-0000748694 00000 n 
-0000748852 00000 n 
-0000748999 00000 n 
-0000749166 00000 n 
-0000749312 00000 n 
-0000749472 00000 n 
-0000749621 00000 n 
-0000749779 00000 n 
-0000749926 00000 n 
-0000750082 00000 n 
-0000750228 00000 n 
-0000750388 00000 n 
-0000750537 00000 n 
-0000750697 00000 n 
-0000750846 00000 n 
-0000751002 00000 n 
-0000751148 00000 n 
-0000751316 00000 n 
-0000751463 00000 n 
-0000751622 00000 n 
-0000751770 00000 n 
-0000751926 00000 n 
-0000752072 00000 n 
-0000752232 00000 n 
-0000752381 00000 n 
-0000752548 00000 n 
-0000752694 00000 n 
-0000752854 00000 n 
-0000753003 00000 n 
-0000753161 00000 n 
-0000753308 00000 n 
-0000753476 00000 n 
-0000753623 00000 n 
-0000753795 00000 n 
-0000753946 00000 n 
-0000754105 00000 n 
-0000754253 00000 n 
-0000754411 00000 n 
-0000754558 00000 n 
-0000754713 00000 n 
-0000754858 00000 n 
-0000755030 00000 n 
-0000755181 00000 n 
-0000755342 00000 n 
-0000755492 00000 n 
-0000755651 00000 n 
-0000755800 00000 n 
-0000755960 00000 n 
-0000756109 00000 n 
-0000756276 00000 n 
-0000756422 00000 n 
-0000756592 00000 n 
-0000756741 00000 n 
-0000756900 00000 n 
-0000757048 00000 n 
-0000757194 00000 n 
-0000757329 00000 n 
-0000757484 00000 n 
-0000757618 00000 n 
-0000757777 00000 n 
-0000757915 00000 n 
-0000758063 00000 n 
-0000758201 00000 n 
-0000758370 00000 n 
-0000758518 00000 n 
-0000758683 00000 n 
-0000758828 00000 n 
-0000758998 00000 n 
-0000759147 00000 n 
-0000759306 00000 n 
-0000759455 00000 n 
-0000759624 00000 n 
-0000759772 00000 n 
-0000759936 00000 n 
-0000760081 00000 n 
-0000760251 00000 n 
-0000760400 00000 n 
-0000760559 00000 n 
-0000760708 00000 n 
-0000760866 00000 n 
-0000761013 00000 n 
-0000761182 00000 n 
-0000761330 00000 n 
-0000761497 00000 n 
-0000761643 00000 n 
-0000761814 00000 n 
-0000761964 00000 n 
-0000762124 00000 n 
-0000762274 00000 n 
-0000762438 00000 n 
-0000762583 00000 n 
-0000762753 00000 n 
-0000762902 00000 n 
-0000763062 00000 n 
-0000763212 00000 n 
-0000763383 00000 n 
-0000763533 00000 n 
-0000763690 00000 n 
-0000763836 00000 n 
-0000763995 00000 n 
-0000764144 00000 n 
-0000764313 00000 n 
-0000764461 00000 n 
-0000764617 00000 n 
-0000764763 00000 n 
-0000764935 00000 n 
-0000765086 00000 n 
-0000765246 00000 n 
-0000765396 00000 n 
-0000765565 00000 n 
-0000765713 00000 n 
-0000765880 00000 n 
-0000766027 00000 n 
-0000766200 00000 n 
-0000766352 00000 n 
-0000766513 00000 n 
-0000766664 00000 n 
-0000766835 00000 n 
-0000766985 00000 n 
-0000767152 00000 n 
-0000767299 00000 n 
-0000767472 00000 n 
-0000767624 00000 n 
-0000767785 00000 n 
-0000767936 00000 n 
-0000768106 00000 n 
-0000768255 00000 n 
-0000768419 00000 n 
-0000768581 00000 n 
-0000768722 00000 n 
-0000768864 00000 n 
-0000769024 00000 n 
-0000769162 00000 n 
-0000769310 00000 n 
-0000769447 00000 n 
-0000769605 00000 n 
-0000769741 00000 n 
-0000769907 00000 n 
-0000770051 00000 n 
-0000770222 00000 n 
-0000770371 00000 n 
-0000770530 00000 n 
-0000770678 00000 n 
-0000770847 00000 n 
-0000770994 00000 n 
-0000771149 00000 n 
-0000771293 00000 n 
-0000771464 00000 n 
-0000771613 00000 n 
-0000771772 00000 n 
-0000771920 00000 n 
-0000772089 00000 n 
-0000772236 00000 n 
-0000772402 00000 n 
-0000772546 00000 n 
-0000772717 00000 n 
-0000772866 00000 n 
-0000773026 00000 n 
-0000773175 00000 n 
-0000773345 00000 n 
-0000773493 00000 n 
-0000773658 00000 n 
-0000773803 00000 n 
-0000773974 00000 n 
-0000774123 00000 n 
-0000774282 00000 n 
-0000774430 00000 n 
-0000774600 00000 n 
-0000774748 00000 n 
-0000774914 00000 n 
-0000775060 00000 n 
-0000775232 00000 n 
-0000775382 00000 n 
-0000775541 00000 n 
-0000775689 00000 n 
-0000775847 00000 n 
-0000775993 00000 n 
-0000776163 00000 n 
-0000776311 00000 n 
-0000776478 00000 n 
-0000776623 00000 n 
-0000776795 00000 n 
-0000776945 00000 n 
-0000777104 00000 n 
-0000777252 00000 n 
-0000777412 00000 n 
-0000777560 00000 n 
-0000777731 00000 n 
-0000777880 00000 n 
-0000778045 00000 n 
-0000778191 00000 n 
-0000778364 00000 n 
-0000778515 00000 n 
-0000778676 00000 n 
-0000778826 00000 n 
-0000778986 00000 n 
-0000779134 00000 n 
-0000779305 00000 n 
-0000779454 00000 n 
-0000779611 00000 n 
-0000779756 00000 n 
-0000779925 00000 n 
-0000780072 00000 n 
-0000780231 00000 n 
-0000780379 00000 n 
-0000780536 00000 n 
-0000780671 00000 n 
-0000780823 00000 n 
-0000780956 00000 n 
-0000781116 00000 n 
-0000781254 00000 n 
-0000781402 00000 n 
-0000781539 00000 n 
-0000781697 00000 n 
-0000781843 00000 n 
-0000782012 00000 n 
-0000782159 00000 n 
-0000782323 00000 n 
-0000782467 00000 n 
-0000782626 00000 n 
-0000782774 00000 n 
-0000782943 00000 n 
-0000783090 00000 n 
-0000783256 00000 n 
-0000783400 00000 n 
-0000783571 00000 n 
-0000783720 00000 n 
-0000783879 00000 n 
-0000784027 00000 n 
-0000784196 00000 n 
-0000784343 00000 n 
-0000784509 00000 n 
-0000784653 00000 n 
-0000784825 00000 n 
-0000784975 00000 n 
-0000785135 00000 n 
-0000785284 00000 n 
-0000785454 00000 n 
-0000785602 00000 n 
-0000785768 00000 n 
-0000785912 00000 n 
-0000786083 00000 n 
-0000786232 00000 n 
-0000786392 00000 n 
-0000786541 00000 n 
-0000786701 00000 n 
-0000786849 00000 n 
-0000787019 00000 n 
-0000787167 00000 n 
-0000787323 00000 n 
-0000787467 00000 n 
-0000787626 00000 n 
-0000787774 00000 n 
-0000787944 00000 n 
-0000788092 00000 n 
-0000788248 00000 n 
-0000788393 00000 n 
-0000788553 00000 n 
-0000788702 00000 n 
-0000788871 00000 n 
-0000789018 00000 n 
-0000789186 00000 n 
-0000789332 00000 n 
-0000789505 00000 n 
-0000789656 00000 n 
-0000789817 00000 n 
-0000789967 00000 n 
-0000790138 00000 n 
-0000790287 00000 n 
-0000790458 00000 n 
-0000790607 00000 n 
-0000790783 00000 n 
-0000790937 00000 n 
-0000791112 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 
-0000791424 00000 n 
-0000791571 00000 n 
-0000791734 00000 n 
-0000791885 00000 n 
-0000792049 00000 n 
-0000792202 00000 n 
-0000792358 00000 n 
-0000792504 00000 n 
-0000792660 00000 n 
-0000792794 00000 n 
-0000792949 00000 n 
-0000793082 00000 n 
-0000793239 00000 n 
-0000793374 00000 n 
-0000793545 00000 n 
-0000793694 00000 n 
-0000793856 00000 n 
-0000793996 00000 n 
-0000794159 00000 n 
-0000794311 00000 n 
-0000794476 00000 n 
-0000794619 00000 n 
-0000794789 00000 n 
-0000794937 00000 n 
-0000795121 00000 n 
-0000795285 00000 n 
-0000795461 00000 n 
-0000795615 00000 n 
-0000795779 00000 n 
-0000795921 00000 n 
-0000796096 00000 n 
-0000796249 00000 n 
-0000796418 00000 n 
-0000796565 00000 n 
-0000796731 00000 n 
-0000796875 00000 n 
-0000797160 00000 n 
-0000797239 00000 n 
-0000797403 00000 n 
-0000797594 00000 n 
-0000797822 00000 n 
-0000798039 00000 n 
-0000798209 00000 n 
-0000798427 00000 n 
-0000798673 00000 n 
-0000798846 00000 n 
-0000799027 00000 n 
-0000799292 00000 n 
-0000799477 00000 n 
-0000799658 00000 n 
-0000799939 00000 n 
-0000800124 00000 n 
-0000800305 00000 n 
-0000800562 00000 n 
-0000800735 00000 n 
-0000800916 00000 n 
-0000801172 00000 n 
-0000801361 00000 n 
-0000801560 00000 n 
-0000801755 00000 n 
-0000801936 00000 n 
-0000802257 00000 n 
-0000802443 00000 n 
-0000802612 00000 n 
-0000802936 00000 n 
-0000803125 00000 n 
-0000803324 00000 n 
-0000803505 00000 n 
-0000803789 00000 n 
-0000803979 00000 n 
-0000804179 00000 n 
-0000804375 00000 n 
-0000804544 00000 n 
-0000804840 00000 n 
-0000805029 00000 n 
-0000805228 00000 n 
-0000805409 00000 n 
-0000805794 00000 n 
-0000805988 00000 n 
-0000806191 00000 n 
-0000806377 00000 n 
-0000806889 00000 n 
-0000807082 00000 n 
-0000807286 00000 n 
-0000807471 00000 n 
-0000807896 00000 n 
-0000808090 00000 n 
-0000808294 00000 n 
-0000808493 00000 n 
-0000808678 00000 n 
-0000808986 00000 n 
-0000809179 00000 n 
-0000809368 00000 n 
-0000809676 00000 n 
-0000809869 00000 n 
-0000810073 00000 n 
-0000810247 00000 n 
-0000810532 00000 n 
-0000810722 00000 n 
-0000810908 00000 n 
-0000811230 00000 n 
-0000811424 00000 n 
-0000811629 00000 n 
-0000811816 00000 n 
-0000812342 00000 n 
-0000812536 00000 n 
-0000812740 00000 n 
-0000812915 00000 n 
-0000813433 00000 n 
-0000813628 00000 n 
-0000813833 00000 n 
-0000814019 00000 n 
-0000814596 00000 n 
-0000814790 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 
-0000815180 00000 n 
-0000815493 00000 n 
-0000815687 00000 n 
-0000815892 00000 n 
-0000816078 00000 n 
-0000816379 00000 n 
-0000816573 00000 n 
-0000816778 00000 n 
-0000816964 00000 n 
-0000817274 00000 n 
-0000817469 00000 n 
-0000817674 00000 n 
-0000817848 00000 n 
-0000818165 00000 n 
-0000818359 00000 n 
-0000818563 00000 n 
-0000818749 00000 n 
-0000819126 00000 n 
-0000819321 00000 n 
-0000819526 00000 n 
-0000819727 00000 n 
-0000819901 00000 n 
-0000820286 00000 n 
-0000820480 00000 n 
-0000820685 00000 n 
-0000820885 00000 n 
-0000821072 00000 n 
-0000821462 00000 n 
-0000821657 00000 n 
-0000821849 00000 n 
-0000822049 00000 n 
-0000822235 00000 n 
-0000822516 00000 n 
-0000822710 00000 n 
-0000822914 00000 n 
-0000823101 00000 n 
-0000823394 00000 n 
-0000823588 00000 n 
-0000823780 00000 n 
-0000823980 00000 n 
-0000824166 00000 n 
-0000824455 00000 n 
-0000824645 00000 n 
-0000824832 00000 n 
-0000825297 00000 n 
-0000825492 00000 n 
-0000825697 00000 n 
-0000825883 00000 n 
-0000826328 00000 n 
-0000826522 00000 n 
-0000826726 00000 n 
-0000826913 00000 n 
-0000827359 00000 n 
-0000827554 00000 n 
-0000827747 00000 n 
-0000827947 00000 n 
-0000828134 00000 n 
-0000828380 00000 n 
-0000828559 00000 n 
-0000828746 00000 n 
-0000829028 00000 n 
-0000829219 00000 n 
-0000829393 00000 n 
-0000829696 00000 n 
-0000829890 00000 n 
-0000830094 00000 n 
-0000830280 00000 n 
-0000830508 00000 n 
-0000830714 00000 n 
-0000830919 00000 n 
-0000831116 00000 n 
-0000831329 00000 n 
-0000831554 00000 n 
-0000831798 00000 n 
-0000831990 00000 n 
-0000832178 00000 n 
-0000832375 00000 n 
-0000832575 00000 n 
-0000832751 00000 n 
-0000832975 00000 n 
-0000833151 00000 n 
-0000833348 00000 n 
-0000833620 00000 n 
-0000833852 00000 n 
-0000834036 00000 n 
-0000834265 00000 n 
-0000834458 00000 n 
-0000834621 00000 n 
-0000835261 00000 n 
-0000843269 00000 n 
-0000843485 00000 n 
-0000844848 00000 n 
-0000845915 00000 n 
-0000853667 00000 n 
-0000853888 00000 n 
-0000855251 00000 n 
-0000856328 00000 n 
-0000859589 00000 n 
-0000859815 00000 n 
-0000861178 00000 n 
-0000862294 00000 n 
-0000864437 00000 n 
-0000864651 00000 n 
-0000866014 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 859
+<< /Size 860
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-867140
+864872
 %%EOF
diff --git a/extra/bin-for-dev/start-db.sh b/extra/bin-for-dev/start-db.sh
index 99286fccb..97f8de1f5 100755
--- a/extra/bin-for-dev/start-db.sh
+++ b/extra/bin-for-dev/start-db.sh
@@ -26,7 +26,7 @@
 docker-compose -f ../docker/clamp/docker-compose.yml up -d db
 
 if [ "$1" = "test" ]; then
-    while ! (docker logs clamp_db_1  2>&1 | grep "socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution" > /dev/null);
+    while ! (docker logs clamp_db_1  2>&1 | grep "socket: '/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution" > /dev/null);
     do   
       echo "Waiting Mysql to be up with CLDSDB4 db loaded before loading the TEST DATA ..."
       sleep 3
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index 15ac2551c..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','admin','2020-08-03 15:22:46.896924','admin','2020-08-03 15:22:46.896924',0,'');
-INSERT INTO `dictionary` VALUES ('DefaultOperations','admin','2020-08-03 15:22:46.928662','admin','2020-08-03 15:22:46.928662',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','admin','2020-08-03 15:22:46.914230','admin','2020-08-03 15:22:46.914230','APPC component','APPC',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('BandwidthOnDemand (SDNC operation)','admin','2020-08-03 15:22:46.930700','admin','2020-08-03 15:22:46.930700','SDNC operation','BandwidthOnDemand',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Health-Check (APPC operation)','admin','2020-08-03 15:22:46.946269','admin','2020-08-03 15:22:46.946269','APPC operation','Health-Check',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Migrate (APPC operation)','admin','2020-08-03 15:22:46.944253','admin','2020-08-03 15:22:46.944253','APPC operation','Migrate',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('ModifyConfig (APPC/VFC operation)','admin','2020-08-03 15:22:46.940378','admin','2020-08-03 15:22:46.940378','APPC/VFC operation','ModifyConfig',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Rebuild (APPC operation)','admin','2020-08-03 15:22:46.938606','admin','2020-08-03 15:22:46.938606','APPC operation','Rebuild',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Reroute (SDNC operation)','admin','2020-08-03 15:22:46.934812','admin','2020-08-03 15:22:46.934812','SDNC operation','Reroute',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('Restart (APPC operation)','admin','2020-08-03 15:22:46.942188','admin','2020-08-03 15:22:46.942188','APPC operation','Restart',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('SDNC','admin','2020-08-03 15:22:46.908861','admin','2020-08-03 15:22:46.908861','SDNC component','SDNC',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('SDNR','admin','2020-08-03 15:22:46.906526','admin','2020-08-03 15:22:46.906526','SDNR component','SDNR',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('SO','admin','2020-08-03 15:22:46.912430','admin','2020-08-03 15:22:46.912430','SO component','SO',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('VF Module Create (SO operation)','admin','2020-08-03 15:22:46.936786','admin','2020-08-03 15:22:46.936786','SO operation','VF Module Create',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('VF Module Delete (SO operation)','admin','2020-08-03 15:22:46.932797','admin','2020-08-03 15:22:46.932797','SO operation','VF Module Delete',NULL,'string');
-INSERT INTO `dictionary_elements` VALUES ('VFC','admin','2020-08-03 15:22:46.910502','admin','2020-08-03 15:22:46.910502','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-08-03 15:21:33.039868','Not found','2020-08-03 15:21:33.246281',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_xektp_v1_0_ResourceInstanceName1_tca','Not found','2020-08-03 15:21:33.219214','Not found','2020-08-03 15:21:33.219214','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-2f2efca0-ce95-48e1-951d-388fe9cb1c0b',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName1_tca_3','Not found','2020-08-03 15:21:33.140295','Not found','2020-08-03 15:21:33.140295','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-bab9e4e8-fc3e-47a3-bea3-060167a12c25',0,1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName2_tca_2','Not found','2020-08-03 15:21:33.014894','Not found','2020-08-03 15:21:33.014894','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-79ee1dcc-803e-4d17-8da5-c84cae49ce5e',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_xektp_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_xektp_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_xektp_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,13 +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-08-03 15:21:52.164440','Not found','2020-08-03 15:21:52.327023','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-08-03 15:21:52.110465','Not found','2020-08-03 15:21:52.338404','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-08-03 15:21:52.208290','Not found','2020-08-03 15:21:52.208290','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','1.0.0','Not found','2020-08-03 15:21:17.644583','Not found','2020-08-03 15:21:52.348204','OperationalPolicyLegacy','','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"apex\",\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-08-03 15:21:52.034695','Not found','2020-08-03 15:21:52.360000','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-08-03 15:21:51.857883','Not found','2020-08-03 15:21:52.370263','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-08-03 15:21:32.844607','Not found','2020-08-03 15:21:52.383500','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','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+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;
 
@@ -198,7 +197,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `services` WRITE;
 /*!40000 ALTER TABLE `services` DISABLE KEYS */;
-INSERT INTO `services` VALUES ('63cac700-ab9a-4115-a74f-7eac85e3fce0','vLoadBalancerMS','{\n  \"CP\": {},\n  \"VL\": {},\n  \"VF\": {\n    \"vLoadBalancerMS 0\": {\n      \"resourceVendor\": \"Test\",\n      \"name\": \"vLoadBalancerMS\",\n      \"resourceVendorModelNumber\": \"\",\n      \"description\": \"vLBMS\",\n      \"invariantUUID\": \"1a31b9f2-e50d-43b7-89b3-a040250cf506\",\n      \"UUID\": \"b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6\",\n      \"type\": \"VF\",\n      \"category\": \"Application L4+\",\n      \"subcategory\": \"Load Balancer\",\n      \"version\": \"1.0\",\n      \"customizationUUID\": \"465246dc-7748-45f4-a013-308d92922552\",\n      \"resourceVendorRelease\": \"1.0\",\n      \"controllerProperties\": {\n        \"sdnc_model_name\": \"baseconfiguration\",\n        \"sdnc_model_version\": \"1.0.0\",\n        \"workflows\": {\n          \"resource-assignment\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"service-instance-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"action-name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"scope-type\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"hostname\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf_name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                }\n              }\n            }\n          },\n          \"activate\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"service-instance-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"action-name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"scope-type\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"hostname\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf_name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                }\n              }\n            }\n          },\n          \"activate-restconf\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"service-instance-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"action-name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"scope-type\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"hostname\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf_name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                }\n              }\n            }\n          },\n          \"activate-cli\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"service-instance-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"action-name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"scope-type\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"hostname\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf_name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                }\n              }\n            }\n          },\n          \"assign-activate\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"service-instance-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"action-name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"scope-type\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"hostname\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf_name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                }\n              }\n            }\n          },\n          \"imperative-test-wf\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"service-instance-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf-id\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"action-name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"scope-type\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"hostname\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                },\n                \"vnf_name\": {\n                  \"required\": true,\n                  \"type\": \"string\"\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  },\n  \"CR\": {},\n  \"VFC\": {},\n  \"PNF\": {},\n  \"Service\": {},\n  \"CVFC\": {},\n  \"Service Proxy\": {},\n  \"Configuration\": {},\n  \"AllottedResource\": {},\n  \"VFModule\": {\n    \"Vloadbalancerms..vpkg..module-1\": {\n      \"vfModuleModelInvariantUUID\": \"ca052563-eb92-4b5b-ad41-9111768ce043\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vpkg..module-1\",\n      \"vfModuleModelUUID\": \"1e725ccc-b823-4f67-82b9-4f4367070dbc\",\n      \"vfModuleModelCustomizationUUID\": \"1bffdc31-a37d-4dee-b65c-dde623a76e52\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vpkg\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vdns..module-3\": {\n      \"vfModuleModelInvariantUUID\": \"4c10ba9b-f88f-415e-9de3-5d33336047fa\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vdns..module-3\",\n      \"vfModuleModelUUID\": \"4fa73b49-8a6c-493e-816b-eb401567b720\",\n      \"vfModuleModelCustomizationUUID\": \"bafcdab0-801d-4d81-9ead-f464640a38b1\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vdns\",\n      \"max_vf_module_instances\": 50,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..base_template..module-0\": {\n      \"vfModuleModelInvariantUUID\": \"921f7c96-ebdd-42e6-81b9-1cfc0c9796f3\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..base_template..module-0\",\n      \"vfModuleModelUUID\": \"63734409-f745-4e4d-a38b-131638a0edce\",\n      \"vfModuleModelCustomizationUUID\": \"86baddea-c730-4fb8-9410-cd2e17fd7f27\",\n      \"min_vf_module_instances\": 1,\n      \"vf_module_label\": \"base_template\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Base\",\n      \"isBase\": true,\n      \"initial_count\": 1,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vlb..module-2\": {\n      \"vfModuleModelInvariantUUID\": \"a772a1f4-0064-412c-833d-4749b15828dd\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vlb..module-2\",\n      \"vfModuleModelUUID\": \"0f5c3f6a-650a-4303-abb6-fff3e573a07a\",\n      \"vfModuleModelCustomizationUUID\": \"96a78aad-4ffb-4ef0-9c4f-deb03bf1d806\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vlb\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    }\n  }\n}','{\n  \"serviceType\": \"\",\n  \"serviceRole\": \"\",\n  \"description\": \"vLBMS\",\n  \"type\": \"Service\",\n  \"instantiationType\": \"A-la-carte\",\n  \"namingPolicy\": \"\",\n  \"serviceEcompNaming\": \"true\",\n  \"environmentContext\": \"General_Revenue-Bearing\",\n  \"name\": \"vLoadBalancerMS\",\n  \"invariantUUID\": \"30ec5b59-4799-48d8-ac5f-1058a6b0e48f\",\n  \"ecompGeneratedNaming\": \"true\",\n  \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\",\n  \"category\": \"Network L4+\"\n}','1.0');
+INSERT INTO `services` VALUES ('63cac700-ab9a-4115-a74f-7eac85e3fce0','vLoadBalancerMS','{\n  \"CP\": {},\n  \"VL\": {},\n  \"VF\": {\n    \"vLoadBalancerMS 0\": {\n      \"resourceVendor\": \"Test\",\n      \"name\": \"vLoadBalancerMS\",\n      \"resourceVendorModelNumber\": \"\",\n      \"description\": \"vLBMS\",\n      \"invariantUUID\": \"1a31b9f2-e50d-43b7-89b3-a040250cf506\",\n      \"UUID\": \"b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6\",\n      \"type\": \"VF\",\n      \"category\": \"Application L4+\",\n      \"subcategory\": \"Load Balancer\",\n      \"version\": \"1.0\",\n      \"customizationUUID\": \"465246dc-7748-45f4-a013-308d92922552\",\n      \"resourceVendorRelease\": \"1.0\",\n      \"controllerProperties\": {\n        \"sdnc_model_name\": \"baseconfiguration\",\n        \"sdnc_model_version\": \"1.0.0\",\n        \"workflows\": {\n          \"resource-assignment\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"type\": \"object\",\n                \"properties\": {\n                  \"request-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"service-instance-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"hostname\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"request-info\": {\n                    \"type\": \"object\",\n                    \"properties\": {\n                      \"prop1\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      },\n                      \"prop2\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          },\n          \"activate\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"type\": \"object\",\n                \"properties\": {\n                  \"request-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"service-instance-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"hostname\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"request-info\": {\n                    \"type\": \"object\",\n                    \"properties\": {\n                      \"prop1\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      },\n                      \"prop2\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          },\n          \"activate-restconf\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"type\": \"object\",\n                \"properties\": {\n                  \"request-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"service-instance-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"hostname\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"request-info\": {\n                    \"type\": \"object\",\n                    \"properties\": {\n                      \"prop1\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      },\n                      \"prop2\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          },\n          \"activate-cli\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"type\": \"object\",\n                \"properties\": {\n                  \"request-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"service-instance-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"hostname\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"request-info\": {\n                    \"type\": \"object\",\n                    \"properties\": {\n                      \"prop1\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      },\n                      \"prop2\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          },\n          \"assign-activate\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"type\": \"object\",\n                \"properties\": {\n                  \"request-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"service-instance-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"hostname\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"request-info\": {\n                    \"type\": \"object\",\n                    \"properties\": {\n                      \"prop1\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      },\n                      \"prop2\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          },\n          \"imperative-test-wf\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"type\": \"object\",\n                \"properties\": {\n                  \"request-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"service-instance-id\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"hostname\": {\n                    \"required\": true,\n                    \"type\": \"string\",\n                    \"input-param\": true\n                  },\n                  \"request-info\": {\n                    \"type\": \"object\",\n                    \"properties\": {\n                      \"prop1\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      },\n                      \"prop2\": {\n                        \"required\": true,\n                        \"type\": \"string\",\n                        \"input-param\": true\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  },\n  \"CR\": {},\n  \"VFC\": {},\n  \"PNF\": {},\n  \"Service\": {},\n  \"CVFC\": {},\n  \"Service Proxy\": {},\n  \"Configuration\": {},\n  \"AllottedResource\": {},\n  \"VFModule\": {\n    \"Vloadbalancerms..vpkg..module-1\": {\n      \"vfModuleModelInvariantUUID\": \"ca052563-eb92-4b5b-ad41-9111768ce043\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vpkg..module-1\",\n      \"vfModuleModelUUID\": \"1e725ccc-b823-4f67-82b9-4f4367070dbc\",\n      \"vfModuleModelCustomizationUUID\": \"1bffdc31-a37d-4dee-b65c-dde623a76e52\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vpkg\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vdns..module-3\": {\n      \"vfModuleModelInvariantUUID\": \"4c10ba9b-f88f-415e-9de3-5d33336047fa\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vdns..module-3\",\n      \"vfModuleModelUUID\": \"4fa73b49-8a6c-493e-816b-eb401567b720\",\n      \"vfModuleModelCustomizationUUID\": \"bafcdab0-801d-4d81-9ead-f464640a38b1\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vdns\",\n      \"max_vf_module_instances\": 50,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..base_template..module-0\": {\n      \"vfModuleModelInvariantUUID\": \"921f7c96-ebdd-42e6-81b9-1cfc0c9796f3\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..base_template..module-0\",\n      \"vfModuleModelUUID\": \"63734409-f745-4e4d-a38b-131638a0edce\",\n      \"vfModuleModelCustomizationUUID\": \"86baddea-c730-4fb8-9410-cd2e17fd7f27\",\n      \"min_vf_module_instances\": 1,\n      \"vf_module_label\": \"base_template\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Base\",\n      \"isBase\": true,\n      \"initial_count\": 1,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vlb..module-2\": {\n      \"vfModuleModelInvariantUUID\": \"a772a1f4-0064-412c-833d-4749b15828dd\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vlb..module-2\",\n      \"vfModuleModelUUID\": \"0f5c3f6a-650a-4303-abb6-fff3e573a07a\",\n      \"vfModuleModelCustomizationUUID\": \"96a78aad-4ffb-4ef0-9c4f-deb03bf1d806\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vlb\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    }\n  }\n}','{\n  \"serviceType\": \"\",\n  \"serviceRole\": \"\",\n  \"description\": \"vLBMS\",\n  \"type\": \"Service\",\n  \"instantiationType\": \"A-la-carte\",\n  \"namingPolicy\": \"\",\n  \"serviceEcompNaming\": \"true\",\n  \"environmentContext\": \"General_Revenue-Bearing\",\n  \"name\": \"vLoadBalancerMS\",\n  \"invariantUUID\": \"30ec5b59-4799-48d8-ac5f-1058a6b0e48f\",\n  \"ecompGeneratedNaming\": \"true\",\n  \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\",\n  \"category\": \"Network L4+\"\n}','1.0');
 /*!40000 ALTER TABLE `services` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -210,4 +209,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-08-03 13:23:55
+-- Dump completed on 2020-12-11 12:09:39
diff --git a/pom.xml b/pom.xml
index 6ab125b05..879bb36bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,6 @@
   Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
-  Modifications Copyright (c) 2020 Nordix
-  ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -28,15 +26,16 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>5.1.1-SNAPSHOT</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>clamp</name>
 
 
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>2.1.0</version>
-	</parent>
+    <parent>
+	    <groupId>org.onap.policy.parent</groupId>
+         <artifactId>integration</artifactId>
+         <version>3.3.0-SNAPSHOT</version>
+         <relativePath />
+    </parent>
 
 	<description>
 	       This is the MAVEN project that builds everything for ONAP CLAMP.
@@ -79,8 +78,7 @@
 
 		<eelf.core.version>1.0.0</eelf.core.version>
 		<camel.version>2.25.2</camel.version>
-		<springboot.version>2.2.9.RELEASE</springboot.version>
-		<policy.models.version>2.3.2-SNAPSHOT</policy.models.version>
+		<springboot.version>2.2.10.RELEASE</springboot.version>
 
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -472,7 +470,7 @@
 		<dependency>
 			<groupId>org.onap.sdc.sdc-distribution-client</groupId>
 			<artifactId>sdc-distribution-client</artifactId>
-			<version>1.3.0</version>
+			<version>1.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.sdc.sdc-tosca</groupId>
@@ -496,18 +494,6 @@
 			<version>2.1.3</version>
 		</dependency>
 
-		<!-- For TOSCA Controlloop  -->
-		<dependency>
-			<groupId>org.onap.policy.models</groupId>
-			<artifactId>policy-models-base</artifactId>
-			<version>${policy.models.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.models</groupId>
-			<artifactId>policy-models-tosca</artifactId>
-			<version>${policy.models.version}</version>
-		</dependency>
-
 		<!-- TESTING -->
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile
index 06a05abf7..8712f1934 100644
--- a/src/main/docker/backend/Dockerfile
+++ b/src/main/docker/backend/Dockerfile
@@ -24,7 +24,7 @@
 FROM onap/integration-java11:7.1.0

 

 MAINTAINER "The Onap Team"

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

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

 

 ARG http_proxy

 ARG https_proxy

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

 ENV http_proxy=$HTTP_PROXY

 ENV https_proxy=$HTTPS_PROXY

+USER root

+RUN mkdir /opt/clamp

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

 

-VOLUME /app/config

+VOLUME /opt/clamp/config

 

-COPY onap-clamp-backend/clamp.jar /app/app.jar
\ No newline at end of file
+COPY --chown=onap:onap onap-clamp-backend/clamp.jar /opt/clamp/app.jar

+

+USER onap

+WORKDIR /opt/clamp/

+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75","-jar" ,"./app.jar"]
\ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java b/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java
deleted file mode 100644
index 2b7ecf94f..000000000
--- a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.clamp.controlloop.models.tosca.authorative.concepts;
-
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
-
-public class ControlLoopToscaServiceTemplate extends ToscaServiceTemplate {
-  //TODO More code to be added
-}
\ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java b/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java
deleted file mode 100644
index 5f125fedd..000000000
--- a/src/main/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaTopologyTemplate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.clamp.controlloop.models.tosca.authorative.concepts;
-
-import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
-
-public class ControlLoopToscaTopologyTemplate extends ToscaTopologyTemplate {
-  //TODO More code to be added
-}
\ No newline at end of file
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 374aab90c..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
@@ -83,7 +83,7 @@ public class SecureServicePermission {
     }
 
     /**
-     * Instantiate permission given type from concatenated string
+     * Instantiate permission given type from concatenated string.
      *
      * @param concatenatedString
      *            the string type|instance|action, less than 3 params can be
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 5908201fd..801f59c31 100644
--- a/src/main/java/org/onap/clamp/clds/ClampServlet.java
+++ b/src/main/java/org/onap/policy/clamp/clds/ClampServlet.java
@@ -23,22 +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 java.io.IOException;
 import java.security.Principal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-
+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;
@@ -69,16 +68,10 @@ public class ClampServlet extends CamelHttpTransportServlet {
 
     private static List<SecureServicePermission> permissionList;
 
-    private synchronized Class loadDynamicAuthenticationClass() {
-        try {
-            String authenticationObject = WebApplicationContextUtils.getWebApplicationContext(getServletContext())
-                    .getEnvironment().getProperty(AUTHENTICATION_CLASS);
-            return Class.forName(authenticationObject);
-        } catch (ClassNotFoundException e) {
-            logger.error(
-                    "Exception caught when attempting to create associated class of config:" + AUTHENTICATION_CLASS, e);
-            return Object.class;
-        }
+    private synchronized List<String> loadDynamicAuthenticationClasses() {
+        return Arrays.stream(WebApplicationContextUtils.getWebApplicationContext(getServletContext())
+                .getEnvironment().getProperty(AUTHENTICATION_CLASS).split(",")).map(className -> className.trim())
+                .collect(Collectors.toList());
     }
 
     private synchronized List<SecureServicePermission> getPermissionList() {
@@ -115,7 +108,8 @@ public class ClampServlet extends CamelHttpTransportServlet {
     @Override
     protected void doService(HttpServletRequest request, HttpServletResponse response) {
         Principal principal = request.getUserPrincipal();
-        if (loadDynamicAuthenticationClass().isInstance(principal)) {
+        if (principal != null && loadDynamicAuthenticationClasses().stream()
+                .anyMatch(className -> className.equals(principal.getClass().getName()))) {
             // When AAF is enabled, there is a need to provision the permissions to Spring
             // system
             List<GrantedAuthority> grantedAuths = new ArrayList<>();
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 fd3b3539a..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;

 

@@ -29,17 +29,15 @@ import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonElement;

 import com.google.gson.JsonObject;

 import com.google.gson.JsonParser;

-

 import java.util.Date;

 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 b24bc99b2..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,14 +22,12 @@
  *

  */

 

-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;

-

 import java.io.IOException;

 import java.util.Date;

-

 import org.apache.camel.CamelContext;

 import org.apache.camel.Exchange;

 import org.apache.camel.builder.ExchangeBuilder;

@@ -37,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 260bd1e48..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;
@@ -87,20 +86,29 @@ public class PolicyEngineServices {
 
     /**
      * This method query Policy engine and create a PolicyModel object with type and version.
+     * If the policy already exist in the db it returns the existing one.
      *
      * @param policyType    The policyType id
      * @param policyVersion The policy version of that type
-     * @return A PolicyModel created from policyEngine data
+     * @return A PolicyModel created from policyEngine data or null if nothing is found on policyEngine
      */
     public PolicyModel createPolicyModelFromPolicyEngine(String policyType, String policyVersion) {
-        if (!policyModelsService.existsById(
-                new PolicyModelId(policyType, policyVersion))) {
-            return policyModelsService.savePolicyModelInNewTransaction(
-                    new PolicyModel(policyType, this.downloadOnePolicy(policyType, policyVersion), policyVersion));
+        PolicyModel policyModelFound = policyModelsService.getPolicyModel(policyType, policyVersion);
+        if (policyModelFound == null) {
+            String policyTosca = this.downloadOnePolicy(policyType, policyVersion);
+            if (policyTosca != null && !policyTosca.isEmpty()) {
+                return policyModelsService.savePolicyModelInNewTransaction(
+                        new PolicyModel(policyType, policyTosca, policyVersion));
+            } else {
+                logger.error("Policy not found in the Policy Engine, returning null: " + policyType
+                        + "/" + policyVersion);
+                return null;
+            }
+        } else {
+            logger.info("Skipping policy model download as it exists already in the database " + policyType
+                    + "/" + policyVersion);
+            return policyModelFound;
         }
-        logger.info("Skipping policy model download as it exists already in the database " + policyType
-                + "/" + policyVersion);
-        return null;
     }
 
     /**
@@ -158,10 +166,17 @@ public class PolicyEngineServices {
         options.setPrettyFlow(true);
         options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yamlParser = new Yaml(options);
-        return yamlParser.dump((Map<String, Object>) yamlParser.load(callCamelRoute(
+        String responseBody = callCamelRoute(
                 ExchangeBuilder.anExchange(camelContext).withProperty("policyModelName", policyType)
                         .withProperty("policyModelVersion", policyVersion).build(), "direct:get-policy-model",
-                "Get one policy")));
+                "Get one policy");
+
+        if (responseBody == null || responseBody.isEmpty()) {
+            logger.warn("getPolicyModel returned by policy engine could not be decoded, as it's null or empty");
+            return null;
+        }
+
+        return yamlParser.dump((Map<String, Object>) yamlParser.load(responseBody));
     }
 
     /**
@@ -196,8 +211,7 @@ public class PolicyEngineServices {
             Exchange exchangeResponse = camelContext.createProducerTemplate().send(camelFlow, exchange);
             if (Integer.valueOf(200).equals(exchangeResponse.getIn().getHeader("CamelHttpResponseCode"))) {
                 return (String) exchangeResponse.getIn().getBody();
-            }
-            else {
+            } else {
                 logger.info(logMsg + " query " + retryInterval + "ms before retrying ...");
                 // wait for a while and try to connect to DCAE again
                 try {
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 d9178cb9a..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,11 +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 7480beb8d..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,15 +21,12 @@
  *
  */
 
-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.util.Properties;
-
 import javax.annotation.Resource;
-
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
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 ad2751bb8..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;
@@ -31,11 +31,9 @@ import java.io.InputStreamReader;
 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 eca45d66f..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,23 +21,20 @@
  *
  */
 
-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;
-
 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 66025c479..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,10 +20,9 @@
  *
  */
 
-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;
 import java.util.List;
 
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 fbb37d525..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,27 +22,26 @@
  *
  */
 
-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;
 import org.onap.sdc.api.consumer.INotificationCallback;
 import org.onap.sdc.api.notification.IArtifactInfo;
@@ -160,7 +159,8 @@ public class SdcSingleController {
      * @param distributionClient the distribution client
      */
     public SdcSingleController(ClampProperties clampProp, CsarInstaller csarInstaller,
-            SdcSingleControllerConfiguration sdcSingleConfig, IDistributionClient distributionClient) {
+                               SdcSingleControllerConfiguration sdcSingleConfig,
+                               IDistributionClient distributionClient) {
         this.distributionClient = distributionClient;
         isSdcClientAutoManaged = (distributionClient == null);
         this.sdcConfig = sdcSingleConfig;
@@ -228,7 +228,8 @@ public class SdcSingleController {
     }
 
     private void sendAllNotificationForCsarHandler(INotificationData notificationData, CsarHandler csar,
-            NotificationType notificationType, DistributionStatusEnum distributionStatus, String errorMessage) {
+                                                   NotificationType notificationType,
+                                                   DistributionStatusEnum distributionStatus, String errorMessage) {
         if (csar != null) {
             // Notify for the CSAR
             this.sendSdcNotification(notificationType, csar.getArtifactElement().getArtifactURL(),
@@ -278,27 +279,33 @@ public class SdcSingleController {
                 sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
                         DistributionStatusEnum.DEPLOY_OK, null);
             }
+            this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_OK, null);
         } catch (SdcArtifactInstallerException | SdcToscaParserException e) {
             logger.error("SdcArtifactInstallerException exception caught during the notification processing", e);
             sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
                     DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+            this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
         } catch (SdcDownloadException | CsarHandlerException e) {
             logger.error("SdcDownloadException exception caught during the notification processing", e);
             sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DOWNLOAD,
                     DistributionStatusEnum.DOWNLOAD_ERROR, e.getMessage());
+            this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
         } catch (InterruptedException e) {
             logger.error("Interrupt exception caught during the notification processing", e);
             sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
                     DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+            this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
             Thread.currentThread().interrupt();
         } catch (BlueprintParserException e) {
             logger.error("BlueprintParser exception caught during the notification processing", e);
             sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
                     DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+            this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
         } catch (RuntimeException e) {
             logger.error("Unexpected exception caught during the notification processing", e);
             sendAllNotificationForCsarHandler(notificationData, csar, NotificationType.DEPLOY,
                     DistributionStatusEnum.DEPLOY_ERROR, e.getMessage());
+            this.sendComponentStatus(notificationData, DistributionStatusEnum.COMPONENT_DONE_ERROR, e.getMessage());
         } finally {
             this.changeControllerStatus(SdcSingleControllerStatus.IDLE);
         }
@@ -341,7 +348,8 @@ public class SdcSingleController {
     }
 
     private void sendSdcNotification(NotificationType notificationType, String artifactUrl, String consumerId,
-            String distributionId, DistributionStatusEnum status, String errorReason, long timestamp) {
+                                     String distributionId, DistributionStatusEnum status, String errorReason,
+                                     long timestamp) {
         String event = "Sending " + notificationType.name() + "(" + status.name() + ")"
                 + " notification to SDC for artifact:" + artifactUrl;
         if (errorReason != null) {
@@ -370,6 +378,43 @@ public class SdcSingleController {
         logger.info("SDC Notification sent successfully(" + action + ")");
     }
 
+    private void sendComponentStatus(INotificationData notificationData, DistributionStatusEnum status,
+                                     String errorReason) {
+        try {
+            IComponentDoneStatusMessage message = new IComponentDoneStatusMessage() {
+
+                @Override public String getDistributionID() {
+                    return notificationData.getDistributionID();
+                }
+
+                @Override public String getConsumerID() {
+                    return sdcConfig.getConsumerID();
+                }
+
+                @Override public long getTimestamp() {
+                    return System.currentTimeMillis();
+                }
+
+                @Override public DistributionStatusEnum getStatus() {
+                    return status;
+                }
+
+                @Override public String getComponentName() {
+                    return sdcConfig.getUser();
+                }
+            };
+
+            if (errorReason != null) {
+                this.distributionClient.sendComponentDoneStatus(message, errorReason);
+            } else {
+                this.distributionClient.sendComponentDoneStatus(message);
+            }
+        } catch (RuntimeException e) {
+            logger.warn("Unable to send the SDC Notification (" + status.name() + ") due to an exception", e);
+        }
+        logger.info("SDC Notification sent successfully(" + status.name() + ")");
+    }
+
     private void sendDownloadStatus(IDistributionStatusMessage message, String errorReason) {
         if (errorReason != null) {
             this.distributionClient.sendDownloadStatus(message, errorReason);
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 5d5027d29..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;
@@ -30,7 +30,6 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-
 import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.HashSet;
@@ -38,9 +37,8 @@ import java.util.List;
 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 2bd259c2b..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,13 +21,12 @@
  *
  */
 
-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;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.springframework.stereotype.Component;
 
 @Component
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 471415a37..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,11 +21,10 @@
  *
  */
 
-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;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -40,11 +39,10 @@ import java.util.Map;
 import java.util.Optional;
 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 9721e33d9..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;
@@ -145,8 +145,7 @@ public class ToscaConverterToJsonSchema {
             if (getToscaElement((String) property.getValue().getItems().get("type")) != null) {
                 jsonSchema.add(property.getValue().getName(),
                         this.getJsonSchemaOfToscaElement((String) property.getValue().getItems().get("type")));
-            }
-            else {
+            } else {
                 jsonSchema.add(property.getValue().getName(), this.complexParse(property.getValue()));
             }
         }
@@ -176,8 +175,7 @@ public class ToscaConverterToJsonSchema {
         String typeProperty = (String) toscaElementProperty.getItems().get("type");
         if (typeProperty.toLowerCase().equals("list") || typeProperty.toLowerCase().equals("map")) {
             currentPropertyJsonTemplate = templates.get("object");
-        }
-        else {
+        } else {
             String propertyType = (String) toscaElementProperty.getItems().get("type");
             currentPropertyJsonTemplate = templates.get(propertyType.toLowerCase());
         }
@@ -264,9 +262,8 @@ public class ToscaConverterToJsonSchema {
                                 break;
                         }
 
-                    }
-                    // Native cases
-                    else if (toscaElementProperty.getItems().get("type").equals("list")) {
+                    } else if (toscaElementProperty.getItems().get("type").equals("list")) {
+                        // Native cases
                         JsonObject itemContainer = new JsonObject();
                         String valueInEntrySchema =
                                 this.extractSpecificFieldFromMap(toscaElementProperty, "entry_schema");
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 33e084279..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;
 
@@ -58,8 +58,7 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
         if (dictionaryService != null) {
             return parseMetadataPossibleValues(toscaElementProperty.getItems(), dictionaryService, serviceModel,
                     toscaMetadataExecutor);
-        }
-        else {
+        } else {
             return null;
         }
     }
@@ -163,8 +162,7 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
         if (dictionaryFullNames.size() > 0) {
             if (childObject.get(JsonEditorSchemaConstants.ENUM) != null) {
                 childObject.get(JsonEditorSchemaConstants.ENUM).getAsJsonArray().add(dictionaryFullNames);
-            }
-            else {
+            } else {
                 childObject.add(JsonEditorSchemaConstants.ENUM, dictionaryFullNames);
             }
             // Add Enum titles for generated translated values during JSON instance
@@ -173,17 +171,14 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
             enumTitles.add(JsonEditorSchemaConstants.ENUM_TITLES, dictionaryNames);
             if (childObject.get(JsonEditorSchemaConstants.OPTIONS) != null) {
                 childObject.get(JsonEditorSchemaConstants.OPTIONS).getAsJsonArray().add(enumTitles);
-            }
-            else {
+            } else {
                 childObject.add(JsonEditorSchemaConstants.OPTIONS, enumTitles);
             }
 
-        }
-        else {
+        } else {
             if (childObject.get(JsonEditorSchemaConstants.ENUM) != null) {
                 childObject.get(JsonEditorSchemaConstants.ENUM).getAsJsonArray().add(dictionaryNames);
-            }
-            else {
+            } else {
                 childObject.add(JsonEditorSchemaConstants.ENUM, dictionaryNames);
             }
         }
@@ -196,8 +191,7 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
                         dictionaryReference.length()).split("#");
         if (dictionaryKeyArray.length > 1) {
             processComplexDictionaryElements(dictionaryKeyArray, childObject, dictionaryService);
-        }
-        else {
+        } else {
             processSimpleDictionaryElements(dictionaryKeyArray, childObject, dictionaryService);
         }
     }
@@ -206,11 +200,9 @@ public class ToscaMetadataParserWithDictionarySupport implements ToscaMetadataPa
         String jsonType = null;
         if (toscaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_INTEGER)) {
             jsonType = JsonEditorSchemaConstants.TYPE_INTEGER;
-        }
-        else if (toscaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
+        } else if (toscaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
             jsonType = JsonEditorSchemaConstants.TYPE_ARRAY;
-        }
-        else {
+        } else {
             jsonType = JsonEditorSchemaConstants.TYPE_STRING;
         }
         return jsonType;
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 f64ba68cf..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;
@@ -197,8 +197,7 @@ public class JsonTemplate {
             if (fieldStaticStatus(fieldName)) {
                 String defaultValue = (String) this.getSpecificField(fieldName).getValue();
                 jsonSchema.addProperty(fieldName, defaultValue);
-            }
-            else {
+            } else {
                 jsonSchema.addProperty(fieldName, value);
             }
         }
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 0b399ba0b..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;
@@ -52,8 +52,7 @@ public class JsonTemplateManager {
         if (toscaYamlContent != null && !toscaYamlContent.isEmpty()) {
             this.toscaElements = ToscaElementParser.searchAllToscaElements(toscaYamlContent, nativeToscaDatatypes);
             this.jsonSchemaTemplates = initializeTemplates(jsonSchemaTemplates);
-        }
-        else {
+        } else {
             toscaElements = null;
         }
     }
@@ -111,10 +110,9 @@ public class JsonTemplateManager {
         if (operation
                 && !this.jsonSchemaTemplates.get(nameTemplate).getJsonTemplateFields().contains(jsonTemplateField)) {
             this.jsonSchemaTemplates.get(nameTemplate).addField(jsonTemplateField);
-        }
-        // Operation = false && field is present => remove Field
-        else if (!operation
+        } else if (!operation
                 && this.jsonSchemaTemplates.get(nameTemplate).getJsonTemplateFields().contains(jsonTemplateField)) {
+            // Operation = false && field is present => remove Field
             this.jsonSchemaTemplates.get(nameTemplate).removeField(jsonTemplateField);
         }
     }
@@ -139,8 +137,8 @@ public class JsonTemplateManager {
      * For a given policy type, get a corresponding JsonObject from the tosca model.
      *
      * @param policyType          The policy type in the tosca
-     * @param toscaMetadataParser The MetadataParser class that must be used if metadata section are encountered, if null
-     *                            they will be skipped
+     * @param toscaMetadataParser The MetadataParser class that must be used if metadata section are encountered,
+     *                            if null they will be skipped
      * @return an json object defining the equivalent json schema from the tosca for a given policy type
      */
     public JsonObject getJsonSchemaForPolicyType(String policyType, ToscaMetadataParser toscaMetadataParser,
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 ec0162cb1..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,11 +22,10 @@
  *
  */
 
-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 java.io.InputStream;
 import java.util.Properties;
 
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 8024331f2..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,19 +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 0ac1a14fc..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;
@@ -168,9 +168,9 @@ public class LoggingUtils {
         return dateFormat;
     }
 
-    /*********************************************************************************************
+    /* *******************************************************************************************
      * Method for ONAP Application Logging Specification v1.2
-     ********************************************************************************************/
+     * *******************************************************************************************/
 
     /**
      * Report <tt>ENTERING</tt> marker.
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 8952e5df1..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;
@@ -190,10 +190,10 @@ public final class OnapLogConstants {
         /** MDC reporting outcome description. */
         public static final String RESPONSE_DESCRIPTION = "ResponseDesc";
 
-        /** MDC reporting severity */
+        /** MDC reporting severity. */
         public static final String RESPONSE_SEVERITY = "Severity";
 
-        /** MDC reporting response status code */
+        /** MDC reporting response status code. */
         public static final String RESPONSE_STATUS_CODE = "StatusCode";
 
         /** MDC recording error code. */
@@ -267,20 +267,20 @@ public final class OnapLogConstants {
         ASYNCHRONOUS("ASYNCHRONOUS", Markers.INVOKE_ASYNCHRONOUS);
 
         /** Enum value. */
-        private String mString;
+        private String enumValue;
 
         /** Corresponding marker. */
-        private Marker mMarker;
+        private Marker marker;
 
         /**
          * Construct enum.
          *
-         * @param s enum value.
-         * @param m corresponding Marker.
+         * @param enumValue enum value.
+         * @param marker corresponding Marker.
          */
-        InvocationMode(final String s, final Marker m) {
-            this.mString = s;
-            this.mMarker = m;
+        InvocationMode(final String enumValue, final Marker marker) {
+            this.enumValue = enumValue;
+            this.marker = marker;
         }
 
         /**
@@ -289,7 +289,7 @@ public final class OnapLogConstants {
          * @return Marker.
          */
         public Marker getMarker() {
-            return this.mMarker;
+            return this.marker;
         }
 
         /**
@@ -297,7 +297,7 @@ public final class OnapLogConstants {
          */
         @Override
         public String toString() {
-            return this.mString;
+            return this.enumValue;
         }
     }
 
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 ca5f37656..e5f12163e 100644
--- a/src/main/java/org/onap/clamp/configuration/ClampGsonDataFormat.java
+++ b/src/main/java/org/onap/policy/clamp/configuration/ClampGsonDataFormat.java
@@ -20,10 +20,9 @@
  * ===================================================================
  */
 
-package org.onap.clamp.configuration;
+package org.onap.policy.clamp.configuration;
 
 import com.google.gson.Gson;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.InputStream;
@@ -32,13 +31,12 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.camel.Exchange;
 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 2d63e55fa..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,12 +21,11 @@
  *
  */
 
-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;
 import com.google.gson.JsonElement;
-
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.time.ZoneId;
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 cdb439e46..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,13 +21,12 @@
  *
  */
 
-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;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
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 f5aba4e11..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,14 +21,13 @@
  *
  */
 
-package org.onap.clamp.dao.model.jsontype;
+package org.onap.policy.clamp.dao.model.jsontype;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.WrapperOptions;
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 518ec2d04..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,16 +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 621fa8dad..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,10 +21,9 @@
  *
  */
 
-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;
 import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
 import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
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 67c7ce5cf..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;
@@ -152,7 +151,8 @@ public class CsarInstaller {
 
     private LoopTemplate createLoopTemplateFromBlueprint(CsarHandler csar, BlueprintArtifact blueprintArtifact,
                                                          Service service)
-            throws IOException, ParseException, InterruptedException, BlueprintParserException {
+            throws IOException, ParseException, InterruptedException, BlueprintParserException,
+            SdcArtifactInstallerException {
         LoopTemplate newLoopTemplate = new LoopTemplate();
         newLoopTemplate.setBlueprint(blueprintArtifact.getDcaeBlueprint());
         newLoopTemplate.setName(LoopTemplate.generateLoopTemplateName(csar.getSdcNotification().getServiceName(),
@@ -165,32 +165,35 @@ public class CsarInstaller {
             microServicesChain = BlueprintParser.fallbackToOneMicroService();
         }
         newLoopTemplate.setModelService(service);
-        newLoopTemplate.addLoopElementModels(createMicroServiceModels(microServicesChain));
+        newLoopTemplate.addLoopElementModels(createMicroServiceModels(blueprintArtifact, microServicesChain));
         newLoopTemplate.setMaximumInstancesAllowed(0);
         DcaeInventoryResponse dcaeResponse = queryDcaeToGetServiceTypeId(blueprintArtifact);
         newLoopTemplate.setDcaeBlueprintId(dcaeResponse.getTypeId());
         return newLoopTemplate;
     }
 
-    private HashSet<LoopElementModel> createMicroServiceModels(List<BlueprintMicroService> microServicesChain)
-            throws InterruptedException {
+    private HashSet<LoopElementModel> createMicroServiceModels(BlueprintArtifact blueprintArtifact,
+                                                               List<BlueprintMicroService> microServicesChain)
+            throws SdcArtifactInstallerException {
         HashSet<LoopElementModel> newSet = new HashSet<>();
         for (BlueprintMicroService microService : microServicesChain) {
             LoopElementModel loopElementModel =
                     new LoopElementModel(microService.getModelType(), LoopElementModel.MICRO_SERVICE_TYPE,
                             null);
             newSet.add(loopElementModel);
-            loopElementModel.addPolicyModel(getPolicyModel(microService));
+            PolicyModel newPolicyModel = policyEngineServices.createPolicyModelFromPolicyEngine(microService);
+            if (newPolicyModel != null) {
+                loopElementModel.addPolicyModel(newPolicyModel);
+            } else {
+                throw new SdcArtifactInstallerException(
+                        "Unable to find the policy specified in the blueprint " + blueprintArtifact
+                                .getBlueprintArtifactName() + ") on the Policy Engine:"
+                                + microService.getModelType() + "/" + microService.getModelVersion());
+            }
         }
         return newSet;
     }
 
-    private PolicyModel getPolicyModel(BlueprintMicroService microService) throws InterruptedException {
-        return policyModelsRepository
-                .findById(new PolicyModelId(microService.getModelType(), microService.getModelVersion()))
-                .orElse(policyEngineServices.createPolicyModelFromPolicyEngine(microService));
-    }
-
     /**
      * Get the service blueprint Id in the Dcae inventory using the SDC UUID.
      *
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/policy/clamp/loop/Loop.java
index 36f74221e..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")
@@ -162,8 +162,7 @@ public class Loop extends AuditEntity implements Serializable {
             if (LoopElementModel.MICRO_SERVICE_TYPE.equals(element.getLoopElementModel().getLoopElementType())) {
                 this.addMicroServicePolicy((MicroServicePolicy) element.getLoopElementModel()
                         .createPolicyInstance(this, toscaConverter));
-            }
-            else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
+            } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
                     .equals(element.getLoopElementModel().getLoopElementType())) {
                 this.addOperationalPolicy((OperationalPolicy) element.getLoopElementModel()
                         .createPolicyInstance(this, toscaConverter));
@@ -381,8 +380,7 @@ public class Loop extends AuditEntity implements Serializable {
             if (other.name != null) {
                 return false;
             }
-        }
-        else if (!name.equals(other.name)) {
+        } else if (!name.equals(other.name)) {
             return false;
         }
         return true;
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 aaa49116f..7b92ed584 100644
--- a/src/main/java/org/onap/clamp/loop/LoopsRepository.java
+++ b/src/main/java/org/onap/policy/clamp/loop/LoopsRepository.java
@@ -21,10 +21,9 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
 
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
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 d18cae1d6..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;
@@ -80,8 +80,7 @@ public class CdsDataInstaller {
                         resourcesPropByType.getAsJsonObject(nodeTemplate.getName())
                                 .add(CONTROLLER_PROPERTIES, controllerProperties);
                         logger.info("Successfully installed the CDS data in Service");
-                    }
-                    else {
+                    } else {
                         logger.warn("Skipping CDS data installation in Service, as sdnc_model_name and "
                                 + "sdnc_model_version are not provided in the CSAR");
                     }
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 7ce12ec6b..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;
@@ -74,8 +74,7 @@ public class AuditEntity {
     public void setCreatedDate(Instant createdDate) {
         if (createdDate != null) {
             this.createdDate = createdDate.truncatedTo(ChronoUnit.SECONDS);
-        }
-        else {
+        } else {
             this.createdDate = null;
         }
     }
@@ -97,8 +96,7 @@ public class AuditEntity {
     public void setUpdatedDate(Instant updatedDate) {
         if (updatedDate != null) {
             this.updatedDate = updatedDate.truncatedTo(ChronoUnit.SECONDS);
-        }
-        else {
+        } else {
             this.updatedDate = null;
         }
     }
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 8b8547195..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,28 +21,26 @@
  *
  */
 
-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;
 import com.google.gson.JsonObject;
-
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-
 import javax.persistence.Transient;
 import org.apache.camel.Exchange;
 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 {
 
@@ -209,22 +207,37 @@ public class DcaeComponent extends ExternalComponent {
 
         if (dcaeResponse == null) {
             setState(BLUEPRINT_DEPLOYED);
-        } else if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("succeeded")) {
-            setState(MICROSERVICE_INSTALLED_SUCCESSFULLY);
-        } else if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("processing")) {
-            setState(PROCESSING_MICROSERVICE_INSTALLATION);
-        } else if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("failed")) {
-            setState(MICROSERVICE_INSTALLATION_FAILED);
-        } else if (dcaeResponse.getOperationType().equals("uninstall")
-                && dcaeResponse.getStatus().equals("succeeded")) {
-            setState(MICROSERVICE_UNINSTALLED_SUCCESSFULLY);
-        } else if (dcaeResponse.getOperationType().equals("uninstall")
-                && dcaeResponse.getStatus().equals("processing")) {
-            setState(PROCESSING_MICROSERVICE_UNINSTALLATION);
-        } else if (dcaeResponse.getOperationType().equals("uninstall") && dcaeResponse.getStatus().equals("failed")) {
-            setState(MICROSERVICE_UNINSTALLATION_FAILED);
         } else {
-            setState(IN_ERROR);
+            if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus().equals("succeeded")) {
+                setState(MICROSERVICE_INSTALLED_SUCCESSFULLY);
+            } else {
+                if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus()
+                        .equals("processing")) {
+                    setState(PROCESSING_MICROSERVICE_INSTALLATION);
+                } else {
+                    if (dcaeResponse.getOperationType().equals("install") && dcaeResponse.getStatus()
+                            .equals("failed")) {
+                        setState(MICROSERVICE_INSTALLATION_FAILED);
+                    } else {
+                        if (dcaeResponse.getOperationType().equals("uninstall")
+                                && dcaeResponse.getStatus().equals("succeeded")) {
+                            setState(MICROSERVICE_UNINSTALLED_SUCCESSFULLY);
+                        } else {
+                            if (dcaeResponse.getOperationType().equals("uninstall")
+                                    && dcaeResponse.getStatus().equals("processing")) {
+                                setState(PROCESSING_MICROSERVICE_UNINSTALLATION);
+                            } else {
+                                if (dcaeResponse.getOperationType().equals("uninstall") && dcaeResponse.getStatus()
+                                        .equals("failed")) {
+                                    setState(MICROSERVICE_UNINSTALLATION_FAILED);
+                                } else {
+                                    setState(IN_ERROR);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
         return this.getState();
     }
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 2be707fe4..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,10 +21,9 @@
  *
  */
 
-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 4ea5b7118..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 {
 
@@ -75,7 +75,8 @@ public class PolicyComponent extends ExternalComponent {
     /**
      * Generates the Json that must be sent to policy to add all policies to Active
      * PDP group.
-     * @param loop the loop object
+     *
+     * @param loop   the loop object
      * @param action POST (to add policy to group) or DELETE (to delete policy from group)
      * @return The json, payload to send
      */
@@ -113,13 +114,11 @@ public class PolicyComponent extends ExternalComponent {
         if (pdpGroupMap.get(pdpGroup) == null) {
             pdpSubGroupMap = new HashMap<>();
             policyList = new LinkedList<>();
-        }
-        else {
+        } else {
             pdpSubGroupMap = pdpGroupMap.get(pdpGroup);
             if (pdpSubGroupMap.get(pdpSubGroup) == null) {
                 policyList = new LinkedList<>();
-            }
-            else {
+            } else {
                 policyList = (List<JsonObject>) pdpSubGroupMap.get(pdpSubGroup);
             }
         }
@@ -162,12 +161,14 @@ public class PolicyComponent extends ExternalComponent {
         ExternalComponentState newState = NOT_SENT;
         if (found && deployed) {
             newState = SENT_AND_DEPLOYED;
-        }
-        else if (found) {
-            newState = SENT;
-        }
-        else if (deployed) {
-            newState = IN_ERROR;
+        } else {
+            if (found) {
+                newState = SENT;
+            } else {
+                if (deployed) {
+                    newState = IN_ERROR;
+                }
+            }
         }
         return newState;
     }
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 65506a479..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;
 
 /**
@@ -63,8 +63,7 @@ public class DcaeDeployParameters {
             Object defaultValue = ((Map<String, Object>) elem.getValue()).get("default");
             if (defaultValue != null) {
                 addPropertyToNode(deployJsonBody, elem.getKey(), defaultValue);
-            }
-            else {
+            } else {
                 deployJsonBody.addProperty(elem.getKey(), "");
             }
         });
@@ -75,17 +74,13 @@ public class DcaeDeployParameters {
     private static void addPropertyToNode(JsonObject node, String key, Object value) {
         if (value instanceof String) {
             node.addProperty(key, (String) value);
-        }
-        else if (value instanceof Number) {
+        } else if (value instanceof Number) {
             node.addProperty(key, (Number) value);
-        }
-        else if (value instanceof Boolean) {
+        } else if (value instanceof Boolean) {
             node.addProperty(key, (Boolean) value);
-        }
-        else if (value instanceof Character) {
+        } else if (value instanceof Character) {
             node.addProperty(key, (Character) value);
-        }
-        else {
+        } else {
             node.addProperty(key, JsonUtils.GSON.toJson(value));
         }
     }
@@ -105,8 +100,7 @@ public class DcaeDeployParameters {
                     generateDcaeDeployParameter(loop.getLoopTemplate().getBlueprint(),
                             ((MicroServicePolicy) loop.getMicroServicePolicies().toArray()[0]).getName()));
 
-        }
-        else {
+        } else {
             LinkedHashMap<String, JsonObject> deploymentParamMap = init(loop);
             for (Map.Entry<String, JsonObject> mapElement : deploymentParamMap.entrySet()) {
                 deployParamJson.add(mapElement.getKey(), mapElement.getValue());
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 e49598879..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,14 +21,12 @@
  *
  */
 
-package org.onap.clamp.loop.log;
+package org.onap.policy.clamp.loop.log;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -40,8 +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 338032a16..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")
@@ -158,9 +158,10 @@ public class Service implements Serializable {
             if (other.serviceUuid != null) {
                 return false;
             }
-        }
-        else if (!serviceUuid.equals(other.serviceUuid)) {
-            return false;
+        } else {
+            if (!serviceUuid.equals(other.serviceUuid)) {
+                return false;
+            }
         }
         return true;
     }
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 70cdbe233..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.
@@ -212,7 +212,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     }
 
     /**
-     * @param shortName the shortName to set.
+     *  * @param shortName the shortName to set.
      */
     public void setShortName(String shortName) {
         this.shortName = shortName;
@@ -255,11 +255,9 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     public Policy createPolicyInstance(Loop loop, ToscaConverterWithDictionarySupport toscaConverter) {
         if (LoopElementModel.MICRO_SERVICE_TYPE.equals(this.getLoopElementType())) {
             return new MicroServicePolicy(loop, loop.getModelService(), this, toscaConverter);
-        }
-        else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(this.getLoopElementType())) {
+        } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(this.getLoopElementType())) {
             return new OperationalPolicy(loop, loop.getModelService(), this, toscaConverter);
-        }
-        else {
+        } else {
             return null;
         }
     }
@@ -288,8 +286,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
             if (other.name != null) {
                 return false;
             }
-        }
-        else if (!name.equals(other.name)) {
+        } else if (!name.equals(other.name)) {
             return false;
         }
         return true;
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 6f896f3d4..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")
@@ -223,7 +223,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
      * @param loopElementModel The loopElementModel to add
      */
     public void addLoopElementModel(LoopElementModel loopElementModel) {
-        this.addLoopElementModel(loopElementModel,this.loopElementModelsUsed.size());
+        this.addLoopElementModel(loopElementModel, this.loopElementModelsUsed.size());
     }
 
     /**
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 aca16bc04..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,12 +21,10 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
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 07f304de7..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,10 +21,9 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
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 c4dd1933b..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,10 +21,9 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
 
 public class PolicyModelId implements 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 a76e386b5..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,10 +21,9 @@
  *
  */
 
-package org.onap.clamp.loop.template;
+package org.onap.policy.clamp.loop.template;
 
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
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 a1b8f7cf2..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;
@@ -100,7 +100,7 @@ public class PolicyModelsService {
     public PolicyModel updatePolicyModelTosca(String policyModelType, String policyModelVersion,
         String policyModelTosca) {
         JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
-        PolicyModel thePolicyModel = getPolicyModelByType(policyModelType, policyModelVersion);
+        PolicyModel thePolicyModel = getPolicyModel(policyModelType, policyModelVersion);
         thePolicyModel.setPolicyAcronym(toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
             ToscaSchemaConstants.METADATA_ACRONYM));
         thePolicyModel.setPolicyModelTosca(policyModelTosca);
@@ -123,10 +123,6 @@ public class PolicyModelsService {
         return policyModelsRepository.findByPolicyModelType(type);
     }
 
-    public PolicyModel getPolicyModelByType(String type, String version) {
-        return policyModelsRepository.findById(new PolicyModelId(type, version)).orElse(null);
-    }
-
     /**
      * Retrieves the Tosca model Yaml string.
      *
@@ -146,7 +142,7 @@ public class PolicyModelsService {
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public PolicyModel savePolicyModelInNewTransaction(PolicyModel policyModel) {
-            return policyModelsRepository.saveAndFlush(policyModel);
+        return policyModelsRepository.saveAndFlush(policyModel);
     }
 
     /**
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 ae15f86da..35ffa2443 100644
--- a/src/main/java/org/onap/clamp/policy/PolicyService.java
+++ b/src/main/java/org/onap/policy/clamp/policy/PolicyService.java
@@ -21,12 +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 0c3f677a1..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,16 +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 77627a31a..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")
@@ -267,8 +267,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
             if (other.name != null) {
                 return false;
             }
-        }
-        else if (!name.equals(other.name)) {
+        } else if (!name.equals(other.name)) {
             return false;
         }
         return true;
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 0381f0a2a..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,22 +22,20 @@
  *
  */
 
-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 com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-
 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 {
 
@@ -57,7 +55,7 @@ public class OperationalPolicyRepresentationBuilder {
     public static final String TYPE_ARRAY = "array";
 
     private OperationalPolicyRepresentationBuilder() {
-    	throw new IllegalStateException("This is Utility class, not supposed to be initiated.");
+        throw new IllegalStateException("This is Utility class, not supposed to be initiated.");
     }
 
     /**
@@ -282,7 +280,7 @@ public class OperationalPolicyRepresentationBuilder {
         jsonObject.add("artifact_version", createSchemaProperty(
                 "artifact version", STRING, artifactVersion, "True", null));
         jsonObject.add("mode", createCdsInputProperty(
-                "mode", STRING, "async" ,null));
+                "mode", STRING, "async", null));
         jsonObject.add("data", createDataProperty(inputs, workFlowName));
         return jsonObject;
     }
@@ -308,7 +306,7 @@ public class OperationalPolicyRepresentationBuilder {
                         dataObj, workFlowName);
             } else {
                 dataObj.add(entry.getKey(),
-                        createCdsInputProperty(key, inputProperty.get(TYPE).getAsString(),null,
+                        createCdsInputProperty(key, inputProperty.get(TYPE).getAsString(), null,
                                 entry.getValue().getAsJsonObject()));
             }
         }
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 a3cf4e053..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,12 +21,11 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
-
 import java.util.List;
 
 /**
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 707b3bd2f..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,10 +21,9 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
 
 public class PolicyModelKey implements 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 96f5b9ca7..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="#_route143">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="#_route144">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="#_route142">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="#_route127">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="#_route130">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="#_route128">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="#_route129">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="#_route131">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="#_route132">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="#_route133">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="#_route124">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="#_route126">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="#_route122">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="#_route115">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="#_route110">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="#_route123">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="#_route116">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="#_route117">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="#_route125">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="#_route120">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="#_route119">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="#_route121">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="#_route118">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="#_route112">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="#_route114">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="#_route113">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="#_route111">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="#_route137">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="#_route134">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="#_route136">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="#_route135">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="#_route138">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="#_route139">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="#_route141">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="#_route140">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.0-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:43065<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="_route143"><a class="anchor" href="#_route143"></a><a class="link" href="#_route143">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="_route144"><a class="anchor" href="#_route144"></a><a class="link" href="#_route144">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="_route142"><a class="anchor" href="#_route142"></a><a class="link" href="#_route142">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="_route127"><a class="anchor" href="#_route127"></a><a class="link" href="#_route127">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="_route130"><a class="anchor" href="#_route130"></a><a class="link" href="#_route130">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="_route128"><a class="anchor" href="#_route128"></a><a class="link" href="#_route128">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="_route129"><a class="anchor" href="#_route129"></a><a class="link" href="#_route129">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="_route131"><a class="anchor" href="#_route131"></a><a class="link" href="#_route131">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="_route132"><a class="anchor" href="#_route132"></a><a class="link" href="#_route132">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="_route133"><a class="anchor" href="#_route133"></a><a class="link" href="#_route133">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="_route124"><a class="anchor" href="#_route124"></a><a class="link" href="#_route124">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="_route126"><a class="anchor" href="#_route126"></a><a class="link" href="#_route126">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="_route122"><a class="anchor" href="#_route122"></a><a class="link" href="#_route122">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="_route115"><a class="anchor" href="#_route115"></a><a class="link" href="#_route115">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="_route110"><a class="anchor" href="#_route110"></a><a class="link" href="#_route110">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="_route123"><a class="anchor" href="#_route123"></a><a class="link" href="#_route123">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="_route116"><a class="anchor" href="#_route116"></a><a class="link" href="#_route116">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="_route117"><a class="anchor" href="#_route117"></a><a class="link" href="#_route117">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="_route125"><a class="anchor" href="#_route125"></a><a class="link" href="#_route125">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="_route120"><a class="anchor" href="#_route120"></a><a class="link" href="#_route120">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="_route119"><a class="anchor" href="#_route119"></a><a class="link" href="#_route119">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="_route121"><a class="anchor" href="#_route121"></a><a class="link" href="#_route121">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="_route118"><a class="anchor" href="#_route118"></a><a class="link" href="#_route118">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="_route112"><a class="anchor" href="#_route112"></a><a class="link" href="#_route112">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="_route114"><a class="anchor" href="#_route114"></a><a class="link" href="#_route114">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="_route113"><a class="anchor" href="#_route113"></a><a class="link" href="#_route113">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="_route111"><a class="anchor" href="#_route111"></a><a class="link" href="#_route111">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="_route137"><a class="anchor" href="#_route137"></a><a class="link" href="#_route137">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="_route134"><a class="anchor" href="#_route134"></a><a class="link" href="#_route134">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="_route136"><a class="anchor" href="#_route136"></a><a class="link" href="#_route136">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="_route135"><a class="anchor" href="#_route135"></a><a class="link" href="#_route135">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="_route138"><a class="anchor" href="#_route138"></a><a class="link" href="#_route138">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="_route139"><a class="anchor" href="#_route139"></a><a class="link" href="#_route139">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="_route141"><a class="anchor" href="#_route141"></a><a class="link" href="#_route141">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="_route140"><a class="anchor" href="#_route140"></a><a class="link" href="#_route140">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">
@@ -3953,11 +3953,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>legacy</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopElementModel</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loopelementmodel">LoopElementModel</a></p></td>
@@ -4046,11 +4041,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>legacy</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loop</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
@@ -4207,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-02-12 11:20:53 CET
+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/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index 423c73e93..6b28cf7ef 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -173,7 +173,7 @@ clamp.config.security.permission.type.template=org.onap.clamp.clds.template
 clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
+clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
 
 ## Tosca converter
 clamp.config.tosca.converter.json.schema.templates=classpath:/clds/tosca-converter/templates.json
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index de32098fa..1b5a26d0a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -176,13 +176,13 @@ clamp.config.security.permission.type.template=org.onap.clamp.clds.template
 clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
+clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
 
 #AAF related parameters
 clamp.config.cadi.cadiLoglevel=DEBUG
 clamp.config.cadi.cadiLatitude=10
 clamp.config.cadi.cadiLongitude=10
-clamp.config.cadi.aafLocateUrl=https://aaf-locate:8095
+clamp.config.cadi.aafLocateUrl=https://aaf-locate:30251
 clamp.config.cadi.oauthTokenUrl= https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.token:2.1/token
 clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.introspect:2.1/introspect
 clamp.config.cadi.aafEnv=DEV
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 9946c990b..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>
@@ -13,7 +13,7 @@
             </setHeader>
             <log loggingLevel="INFO"
                  message="Endpoint to query workflows from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}"></log>
-            <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <doCatch>
                 <exception>java.lang.Exception</exception>
@@ -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>
@@ -44,7 +44,7 @@
             </setHeader>
             <log loggingLevel="INFO"
                  message="Endpoint to query input properties for workflow from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec"></log>
-            <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.cds.userName}}&amp;authPassword={{clamp.config.cds.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <doCatch>
                 <exception>java.lang.Exception</exception>
@@ -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 d71db1763..1a0eb7b9a 100644
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/main/resources/clds/camel/routes/dcae-flows.xml
@@ -1,477 +1,491 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-	<route id="deploy-loop">
-		<from uri="direct:deploy-loop" />
-		<choice>
-			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
-				</simple>
-				<to uri="direct:deploy-loop-single-blueprint" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
-				</simple>
-				<to uri="direct:deploy-loop-multi-blueprint" />
-			</when>
-		</choice>
-	</route>
-	<route id="deploy-loop-multi-blueprint">
-		<from uri="direct:deploy-loop-multi-blueprint" />
-		<doTry>
-			<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')" />
-			<split>
-					<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-					</simple>
-					<setProperty propertyName="microServicePolicy">
-						<simple>${body}</simple>
-					</setProperty>
-					<log
-						loggingLevel="INFO"
-						message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
-					<setProperty propertyName="raiseHttpExceptionFlag">
-						<simple resultType="java.lang.Boolean">false</simple>
-					</setProperty>
-					<setBody>
-						<method ref="org.onap.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="generateDeploymentId()" />
-					</setProperty>
-					<setHeader headerName="CamelHttpMethod">
-						<constant>PUT</constant>
-					</setHeader>
-					<setHeader headerName="Content-Type">
-						<constant>application/json</constant>
-					</setHeader>
-					<setHeader headerName="X-ONAP-RequestID">
-						<simple>${exchangeProperty[X-ONAP-RequestID]}
-						</simple>
-					</setHeader>
-					<setHeader headerName="X-ONAP-InvocationID">
-						<simple>${exchangeProperty[X-ONAP-InvocationID]}
-						</simple>
-					</setHeader>
-					<setHeader headerName="X-ONAP-PartnerName">
-						<simple>${exchangeProperty[X-ONAP-PartnerName]}
-						</simple>
-					</setHeader>
-					<log loggingLevel="INFO"
-						message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
-					<toD
-						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;connectionTimeToLive=5000&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="convertDcaeResponse(${body})" />
-					</setProperty>
-					<setProperty propertyName="dcaeStatusUrl">
-						<method ref="org.onap.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]})" />
-					<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]})" />
-			</split>
-			<doCatch>
-				<exception>java.lang.Exception</exception>
-				<handled>
-					<constant>false</constant>
-				</handled>
-				<setProperty propertyName="logMessage">
-					<simple>DEPLOY micro service failed 
-						(MicroService name:${exchangeProperty[microServicePolicy].getName()}),
-						Dep-id:${exchangeProperty[dcaeDeploymentId]},
-						StatusUrl:${exchangeProperty[dcaeStatusUrl]})
-					</simple>
-				</setProperty>
-				<setProperty propertyName="logComponent">
-					<simple>DCAE</simple>
-				</setProperty>
-				<to uri="direct:dump-loop-log-http-response" />
-			</doCatch>
-			<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to
-					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-			</doFinally>
-		</doTry>
-	</route>
-	<route id="deploy-loop-single-blueprint">
-		<from uri="direct:deploy-loop-single-blueprint" />
-		<doTry>
-			<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')" />
-			<setBody>
-				<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-					method="getDeployPayload(${exchangeProperty[loopObject]})" />
-			</setBody>
-			<setProperty propertyName="dcaeDeploymentId">
-				<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-					method="generateDeploymentId()" />
-			</setProperty>
-			<setHeader headerName="CamelHttpMethod">
-				<constant>PUT</constant>
-			</setHeader>
-			<setHeader headerName="Content-Type">
-				<constant>application/json</constant>
-			</setHeader>
-			<setHeader headerName="X-ONAP-RequestID">
-				<simple>${exchangeProperty[X-ONAP-RequestID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-InvocationID">
-				<simple>${exchangeProperty[X-ONAP-InvocationID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-PartnerName">
-				<simple>${exchangeProperty[X-ONAP-PartnerName]}
-				</simple>
-			</setHeader>
-			<log loggingLevel="INFO"
-				message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
-			<toD
-				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;connectionTimeToLive=5000&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="convertDcaeResponse(${body})" />
-			</setProperty>
-			
+    <route id="deploy-loop">
+        <from uri="direct:deploy-loop"/>
+        <choice>
+            <when>
+                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
+                </simple>
+                <to uri="direct:deploy-loop-single-blueprint"/>
+            </when>
+            <when>
+                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
+                </simple>
+                <to uri="direct:deploy-loop-multi-blueprint"/>
+            </when>
+        </choice>
+    </route>
+    <route id="deploy-loop-multi-blueprint">
+        <from uri="direct:deploy-loop-multi-blueprint"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Deploying the blueprints for loop: ${exchangeProperty[loopObject].getName()}"/>
+            <to
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop with multiple blueprints')"/>
+            <split>
+                <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
+                </simple>
+                <setProperty propertyName="microServicePolicy">
+                    <simple>${body}</simple>
+                </setProperty>
+                <log
+                        loggingLevel="INFO"
+                        message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}"/>
+                <setProperty propertyName="raiseHttpExceptionFlag">
+                    <simple resultType="java.lang.Boolean">false</simple>
+                </setProperty>
+                <setBody>
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                            method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})"/>
+                </setBody>
+                <setProperty propertyName="dcaeDeploymentId">
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                            method="generateDeploymentId()"/>
+                </setProperty>
+                <setHeader headerName="CamelHttpMethod">
+                    <constant>PUT</constant>
+                </setHeader>
+                <setHeader headerName="Content-Type">
+                    <constant>application/json</constant>
+                </setHeader>
+                <setHeader headerName="X-ONAP-RequestID">
+                    <simple>${exchangeProperty[X-ONAP-RequestID]}
+                    </simple>
+                </setHeader>
+                <setHeader headerName="X-ONAP-InvocationID">
+                    <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                    </simple>
+                </setHeader>
+                <setHeader headerName="X-ONAP-PartnerName">
+                    <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                    </simple>
+                </setHeader>
+                <log loggingLevel="INFO"
+                     message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
+                <toD
+                        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.policy.clamp.loop.components.external.DcaeComponent"
+                            method="convertDcaeResponse(${body})"/>
+                </setProperty>
+                <setProperty propertyName="dcaeStatusUrl">
+                    <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                            method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
+                </setProperty>
+                <to
+                        uri="bean:org.onap.policy.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},${exchangeProperty[dcaeDeploymentId]},${exchangeProperty[dcaeStatusUrl]})"/>
+                <to
+                        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>
+                <handled>
+                    <constant>false</constant>
+                </handled>
+                <setProperty propertyName="logMessage">
+                    <simple>DEPLOY micro service failed
+                        (MicroService name:${exchangeProperty[microServicePolicy].getName()}),
+                        Dep-id:${exchangeProperty[dcaeDeploymentId]},
+                        StatusUrl:${exchangeProperty[dcaeStatusUrl]})
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>DCAE</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doCatch>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="deploy-loop-single-blueprint">
+        <from uri="direct:deploy-loop-single-blueprint"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Deploying the loop: ${exchangeProperty[loopObject].getName()}"/>
+            <to
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop')"/>
+            <setBody>
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                        method="getDeployPayload(${exchangeProperty[loopObject]})"/>
+            </setBody>
+            <setProperty propertyName="dcaeDeploymentId">
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                        method="generateDeploymentId()"/>
+            </setProperty>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>PUT</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+                <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
+            <toD
+                    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.policy.clamp.loop.components.external.DcaeComponent"
+                        method="convertDcaeResponse(${body})"/>
+            </setProperty>
 
-			<setProperty propertyName="dcaeStatusUrl">
-				<method ref="org.onap.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]})" />
-			<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to
-					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-				<setProperty propertyName="logMessage">
-					<simple>DEPLOY loop status
-						(Dep-id:${exchangeProperty[dcaeDeploymentId]},
-						StatusUrl:${exchangeProperty[dcaeStatusUrl]})
-					</simple>
-				</setProperty>
-				<setProperty propertyName="logComponent">
-					<simple>DCAE</simple>
-				</setProperty>
-				<to uri="direct:dump-loop-log-http-response" />
-			</doFinally>
-		</doTry>
-	</route>
-	<route id="undeploy-loop">
-		<from uri="direct:undeploy-loop" />
-		<choice>
-			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
-				</simple>
-				<to uri="direct:undeploy-loop-single-blueprint" />
-			</when>
-			<when>
-				<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
-				</simple>
-				<to uri="direct:undeploy-loop-multi-blueprint" />
-			</when>
-		</choice>
-	</route>
-	<route id="undeploy-loop-multi-blueprint">
-		<from uri="direct:undeploy-loop-multi-blueprint" />
-		<doTry>
-			<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')" />
-			<split>
-				<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
-				</simple>
-				<setProperty propertyName="microServicePolicy">
-					<simple>${body}</simple>
-				</setProperty>
-				<log
-					loggingLevel="INFO"
-					message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
-				<choice>
-					<when>
-						<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentId()} != null
-						</simple>
-						<setBody>
-							<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-								method="getUndeployPayload(${exchangeProperty[microServicePolicy]})" />
-						</setBody>
-						<setHeader headerName="CamelHttpMethod">
-							<constant>DELETE</constant>
-						</setHeader>
-						<setHeader headerName="Content-Type">
-							<constant>application/json</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-							<simple>${exchangeProperty[X-ONAP-RequestID]}
-							</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-							<simple>${exchangeProperty[X-ONAP-InvocationID]}
-							</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-							<simple>${exchangeProperty[X-ONAP-PartnerName]}
-							</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-							message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}"></log>
-						<toD
-							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;connectionTimeToLive=5000&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="convertDcaeResponse(${body})" />
-						</setProperty>
-						<setProperty propertyName="dcaeStatusUrl">
-							<method ref="org.onap.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]})" />
-						<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]})" />
-					</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]})" />
-					</otherwise>
-				</choice>
-			</split>
-			<doCatch>
-				<exception>java.lang.Exception</exception>
-				<handled>
-					<constant>false</constant>
-				</handled>
-				<setProperty propertyName="logMessage">
-					<simple>UNDEPLOY micro service failed
-						(MicroService name:${exchangeProperty[microServicePolicy].getName()})
-					</simple>
-				</setProperty>
-				<setProperty propertyName="logComponent">
-					<simple>DCAE</simple>
-				</setProperty>
-				<to uri="direct:dump-loop-log-http-response" />
-			</doCatch>
-			<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to
-					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-			</doFinally>
-		</doTry>
-	</route>
-	<route id="undeploy-loop-single-blueprint">
-		<from uri="direct:undeploy-loop-single-blueprint" />
-		<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')" />
-		<choice>
-			<when>
-				<simple>${exchangeProperty[loopObject].getDcaeDeploymentId()}
-					!= null
-				</simple>
-				<doTry>
-					<setBody>
-						<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
-							method="getUndeployPayload(${exchangeProperty[loopObject]})" />
-					</setBody>
-					<setHeader headerName="CamelHttpMethod">
-						<constant>DELETE</constant>
-					</setHeader>
-					<setHeader headerName="Content-Type">
-						<constant>application/json</constant>
-					</setHeader>
 
-					<setHeader headerName="X-ONAP-RequestID">
-						<simple>${exchangeProperty[X-ONAP-RequestID]}
-						</simple>
-					</setHeader>
-					<setHeader headerName="X-ONAP-InvocationID">
-						<simple>${exchangeProperty[X-ONAP-InvocationID]}
-						</simple>
-					</setHeader>
-					<setHeader headerName="X-ONAP-PartnerName">
-						<simple>${exchangeProperty[X-ONAP-PartnerName]}
-						</simple>
-					</setHeader>
-					<log loggingLevel="INFO"
-						message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}"></log>
-					<toD
-						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;connectionTimeToLive=5000&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="convertDcaeResponse(${body})" />
-					</setProperty>
-					<setProperty propertyName="dcaeStatusUrl">
-						<method ref="org.onap.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]})" />
-					<doFinally>
-						<to uri="direct:reset-raise-http-exception-flag" />
-						<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-						<setProperty propertyName="logMessage">
-							<simple>UNDEPLOY loop status</simple>
-						</setProperty>
-						<setProperty propertyName="logComponent">
-							<simple>DCAE</simple>
-						</setProperty>
-						<to uri="direct:dump-loop-log-http-response" />
-					</doFinally>
-				</doTry>
-			</when>
-			<otherwise>
-				<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]})" />
-			</otherwise>
-		</choice>
-	</route>
-	<route id="get-dcae-deployment-status">
-		<from uri="direct:get-dcae-deployment-status" />
-		<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')" />
-		<doTry>
-			<setHeader headerName="CamelHttpMethod">
-				<constant>GET</constant>
-			</setHeader>
-			<setHeader headerName="X-ONAP-RequestID">
-				<simple>${exchangeProperty[X-ONAP-RequestID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-InvocationID">
-				<simple>${exchangeProperty[X-ONAP-InvocationID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-PartnerName">
-				<simple>${exchangeProperty[X-ONAP-PartnerName]}
-				</simple>
-			</setHeader>
-			<log loggingLevel="INFO"
-				message="Endpoint to query Closed Loop status: ${exchangeProperty[getStatusUrl]}"></log>
-			<toD
-				uri="${exchangeProperty[getStatusUrl]}?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;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
-			<doCatch>
-				<exception>java.lang.Exception</exception>
-				<handled>
-					<constant>true</constant>
-				</handled>
+            <setProperty propertyName="dcaeStatusUrl">
+                <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                        method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
+            </setProperty>
+            <to
+                    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.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>DEPLOY loop status
+                        (Dep-id:${exchangeProperty[dcaeDeploymentId]},
+                        StatusUrl:${exchangeProperty[dcaeStatusUrl]})
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>DCAE</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="undeploy-loop">
+        <from uri="direct:undeploy-loop"/>
+        <choice>
+            <when>
+                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
+                </simple>
+                <to uri="direct:undeploy-loop-single-blueprint"/>
+            </when>
+            <when>
+                <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
+                </simple>
+                <to uri="direct:undeploy-loop-multi-blueprint"/>
+            </when>
+        </choice>
+    </route>
+    <route id="undeploy-loop-multi-blueprint">
+        <from uri="direct:undeploy-loop-multi-blueprint"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Undeploying the blueprints for loop: ${exchangeProperty[loopObject].getName()}"/>
+            <to
+                    uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop with multiple blueprints')"/>
+            <split>
+                <simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
+                </simple>
+                <setProperty propertyName="microServicePolicy">
+                    <simple>${body}</simple>
+                </setProperty>
+                <log
+                        loggingLevel="INFO"
+                        message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}"/>
+                <choice>
+                    <when>
+                        <simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentId()} != null
+                        </simple>
+                        <setBody>
+                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                                    method="getUndeployPayload(${exchangeProperty[microServicePolicy]})"/>
+                        </setBody>
+                        <setHeader headerName="CamelHttpMethod">
+                            <constant>DELETE</constant>
+                        </setHeader>
+                        <setHeader headerName="Content-Type">
+                            <constant>application/json</constant>
+                        </setHeader>
+                        <setHeader headerName="X-ONAP-RequestID">
+                            <simple>${exchangeProperty[X-ONAP-RequestID]}
+                            </simple>
+                        </setHeader>
+                        <setHeader headerName="X-ONAP-InvocationID">
+                            <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                            </simple>
+                        </setHeader>
+                        <setHeader headerName="X-ONAP-PartnerName">
+                            <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                            </simple>
+                        </setHeader>
+                        <log loggingLevel="INFO"
+                             message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}"></log>
+                        <toD
+                                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.policy.clamp.loop.components.external.DcaeComponent"
+                                    method="convertDcaeResponse(${body})"/>
+                        </setProperty>
+                        <setProperty propertyName="dcaeStatusUrl">
+                            <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                                    method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
+                        </setProperty>
+                        <to
+                                uri="bean:org.onap.policy.clamp.policy.microservice.MicroServicePolicyService?method=updateDcaeDeploymentFields(${exchangeProperty[microServicePolicy]},null,${exchangeProperty[dcaeStatusUrl]})"/>
+                        <to
+                                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.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>
+            <doCatch>
+                <exception>java.lang.Exception</exception>
+                <handled>
+                    <constant>false</constant>
+                </handled>
+                <setProperty propertyName="logMessage">
+                    <simple>UNDEPLOY micro service failed
+                        (MicroService name:${exchangeProperty[microServicePolicy].getName()})
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>DCAE</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doCatch>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="undeploy-loop-single-blueprint">
+        <from uri="direct:undeploy-loop-single-blueprint"/>
+        <log loggingLevel="INFO"
+             message="Undeploying the loop: ${exchangeProperty[loopObject].getName()} : ${exchangeProperty[loopObject].getDcaeDeploymentId()}"/>
+        <to
+                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/>
+        <choice>
+            <when>
+                <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()}
+                    != null
+                </simple>
+                <doTry>
+                    <setBody>
+                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                                method="getUndeployPayload(${exchangeProperty[loopObject]})"/>
+                    </setBody>
+                    <setHeader headerName="CamelHttpMethod">
+                        <constant>DELETE</constant>
+                    </setHeader>
+                    <setHeader headerName="Content-Type">
+                        <constant>application/json</constant>
+                    </setHeader>
 
-				<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]})" />
-			</doCatch>
-			<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to
-					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-				<setProperty propertyName="logMessage">
-					<simple>DCAE deployment status</simple>
-				</setProperty>
-				<setProperty propertyName="logComponent">
-					<simple>DCAE</simple>
-				</setProperty>
-				<to uri="direct:dump-loop-log-http-response" />
-			</doFinally>
-		</doTry>
-	</route>
-	<route id="get-dcae-blueprint-inventory">
-		<from uri="direct:get-dcae-blueprint-inventory" />
-		<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')" />
-		<doTry>
-			<setHeader headerName="CamelHttpMethod">
-				<constant>GET</constant>
-			</setHeader>
-			<setHeader headerName="X-ONAP-RequestID">
-				<simple>${exchangeProperty[X-ONAP-RequestID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-InvocationID">
-				<simple>${exchangeProperty[X-ONAP-InvocationID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-PartnerName">
-				<simple>${exchangeProperty[X-ONAP-PartnerName]}
-				</simple>
-			</setHeader>
-			<log loggingLevel="INFO"
-				message="Endpoint to query Dcae inventory Loop status: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
-			<toD
-				uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&amp;asdcServiceId=${exchangeProperty[blueprintServiceId]}&amp;typeName=${exchangeProperty[blueprintName]}&amp;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;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
-			<convertBodyTo type="java.lang.String" />
-			<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to
-					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-			</doFinally>
-		</doTry>
+                    <setHeader headerName="X-ONAP-RequestID">
+                        <simple>${exchangeProperty[X-ONAP-RequestID]}
+                        </simple>
+                    </setHeader>
+                    <setHeader headerName="X-ONAP-InvocationID">
+                        <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                        </simple>
+                    </setHeader>
+                    <setHeader headerName="X-ONAP-PartnerName">
+                        <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                        </simple>
+                    </setHeader>
+                    <log loggingLevel="INFO"
+                         message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}"></log>
+                    <toD
+                            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.policy.clamp.loop.components.external.DcaeComponent"
+                                method="convertDcaeResponse(${body})"/>
+                    </setProperty>
+                    <setProperty propertyName="dcaeStatusUrl">
+                        <method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
+                                method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
+                    </setProperty>
+                    <to
+                            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.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                        <setProperty propertyName="logMessage">
+                            <simple>UNDEPLOY loop status</simple>
+                        </setProperty>
+                        <setProperty propertyName="logComponent">
+                            <simple>DCAE</simple>
+                        </setProperty>
+                        <to uri="direct:dump-loop-log-http-response"/>
+                    </doFinally>
+                </doTry>
+            </when>
+            <otherwise>
+                <log loggingLevel="WARNING"
+                     message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !"/>
+                <to
+                        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>
+    <route id="get-dcae-deployment-status">
+        <from uri="direct:get-dcae-deployment-status"/>
+        <log loggingLevel="INFO"
+             message="Getting DCAE deployment status for loop: ${exchangeProperty[loopObject].getName()} - ${exchangeProperty[dcaeComponent].getComponentName()}"/>
+        <to
+                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')"/>
+        <doTry>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to query microservice deployment status: ${exchangeProperty[getStatusUrlModified]}"></log>
+            <choice>
+                <when>
+                    <simple>${exchangeProperty[getStatusUrl].contains("?")} == true
+                    </simple>
+                    <setProperty propertyName="uriSeparator">
+                        <simple>&amp;</simple>
+                    </setProperty>
+                </when>
+                <otherwise>
+                    <setProperty propertyName="uriSeparator">
+                        <simple>?</simple>
+                    </setProperty>
+                </otherwise>
+            </choice>
+            <toD
+                    uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}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"/>
+            <doCatch>
+                <exception>java.lang.Exception</exception>
+                <handled>
+                    <constant>true</constant>
+                </handled>
 
-	</route>
-	<route id="get-all-dcae-blueprint-inventory">
-		<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')" />
-		<doTry>
-			<setHeader headerName="CamelHttpMethod">
-				<constant>GET</constant>
-			</setHeader>
-			<setHeader headerName="X-ONAP-RequestID">
-				<simple>${exchangeProperty[X-ONAP-RequestID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-InvocationID">
-				<simple>${exchangeProperty[X-ONAP-InvocationID]}
-				</simple>
-			</setHeader>
-			<setHeader headerName="X-ONAP-PartnerName">
-				<simple>${exchangeProperty[X-ONAP-PartnerName]}
-				</simple>
-			</setHeader>
-			<log loggingLevel="INFO"
-				 message="Endpoint to query Blueprints from DCAE inventory: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
-			<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;connectionTimeToLive=5000&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="convertToDcaeInventoryResponse(${body})" />
-			</setProperty>
-			<split>
-				<simple>${exchangeProperty[dcaeResponseList]}</simple>
-				<convertBodyTo type="org.onap.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]})" />
-			</split>
-			<doFinally>
-				<to uri="direct:reset-raise-http-exception-flag" />
-				<to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
-			</doFinally>
-		</doTry>
-	</route>
+                <log loggingLevel="ERROR"
+                     message="GET DCAE deployment request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
+                <to
+                        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.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>DCAE deployment status</simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>DCAE</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="get-dcae-blueprint-inventory">
+        <from uri="direct:get-dcae-blueprint-inventory"/>
+        <log loggingLevel="INFO"
+             message="Getting DCAE blueprint id in inventory"/>
+        <to
+                uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')"/>
+        <doTry>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to query Dcae inventory Loop status: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
+            <toD
+                    uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&amp;asdcServiceId=${exchangeProperty[blueprintServiceId]}&amp;typeName=${exchangeProperty[blueprintName]}&amp;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"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+
+    </route>
+    <route id="get-all-dcae-blueprint-inventory">
+        <from uri="direct:get-all-dcae-blueprint-inventory"/>
+        <log loggingLevel="INFO"
+             message="Getting all DCAE 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>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to query Blueprints from DCAE inventory: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
+            <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.policy.clamp.loop.components.external.DcaeComponent"
+                        method="convertToDcaeInventoryResponse(${body})"/>
+            </setProperty>
+            <split>
+                <simple>${exchangeProperty[dcaeResponseList]}</simple>
+                <convertBodyTo type="org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse"/>
+                <setProperty propertyName="dcaeResponse">
+                    <simple>${body}</simple>
+                </setProperty>
+                <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.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
 </routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index 691656d81..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>
@@ -67,19 +67,9 @@
 			<setProperty propertyName="policyTypeVersion">
 				<simple>${body.getPolicyModel().getVersion()}</simple>
 			</setProperty>
-			<choice>
-				<when>
-					<simple>${body.isLegacy()} == true</simple>
-					<setProperty propertyName="policyVersion">
-						<simple>1</simple>
-					</setProperty>
-				</when>
-				<otherwise>
-					<setProperty propertyName="policyVersion">
-						<simple>1.0.0</simple>
-					</setProperty>
-				</otherwise>
-			</choice>
+		 	<setProperty propertyName="policyVersion">
+				<simple>1.0.0</simple>
+			</setProperty>
 			<setProperty propertyName="operationalPolicy">
 				<simple>${body}</simple>
 			</setProperty>
@@ -97,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" />
@@ -124,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>
@@ -136,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
@@ -164,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>
@@ -176,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>
@@ -192,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
@@ -200,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()} ==
@@ -208,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()} ==
@@ -216,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()} ==
@@ -224,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()} ==
@@ -233,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()} ==
@@ -243,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()} ==
@@ -251,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 f597bdc08..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>
@@ -55,7 +55,7 @@
             <log loggingLevel="INFO"
                  message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
             <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <doCatch>
                 <exception>java.lang.Exception</exception>
                 <handled>
@@ -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>
@@ -109,7 +109,7 @@
             <log loggingLevel="INFO"
                  message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0"></log>
             <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <doCatch>
                 <exception>java.lang.Exception</exception>
                 <handled>
@@ -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>
@@ -161,12 +161,12 @@
             <log loggingLevel="INFO"
                  message="Endpoint to get all policy models: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
             <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <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>
@@ -195,12 +195,12 @@
             <log loggingLevel="INFO"
                  message="Endpoint to get policy model: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}"></log>
             <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <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>
@@ -236,11 +236,11 @@
             <log loggingLevel="INFO"
                  message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies"></log>
             <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <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>
@@ -279,28 +279,18 @@
                 <simple>${exchangeProperty[X-ONAP-PartnerName]}
                 </simple>
             </setHeader>
-            <choice>
-                <when>
-                    <simple>${exchangeProperty[policy].isLegacy()} == true</simple>
-                    <setProperty propertyName="policyVersion">
-                        <simple>1</simple>
-                    </setProperty>
-                </when>
-                <otherwise>
-                    <setProperty propertyName="policyVersion">
-                        <simple>1.0.0</simple>
-                    </setProperty>
-                </otherwise>
-            </choice>
+            <setProperty propertyName="policyVersion">
+                <simple>1.0.0</simple>
+            </setProperty>
             <log loggingLevel="INFO"
                  message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}"></log>
             <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
             <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
@@ -319,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")}
@@ -346,12 +336,12 @@
             <log loggingLevel="INFO"
                  message="Endpoint to add policies to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
             <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
             <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>
@@ -369,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")}
@@ -396,12 +386,12 @@
             <log loggingLevel="INFO"
                  message="Endpoint to remove policies from PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
             <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
             <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>
@@ -418,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>
@@ -437,12 +427,12 @@
             <log loggingLevel="INFO"
                  message="Endpoint to get policy model: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps"></log>
             <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <convertBodyTo type="java.lang.String"/>
             <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>
@@ -452,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>
@@ -474,7 +464,7 @@
             <log loggingLevel="INFO"
                  message="Endpoint to delete policy from PDP Group: {{clamp.config.policy.pap.url}}/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0"></log>
             <toD
-                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
             <setProperty propertyName="logMessage">
                 <simple>${exchangeProperty[policyName]} PDP Group removal status
                 </simple>
@@ -499,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/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java b/src/test/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java
deleted file mode 100644
index b1bbd512e..000000000
--- a/src/test/java/org/onap/clamp/controlloop/models/tosca/authorative/concepts/ControlLoopToscaServiceTemplateTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.clamp.controlloop.models.tosca.authorative.concepts;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class ControlLoopToscaServiceTemplateTest {
-
-    @Test
-    public void testClassDef() {
-        ControlLoopToscaServiceTemplate serviceTemplate = new ControlLoopToscaServiceTemplate();
-        assertNotNull("ControlLoopToscaServiceTemplate is Not null", serviceTemplate);
-    }
-}
\ No newline at end of file
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 06df124ce..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.
@@ -44,15 +44,17 @@ import org.onap.clamp.clds.util.ResourceFileUtils;
 public class SdcSingleControllerConfigurationTest {
 
     /**
-     * @param fileName file for sdc controller configuration.
+     * This method loads the SDC controller configuration from a file located in the resource folder.
+     *
+     * @param fileName          file for sdc controller configuration.
      * @param sdcControllerName sdc controller name.
      * @return instance of SdcSingleControllerConfiguration.
      */
     public static SdcSingleControllerConfiguration loadControllerConfiguration(String fileName,
-        String sdcControllerName) {
+                                                                               String sdcControllerName) {
 
         InputStreamReader streamReader = new InputStreamReader(ResourceFileUtils.getResourceAsStream(fileName),
-            StandardCharsets.UTF_8);
+                StandardCharsets.UTF_8);
         JsonObject jsonNode = JsonUtils.GSON.fromJson(streamReader, JsonObject.class);
 
         return new SdcSingleControllerConfiguration(jsonNode, sdcControllerName);
@@ -61,7 +63,7 @@ public class SdcSingleControllerConfigurationTest {
     @Test
     public final void testTheInit() throws SdcParametersException, IOException {
         SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-TLS.json",
-            "sdc-controller1");
+                "sdc-controller1");
         assertEquals("User", sdcConfig.getUser());
         assertEquals("ThePassword", sdcConfig.getPassword());
         assertEquals("consumerGroup", sdcConfig.getConsumerGroup());
@@ -72,7 +74,7 @@ public class SdcSingleControllerConfigurationTest {
         assertEquals(30, sdcConfig.getPollingTimeout());
 
         assertThat(SdcSingleControllerConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST)
-            .hasSameSizeAs(sdcConfig.getRelevantArtifactTypes());
+                .hasSameSizeAs(sdcConfig.getRelevantArtifactTypes());
         assertEquals("ThePassword", sdcConfig.getKeyStorePassword());
         assertTrue(sdcConfig.activateServerTLSAuth());
         assertThat(sdcConfig.getMsgBusAddress()).contains("localhost");
@@ -81,7 +83,7 @@ public class SdcSingleControllerConfigurationTest {
     @Test(expected = SdcParametersException.class)
     public final void testAllRequiredParameters() throws IOException {
         SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-TLS.json",
-            "sdc-controller1");
+                "sdc-controller1");
         // No exception should be raised
         sdcConfig.testAllRequiredParameters();
         sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-bad.json", "sdc-controller1");
@@ -91,7 +93,7 @@ public class SdcSingleControllerConfigurationTest {
     @Test
     public final void testAllRequiredParametersEmptyEncrypted() throws IOException {
         SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration(
-            "clds/sdc-controller-config-empty-encrypted.json", "sdc-controller1");
+                "clds/sdc-controller-config-empty-encrypted.json", "sdc-controller1");
         sdcConfig.testAllRequiredParameters();
         assertNull(sdcConfig.getKeyStorePassword());
     }
@@ -99,7 +101,7 @@ public class SdcSingleControllerConfigurationTest {
     @Test
     public final void testConsumerGroupWithNull() throws IOException {
         SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-NULL.json",
-            "sdc-controller1");
+                "sdc-controller1");
         assertTrue(sdcConfig.getConsumerGroup() == null);
     }
 }
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 207e93684..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;
@@ -121,7 +121,7 @@ public class AuthorizationControllerItCase {
 
     @Test
     public void testIsUserPermitted() {
-        assertEquals(AuthorizationController.getPrincipalName(sc),"admin");
+        assertEquals(AuthorizationController.getPrincipalName(sc), "admin");
         assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl", "dev", "read")));
         assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl-manage", "dev", "DEPLOY")));
         assertTrue(auth.isUserPermitted(
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 0c08a2e36..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,22 +18,20 @@
  * ============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;
 import static org.junit.Assert.fail;
 
 import com.google.gson.JsonSyntaxException;
-
 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;
@@ -45,7 +43,7 @@ import org.springframework.test.util.ReflectionTestUtils;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller"})
+@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
 public class SdcControllersConfigurationItCase {
 
     @Autowired
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 a8c3e58d4..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;
@@ -33,19 +33,18 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.assertj.core.api.Assertions;
 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;
@@ -58,7 +57,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller"})
+@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
 public class SdcSingleControllerItCase {
 
     private static final String CSAR_ARTIFACT_NAME = "testArtifact.csar";
@@ -133,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 50da40049..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,21 +21,20 @@
  *
  */
 
-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;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 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 fc4872c3b..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,12 +21,11 @@
  *
  */
 
-package org.onap.clamp.clds.model.dcae;
+package org.onap.policy.clamp.clds.model.dcae;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.TreeSet;
-
 import org.junit.Test;
 
 public class DcaeInventoryResponseTest {
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 560f54cf4..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,15 +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 {
 
@@ -37,10 +36,10 @@ public class JsonTypeDescriptorTest {
     @Test
     public void testFromString() {
         JsonObject object = new JsonObject();
-        object.addProperty("one","oneValue");
+        object.addProperty("one", "oneValue");
         JsonObject child = new JsonObject();
-        child.addProperty("two","twoValue");
-        object.add("child",child);
+        child.addProperty("two", "twoValue");
+        object.add("child", child);
 
         JsonObject jsonResult = descriptor.fromString("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
 
@@ -53,10 +52,10 @@ public class JsonTypeDescriptorTest {
         assertThat(res1).isNull();
 
         JsonObject object = new JsonObject();
-        object.addProperty("one","oneValue");
+        object.addProperty("one", "oneValue");
         JsonObject child = new JsonObject();
-        child.addProperty("two","twoValue");
-        object.add("child",child);
+        child.addProperty("two", "twoValue");
+        object.add("child", child);
         String res2 = descriptor.unwrap(object, String.class, null);
         assertThat(res2.replace("\n", "").replace(" ", ""))
                 .isEqualTo("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
@@ -70,7 +69,7 @@ public class JsonTypeDescriptorTest {
     @Test(expected = HibernateException.class)
     public void testUnwrapExpectationThrown() {
         JsonObject object = new JsonObject();
-        object.addProperty("one","oneValue");
+        object.addProperty("one", "oneValue");
 
         descriptor.unwrap(object, Integer.class, null);
     }
@@ -81,10 +80,10 @@ public class JsonTypeDescriptorTest {
         assertThat(res1).isNull();
 
         JsonObject object = new JsonObject();
-        object.addProperty("one","oneValue");
+        object.addProperty("one", "oneValue");
         JsonObject child = new JsonObject();
-        child.addProperty("two","twoValue");
-        object.add("child",child);
+        child.addProperty("two", "twoValue");
+        object.add("child", child);
         JsonObject res2 = descriptor.wrap("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}", null);
         assertThat(res2).isEqualTo(object);
     }
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 83b3dda01..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,13 +21,12 @@
  *
  */
 
-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;
 import java.util.List;
 import java.util.Set;
-
 import org.junit.Assert;
 import org.junit.Test;
 
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 f04e3fa3c..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;
@@ -36,13 +36,12 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 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 29f5a1da8..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 {
 
@@ -39,10 +39,10 @@ public class JsonTemplateFieldTest extends TestCase {
      * Test fieldsEqual method.
      */
     public void testFieldsEqualsMethod() {
-        assertFalse(JsonTemplateField.fieldsEquals(field1,field3));
-        assertFalse(JsonTemplateField.fieldsEquals(field1,field4));
-        assertFalse(JsonTemplateField.fieldsEquals(field1,field5));
-        assertTrue(JsonTemplateField.fieldsEquals(field1,field6));
+        assertFalse(JsonTemplateField.fieldsEquals(field1, field3));
+        assertFalse(JsonTemplateField.fieldsEquals(field1, field4));
+        assertFalse(JsonTemplateField.fieldsEquals(field1, field5));
+        assertTrue(JsonTemplateField.fieldsEquals(field1, field6));
     }
 
     /**
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 b9fcf51aa..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 {
 
@@ -45,9 +45,9 @@ public class JsonTemplateManagerTest extends TestCase {
         JsonTemplateManager jsonTemplateManager =
                 new JsonTemplateManager(
                         ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
-                        "clds/tosca-converter/default-tosca-types.yaml"),
+                                + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file"),
+                        ResourceFileUtils.getResourceAsString(
+                                "clds/tosca-converter/default-tosca-types.yaml"),
                         ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
         jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
@@ -63,9 +63,9 @@ public class JsonTemplateManagerTest extends TestCase {
         JsonTemplateManager jsonTemplateManager =
                 new JsonTemplateManager(
                         ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
-                        "clds/tosca-converter/default-tosca-types.yaml"),
+                                + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file"),
+                        ResourceFileUtils.getResourceAsString(
+                                "clds/tosca-converter/default-tosca-types.yaml"),
                         ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
         jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
@@ -81,9 +81,9 @@ public class JsonTemplateManagerTest extends TestCase {
         JsonTemplateManager jsonTemplateManager =
                 new JsonTemplateManager(
                         ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
-                        "clds/tosca-converter/default-tosca-types.yaml"),
+                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"),
+                        ResourceFileUtils.getResourceAsString(
+                                "clds/tosca-converter/default-tosca-types.yaml"),
                         ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.operational.common.Apex";
         jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
@@ -99,9 +99,9 @@ public class JsonTemplateManagerTest extends TestCase {
         JsonTemplateManager jsonTemplateManager =
                 new JsonTemplateManager(
                         ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Drools/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtils.getResourceAsString(
-                        "clds/tosca-converter/default-tosca-types.yaml"),
+                                + ".policies.controlloop.operational.common.Drools/versions/1.0.0/.file"),
+                        ResourceFileUtils.getResourceAsString(
+                                "clds/tosca-converter/default-tosca-types.yaml"),
                         ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.operational.common.Drools";
         jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
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 b5b0247c8..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;
@@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default","clamp-default-user","default-dictionary-elements"})
+@ActiveProfiles({"clamp-default", "clamp-default-user", "default-dictionary-elements"})
 public class ToscaConverterWithDictionarySupportItCase {
 
     @Autowired
@@ -132,8 +132,7 @@ public class ToscaConverterWithDictionarySupportItCase {
         JsonTemplateManager jsonTemplateManager =
                 new JsonTemplateManager(
                         ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Apex/versions/1.0"
-                                + ".0&#63;connectionTimeToLive=5000/.file"),
+                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"),
                         ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
                         ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
 
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 f6054d538..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;
@@ -31,10 +31,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.mockito.ArgumentMatchers.eq;
 
 import java.security.InvalidKeyException;
-
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
-
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Test;
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 bc2ec2122..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,13 +24,12 @@
  *
  */
 
-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;
 
 import java.io.IOException;
-
 import org.junit.Test;
 
 public class JsonUtilsTest {
@@ -63,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 aa8054c47..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;
@@ -112,6 +113,48 @@ public class CsarInstallerItCase {
         return blueprintArtifact;
     }
 
+    private CsarHandler buildBadFakeCsarHandler(String generatedName, String csarFileName) throws IOException,
+            SdcToscaParserException {
+
+        // Build a Bad csar because the blueprint contains a link to a microservice that does not exist in the emulator
+        // Create fake notification
+        INotificationData notificationData = Mockito.mock(INotificationData.class);
+        Mockito.when(notificationData.getServiceVersion()).thenReturn("1.0");
+        // Create fake resource in notification
+        CsarHandler csarHandler = Mockito.mock(CsarHandler.class);
+        List<IResourceInstance> listResources = new ArrayList<>();
+        Mockito.when(notificationData.getResources()).thenReturn(listResources);
+        Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
+        Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
+        // Create fake blueprint artifact 1 on resource1
+        BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
+                INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca-guilin.yaml", "tca-guilin.yaml",
+                INVARIANT_SERVICE_UUID);
+        listResources.add(blueprintArtifact.getResourceAttached());
+        blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
+
+        // Build fake csarhandler
+        Mockito.when(csarHandler.getSdcNotification()).thenReturn(notificationData);
+        // Build fake csar Helper
+        ISdcCsarHelper csarHelper = Mockito.mock(ISdcCsarHelper.class);
+        Metadata data = Mockito.mock(Metadata.class);
+        Mockito.when(data.getValue("name")).thenReturn(generatedName);
+        Mockito.when(notificationData.getServiceName()).thenReturn(generatedName);
+        Mockito.when(csarHelper.getServiceMetadata()).thenReturn(data);
+
+        // Create helper based on real csar to test policy yaml and global properties
+        // set
+        SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
+        String path = Thread.currentThread().getContextClassLoader().getResource(csarFileName).getFile();
+        ISdcCsarHelper sdcHelper = factory.getSdcCsarHelper(path);
+        Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(sdcHelper);
+
+        // Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(csarHelper);
+        Mockito.when(csarHandler.getPolicyModelYaml())
+                .thenReturn(Optional.ofNullable(ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml")));
+        return csarHandler;
+    }
+
     private CsarHandler buildFakeCsarHandler(String generatedName, String csarFileName) throws IOException,
             SdcToscaParserException {
         // Create fake notification
@@ -173,9 +216,8 @@ public class CsarInstallerItCase {
         Mockito.when(notificationData.getServiceArtifacts()).thenReturn(serviceArtifactsList);
 
         CsarHandler csarHandler = new CsarHandler(notificationData, "", "");
-        csarHandler
-                .setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME_CDS).
-                        getFile());
+        csarHandler.setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME_CDS)
+                .getFile());
         Assert.assertEquals(csarHandler.getPolicyModelYaml(), Optional
                 .ofNullable(ResourceFileUtils.getResourceAsString("example/sdc/expected-result/policy-data.yaml")));
     }
@@ -203,14 +245,25 @@ public class CsarInstallerItCase {
         assertThat(csarInstaller.isCsarAlreadyDeployed(csarHandler)).isTrue();
     }
 
+    @Test(expected = SdcArtifactInstallerException.class)
+    @Transactional
+    public void testInstallTheBadCsarTca()
+            throws IOException, SdcToscaParserException, InterruptedException, BlueprintParserException,
+            SdcArtifactInstallerException {
+        // This test validates that the blueprint is well rejected because the blueprint contains a link
+        // to a policy that does not exist on the policy engine emulator.
+        String generatedName = RandomStringUtils.randomAlphanumeric(5);
+        csarInstaller.installTheCsar(buildBadFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_NO_CDS));
+    }
+
     @Test
     @Transactional
     @Commit
     public void testInstallTheCsarTca() throws SdcArtifactInstallerException, SdcToscaParserException,
             CsarHandlerException, IOException, JSONException, InterruptedException, BlueprintParserException {
         String generatedName = RandomStringUtils.randomAlphanumeric(5);
-        CsarHandler csar = buildFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_CDS);
-        csarInstaller.installTheCsar(csar);
+        csarInstaller.installTheCsar(buildFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_CDS));
+
         assertThat(serviceRepository.existsById("63cac700-ab9a-4115-a74f-7eac85e3fce0")).isTrue();
         // We should have CDS info
         assertThat(serviceRepository.findById("63cac700-ab9a-4115-a74f-7eac85e3fce0").get().getResourceByType("VF")
@@ -227,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 1d6940f83..0fc4b0b5c 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
@@ -23,10 +23,11 @@
  *
  */
 
-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;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -34,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 4d2bfe280..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,9 @@
  *
  */
 
-package org.onap.clamp.loop;
+package org.onap.policy.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -30,15 +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 static org.assertj.core.api.Assertions.assertThat;
+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 2b6fab8b6..8f28299fd 100644
--- a/src/test/java/org/onap/clamp/loop/ServiceTest.java
+++ b/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
@@ -21,15 +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 {
 
@@ -40,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 51b93767f..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;
@@ -45,7 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default","clamp-policy-controller"})
+@ActiveProfiles({"clamp-default", "clamp-policy-controller"})
 public class PolicyEngineControllerTestItCase {
 
     @Autowired
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 0bfb6ece0..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 {
@@ -37,10 +37,11 @@ public class MicroServicePayloadTest {
     public void testPayloadConstruction() throws IOException {
         MicroServicePolicy policy = new MicroServicePolicy("testPolicy", new PolicyModel(
                 "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml"),"1.0.0"), false,null,null, null,null);
+                ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml"), "1.0.0"), false, null, null, null,
+                null);
         policy.setConfigurationsJson(JsonUtils.GSON.fromJson(
-            ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-properties.json"), JsonObject.class));
+                ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-properties.json"), JsonObject.class));
         JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-payload.json"),
-            policy.createPolicyPayload(), false);
+                policy.createPolicyPayload(), false);
     }
 }
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 b6f7c5491..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,17 +21,15 @@
  *
  */
 
-package org.onap.clamp.policy.pdpgroup;
+package org.onap.policy.clamp.policy.pdpgroup;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
-
 import org.junit.Test;
 
 public class PdpGroupTest {
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 413ce60ab..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;
 
@@ -32,9 +32,9 @@ public class PolicyModelKeyTest {
 
     @Test
     public void testEqualsMethod() throws IOException {
-        PolicyModelKey key1 = new PolicyModelKey("name1","1.0.0");
-        PolicyModelKey key2 = new PolicyModelKey(null,"1.0.0");
-        PolicyModelKey key3 = new PolicyModelKey("name1",null);
+        PolicyModelKey key1 = new PolicyModelKey("name1", "1.0.0");
+        PolicyModelKey key2 = new PolicyModelKey(null, "1.0.0");
+        PolicyModelKey key3 = new PolicyModelKey("name1", null);
 
         assertThat(key1.equals(null)).isFalse();
         assertThat(key1.equals("key2")).isFalse();
@@ -42,13 +42,13 @@ public class PolicyModelKeyTest {
         assertThat(key2.equals(key1)).isFalse();
         assertThat(key3.equals(key1)).isFalse();
 
-        PolicyModelKey key4 = new PolicyModelKey("name2","1.0.0");
-        PolicyModelKey key5 = new PolicyModelKey("name1","2.0.0");
+        PolicyModelKey key4 = new PolicyModelKey("name2", "1.0.0");
+        PolicyModelKey key5 = new PolicyModelKey("name1", "2.0.0");
         assertThat(key1.equals(key4)).isFalse();
         assertThat(key1.equals(key5)).isFalse();
 
-        PolicyModelKey key6 = new PolicyModelKey("name(.*)","1.0.0");
-        PolicyModelKey key7 = new PolicyModelKey("name1","1.0.0");
+        PolicyModelKey key6 = new PolicyModelKey("name(.*)", "1.0.0");
+        PolicyModelKey key7 = new PolicyModelKey("name1", "1.0.0");
         assertThat(key1.equals(key6)).isTrue();
         assertThat(key1.equals(key7)).isTrue();
     }
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;
 
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index a8ec7add1..5a668dcf4 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -160,8 +160,7 @@ clamp.config.security.permission.type.template=permission-type-template
 clamp.config.security.permission.type.tosca=permission-type-tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
-
+clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
 # Configuration settings for CDS
 clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host}
 clamp.config.cds.userName=ccsdkapps
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
new file mode 100644
index 000000000..e7d967a26
--- /dev/null
+++ b/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
@@ -0,0 +1,141 @@
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# =============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END======================================================
+#k8s-tca-gen2-v3.yaml
+
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+  - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
+  - plugin:k8splugin?version=3.4.2
+  - plugin:clamppolicyplugin?version=1.1.0
+inputs:
+  service_name:
+    type: string
+    default: 'dcae-tcagen2'
+  log_directory:
+    type: string
+    default: "/opt/logs/dcae-analytics-tca"
+  replicas:
+    type: integer
+    description: number of instances
+    default: 1
+  spring.data.mongodb.uri:
+    type: string
+    default: "mongodb://dcae-mongohost/dcae-tcagen2"
+  tag_version:
+    type: string
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
+  tca.aai.password:
+    type: string
+    default: "DCAE"
+  tca.aai.url:
+    type: string
+    default: "http://aai.onap.svc.cluster.local"
+  tca.aai.username:
+    type: string
+    default: "DCAE"
+  tca_handle_in_subscribe_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
+  tca_handle_out_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT"
+  tca_consumer_group:
+    type: string
+    default: "cg1"
+  policy_model_id:
+    type: string
+    default: "onap.policies.monitoring.tcagen2"
+  policy_id:
+    type: string
+    default: "onap.restart.tca"
+node_templates:
+  docker.tca:
+    type: dcae.nodes.ContainerizedServiceComponent
+    relationships:
+      - target: tcagen2_policy
+        type: cloudify.relationships.depends_on
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            ports:
+              - concat: ["9091:", "0"]
+    properties:
+      application_config:
+        service_calls: []
+        streams_publishes:
+          tca_handle_out:
+            dmaap_info:
+              topic_url:
+                get_input: tca_handle_out_publish_url
+            type: message_router
+        streams_subscribes:
+          tca_handle_in:
+            dmaap_info:
+              topic_url:
+                get_input: tca_handle_in_subscribe_url
+            type: message_router
+        spring.data.mongodb.uri:
+          get_input: spring.data.mongodb.uri
+        streams_subscribes.tca_handle_in.consumer_group:
+          get_input: tca_consumer_group
+        streams_subscribes.tca_handle_in.consumer_ids[0]: c0
+        streams_subscribes.tca_handle_in.consumer_ids[1]: c1
+        streams_subscribes.tca_handle_in.message_limit: 50000
+        streams_subscribes.tca_handle_in.polling.auto_adjusting.max: 60000
+        streams_subscribes.tca_handle_in.polling.auto_adjusting.min: 30000
+        streams_subscribes.tca_handle_in.polling.auto_adjusting.step_down: 30000
+        streams_subscribes.tca_handle_in.polling.auto_adjusting.step_up: 10000
+        streams_subscribes.tca_handle_in.polling.fixed_rate: 0
+        streams_subscribes.tca_handle_in.timeout: -1
+        tca.aai.enable_enrichment: true
+        tca.aai.generic_vnf_path: aai/v11/network/generic-vnfs/generic-vnf
+        tca.aai.node_query_path: aai/v11/search/nodes-query
+        tca.aai.password:
+          get_input: tca.aai.password
+        tca.aai.url:
+          get_input: tca.aai.url
+        tca.aai.username:
+          get_input: tca.aai.username
+        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"}]}]}'
+        tca.processing_batch_size: 10000
+        tca.enable_abatement: true
+        tca.enable_ecomp_logging: true
+      docker_config:
+        healthcheck:
+          endpoint: /actuator/health
+          interval: 30s
+          timeout: 10s
+          type: http
+      image:
+        get_input: tag_version
+      log_info:
+        log_directory:
+          get_input: log_directory
+      tls_info:
+        use_tls: true
+        cert_directory: '/etc/tca-gen2/ssl'
+      replicas:
+        get_input: replicas
+      service_component_type: { get_input: service_name }
+  tcagen2_policy:
+    type: clamp.nodes.policy
+    properties:
+      policy_id:
+        get_input: policy_id
+      policy_model_id:
+        get_input: policy_model_id
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
index 9e616dfea..9e616dfea 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
index 58975d86a..58975d86a 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
index 7f5b897bf..7f5b897bf 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
index 79e79f0fe..79e79f0fe 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
index 163027e46..163027e46 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
index 778efae9e..778efae9e 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
index 78bdde746..78bdde746 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
index 14ae7acd8..14ae7acd8 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
index af7a61ef7..af7a61ef7 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
index 3c17c9004..3c17c9004 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
index f16f4e899..f16f4e899 100644
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
index 6a280d972..6a280d972 100644
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.header
+++ b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
diff --git a/src/test/resources/http-cache/third_party_proxy.py b/src/test/resources/http-cache/third_party_proxy.py
index 97a2a1a18..7fe316852 100755
--- a/src/test/resources/http-cache/third_party_proxy.py
+++ b/src/test/resources/http-cache/third_party_proxy.py
@@ -179,7 +179,7 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
      elif self.path.startswith("/dcae-deployments/") and http_type == "PUT":
             print "self.path start with /dcae-deployments/ DEPLOY, generating response json..."
             #jsondata = json.loads(self.data_string)
-            jsonGenerated = "{\"operationType\":\"install\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/install\"}}"
+            jsonGenerated = "{\"operationType\":\"install\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/install?test=test\"}}"
             print "jsonGenerated: " + jsonGenerated
             if not os.path.exists(cached_file_folder):
                 os.makedirs(cached_file_folder, 0777)
@@ -191,7 +191,7 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
      elif self.path.startswith("/dcae-deployments/") and http_type == "DELETE":
             print "self.path start with /dcae-deployments/ UNDEPLOY, generating response json..."
             #jsondata = json.loads(self.data_string)
-            jsonGenerated = "{\"operationType\":\"uninstall\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/uninstall\"}}"
+            jsonGenerated = "{\"operationType\":\"uninstall\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/uninstall?test=test\"}}"
             print "jsonGenerated: " + jsonGenerated
             if not os.path.exists(cached_file_folder):
                 os.makedirs(cached_file_folder, 0777)
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index 6f3a405fc..86e444efe 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -116,7 +116,7 @@ clamp.config.security.permission.type.template=org.onap.clamp.clds.template
 clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
+clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
 
 #AAF related parameters
 clamp.config.cadi.cadiLoglevel=DEBUG
diff --git a/src/test/resources/robotframework/Dockerfile b/src/test/resources/robotframework/Dockerfile
index 4ae08208e..7e0bf8a26 100644
--- a/src/test/resources/robotframework/Dockerfile
+++ b/src/test/resources/robotframework/Dockerfile
@@ -1,9 +1,5 @@
-#FROM robotframework/rfdocker
-#
-#### Uncomment following two lines if having external test libraries:
-##COPY --chown=robot:robot requirements.txt .
-#RUN pip3 install --no-cache-dir -r requirements.txt
-#COPY *.robot /home/robot/atest
-FROM  ppodgorsek/robot-framework:3.0.3
+FROM  ppodgorsek/robot-framework:latest
+
+USER root
 COPY requirements.txt .
-RUN pip install -r requirements.txt
\ No newline at end of file
+RUN pip3 install --no-cache-dir -r requirements.txt
\ No newline at end of file
diff --git a/src/test/resources/robotframework/robotframework-test.properties b/src/test/resources/robotframework/robotframework-test.properties
index 4ec657355..665842b84 100644
--- a/src/test/resources/robotframework/robotframework-test.properties
+++ b/src/test/resources/robotframework/robotframework-test.properties
@@ -160,7 +160,7 @@ clamp.config.security.permission.type.template=permission-type-template
 clamp.config.security.permission.type.tosca=permission-type-tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
+clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
 
 # Configuration settings for CDS
 clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host}
diff --git a/version.properties b/version.properties
index f00cc8171..35775d32e 100644
--- a/version.properties
+++ b/version.properties
@@ -25,9 +25,9 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=5
-minor=1
-patch=1
+major=6
+minor=0
+patch=0
 
 base_version=${major}.${minor}.${patch}