diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index a8b3317..22acaf4 100644
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -1,96 +1,96 @@
 {
     "dependencies": {
         "default": [{
-            "groupId": "org.onap.policy.drools-applications",
-            "artifactId": "demo",
+            "groupId": "org.onap.policy.drools-applications.controlloop.templates",
+            "artifactId": "template.demo",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "events",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "rest",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appc",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "aai",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
-            "artifactId": "mso",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+            "artifactId": "so",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "trafficgenerator",
             "version": "1.2.0-SNAPSHOT"
         }],
         "amsterdam": [{
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "events",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appc",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appclcm",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "vfc",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "so",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "aai",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdc",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "trafficgenerator",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "eventmanager",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "guard",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actorServiceProvider",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.appc",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.appclcm",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.so",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.vfc",
             "version": "1.2.0-SNAPSHOT"
         }, {
-            "groupId": "org.onap.policy.drools-applications",
+            "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "policy-yaml",
             "version": "1.2.0-SNAPSHOT"
         }, {