From 6abeb297254942c48722c2da0e7c355d523fe307 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Fri, 28 Jul 2017 08:23:01 +0000
Subject: [PATCH] [POLICY-72] replace openecomp for drools-pdp

Change-Id: I8aa8e32d3ba10f7c655b50e97aaf6865514d4777
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 README.md                                          |  2 +-
 feature-eelf/pom.xml                               | 10 +++---
 .../policy/drools/eelf/EelfFeature.java            | 14 ++++----
 ...p.policy.drools.features.PolicyEngineFeatureAPI |  1 +
 ...p.policy.drools.features.PolicyEngineFeatureAPI |  1 -
 .../policy/drools/eelf/test/EElfTest.java          | 12 +++----
 feature-healthcheck/pom.xml                        | 10 +++---
 .../feature/config/feature-healthcheck.properties  |  2 +-
 .../policy/drools/healthcheck/HealthCheck.java     | 12 +++----
 .../drools/healthcheck/HealthCheckFeature.java     |  6 ++--
 .../policy/drools/healthcheck/RestHealthCheck.java |  4 +--
 ...p.policy.drools.features.PolicyEngineFeatureAPI |  1 +
 ...p.policy.drools.features.PolicyEngineFeatureAPI |  1 -
 packages/base/pom.xml                              |  2 +-
 packages/install/pom.xml                           | 10 +++---
 packages/install/src/files/policy-management.conf  |  2 +-
 packages/pom.xml                                   |  4 +--
 policy-core/pom.xml                                |  6 ++--
 .../policy/drools/core/PolicyContainer.java        |  4 +--
 .../policy/drools/core/PolicySession.java          |  4 +--
 .../drools/core/PolicySessionFeatureAPI.java       |  6 ++--
 .../policy/drools/core/jmx/PdpJmx.java             |  2 +-
 .../policy/drools/core/jmx/PdpJmxListener.java     |  2 +-
 .../policy/drools/core/jmx/PdpJmxMBean.java        |  2 +-
 .../policy/drools/properties/Lockable.java         |  2 +-
 .../policy/drools/properties/PolicyProperties.java |  2 +-
 .../policy/drools/properties/Startable.java        |  2 +-
 policy-endpoints/pom.xml                           |  6 ++--
 .../policy/drools/event/comm/Topic.java            |  6 ++--
 .../policy/drools/event/comm/TopicEndpoint.java    | 16 ++++-----
 .../policy/drools/event/comm/TopicListener.java    |  2 +-
 .../drools/event/comm/TopicRegisterable.java       |  2 +-
 .../policy/drools/event/comm/TopicSink.java        |  2 +-
 .../policy/drools/event/comm/TopicSource.java      |  2 +-
 .../drools/event/comm/bus/ApiKeyEnabled.java       |  2 +-
 .../policy/drools/event/comm/bus/BusTopicSink.java |  4 +--
 .../drools/event/comm/bus/BusTopicSource.java      |  4 +--
 .../drools/event/comm/bus/DmaapTopicSink.java      |  2 +-
 .../event/comm/bus/DmaapTopicSinkFactory.java      |  6 ++--
 .../drools/event/comm/bus/DmaapTopicSource.java    |  2 +-
 .../event/comm/bus/DmaapTopicSourceFactory.java    |  6 ++--
 .../drools/event/comm/bus/NoopTopicSink.java       |  6 ++--
 .../event/comm/bus/NoopTopicSinkFactory.java       |  4 +--
 .../policy/drools/event/comm/bus/UebTopicSink.java |  2 +-
 .../drools/event/comm/bus/UebTopicSinkFactory.java |  6 ++--
 .../drools/event/comm/bus/UebTopicSource.java      |  2 +-
 .../event/comm/bus/UebTopicSourceFactory.java      |  6 ++--
 .../event/comm/bus/internal/BusConsumer.java       |  6 ++--
 .../event/comm/bus/internal/BusPublisher.java      |  6 ++--
 .../event/comm/bus/internal/BusTopicBase.java      |  4 +--
 .../comm/bus/internal/InlineBusTopicSink.java      |  4 +--
 .../comm/bus/internal/InlineDmaapTopicSink.java    |  6 ++--
 .../comm/bus/internal/InlineUebTopicSink.java      |  6 ++--
 .../bus/internal/SingleThreadedBusTopicSource.java |  6 ++--
 .../internal/SingleThreadedDmaapTopicSource.java   |  6 ++--
 .../bus/internal/SingleThreadedUebTopicSource.java |  6 ++--
 .../drools/event/comm/bus/internal/TopicBase.java  |  6 ++--
 .../policy/drools/http/client/HttpClient.java      |  4 +--
 .../drools/http/client/HttpClientFactory.java      |  6 ++--
 .../drools/http/client/internal/JerseyClient.java  |  4 +--
 .../drools/http/server/HttpServletServer.java      |  4 +--
 .../http/server/HttpServletServerFactory.java      |  6 ++--
 .../http/server/internal/JettyJerseyServer.java    |  2 +-
 .../http/server/internal/JettyServletServer.java   |  4 +--
 .../drools/http/server/test/HttpClientTest.java    |  8 ++---
 .../drools/http/server/test/HttpServerTest.java    |  4 +--
 .../drools/http/server/test/NoopTopicTest.java     | 14 ++++----
 .../drools/http/server/test/RestEchoService.java   |  2 +-
 .../drools/http/server/test/RestEndpoints.java     |  4 +--
 .../http/server/test/RestMockHealthCheck.java      |  2 +-
 .../src/test/resources/logback-test.xml            |  2 +-
 policy-management/config/policy-engine.properties  |  8 ++---
 policy-management/pom.xml                          |  8 ++---
 .../policy/drools/controller/DroolsController.java | 12 +++----
 .../drools/controller/DroolsControllerFactory.java | 28 +++++++--------
 .../controller/internal/MavenDroolsController.java | 26 +++++++-------
 .../controller/internal/NullDroolsController.java  | 10 +++---
 .../features/PolicyControllerFeatureAPI.java       | 10 +++---
 .../drools/features/PolicyEngineFeatureAPI.java    |  8 ++---
 .../drools/persistence/SystemPersistence.java      |  4 +--
 .../drools/protocol/coders/EventProtocolCoder.java | 12 +++----
 .../drools/protocol/coders/JsonProtocolFilter.java |  4 +--
 .../protocol/coders/ProtocolCoderToolset.java      | 12 +++----
 .../coders/TopicCoderFilterConfiguration.java      |  2 +-
 .../configuration/ControllerConfiguration.java     |  4 +--
 .../configuration/DroolsConfiguration.java         |  2 +-
 .../protocol/configuration/PdpdConfiguration.java  |  4 +--
 .../policy/drools/server/restful/RestManager.java  | 42 +++++++++++-----------
 .../policy/drools/system/Main.java                 |  6 ++--
 .../policy/drools/system/PolicyController.java     | 16 ++++-----
 .../drools/system/PolicyControllerFactory.java     | 10 +++---
 .../policy/drools/system/PolicyEngine.java         | 40 ++++++++++-----------
 .../internal/AggregatedPolicyController.java       | 24 ++++++-------
 policy-management/src/main/server-gen/bin/features |  2 +-
 .../server-gen/bin/policy-management-controller    |  2 +-
 .../main/server/config/policy-engine.properties    |  2 +-
 .../drools/system/test/PolicyEngineTest.java       | 12 +++----
 .../src/test/resources/logback-test.xml            |  2 +-
 policy-utils/pom.xml                               |  4 +--
 .../policy/drools/utils/OrderedService.java        |  2 +-
 .../policy/drools/utils/OrderedServiceImpl.java    |  2 +-
 .../policy/drools/utils/Pair.java                  |  2 +-
 .../policy/drools/utils/PropertyUtil.java          |  2 +-
 .../policy/drools/utils/ReflectionUtil.java        |  2 +-
 .../policy/drools/utils/Triple.java                |  2 +-
 .../policy/drools/utils/PropertyUtilTest.java      |  2 +-
 pom.xml                                            | 32 ++++++++---------
 107 files changed, 349 insertions(+), 349 deletions(-)
 rename feature-eelf/src/main/java/org/{openecomp => onap}/policy/drools/eelf/EelfFeature.java (86%)
 create mode 100644 feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
 delete mode 100644 feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
 rename feature-eelf/src/test/java/org/{openecomp => onap}/policy/drools/eelf/test/EElfTest.java (93%)
 rename feature-healthcheck/src/main/java/org/{openecomp => onap}/policy/drools/healthcheck/HealthCheck.java (94%)
 rename feature-healthcheck/src/main/java/org/{openecomp => onap}/policy/drools/healthcheck/HealthCheckFeature.java (92%)
 rename feature-healthcheck/src/main/java/org/{openecomp => onap}/policy/drools/healthcheck/RestHealthCheck.java (95%)
 create mode 100644 feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
 delete mode 100644 feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/core/PolicyContainer.java (99%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/core/PolicySession.java (99%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/core/PolicySessionFeatureAPI.java (96%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/core/jmx/PdpJmx.java (97%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/core/jmx/PdpJmxListener.java (98%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/core/jmx/PdpJmxMBean.java (95%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/properties/Lockable.java (96%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/properties/PolicyProperties.java (99%)
 rename policy-core/src/main/java/org/{openecomp => onap}/policy/drools/properties/Startable.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/Topic.java (92%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/TopicEndpoint.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/TopicListener.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/TopicRegisterable.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/TopicSink.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/TopicSource.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/ApiKeyEnabled.java (95%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/BusTopicSink.java (93%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/BusTopicSource.java (94%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/DmaapTopicSink.java (95%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/DmaapTopicSource.java (95%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java (99%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/NoopTopicSink.java (94%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/NoopTopicSinkFactory.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/UebTopicSink.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/UebTopicSinkFactory.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/UebTopicSource.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/UebTopicSourceFactory.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/BusConsumer.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/BusPublisher.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/BusTopicBase.java (95%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java (94%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java (94%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/event/comm/bus/internal/TopicBase.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/client/HttpClient.java (93%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/client/HttpClientFactory.java (97%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/client/internal/JerseyClient.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/server/HttpServletServer.java (96%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/server/HttpServletServerFactory.java (98%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/server/internal/JettyJerseyServer.java (99%)
 rename policy-endpoints/src/main/java/org/{openecomp => onap}/policy/drools/http/server/internal/JettyServletServer.java (98%)
 rename policy-endpoints/src/test/java/org/{openecomp => onap}/policy/drools/http/server/test/HttpClientTest.java (97%)
 rename policy-endpoints/src/test/java/org/{openecomp => onap}/policy/drools/http/server/test/HttpServerTest.java (98%)
 rename policy-endpoints/src/test/java/org/{openecomp => onap}/policy/drools/http/server/test/NoopTopicTest.java (88%)
 rename policy-endpoints/src/test/java/org/{openecomp => onap}/policy/drools/http/server/test/RestEchoService.java (96%)
 rename policy-endpoints/src/test/java/org/{openecomp => onap}/policy/drools/http/server/test/RestEndpoints.java (92%)
 rename policy-endpoints/src/test/java/org/{openecomp => onap}/policy/drools/http/server/test/RestMockHealthCheck.java (96%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/controller/DroolsController.java (94%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/controller/DroolsControllerFactory.java (94%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/controller/internal/MavenDroolsController.java (96%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/controller/internal/NullDroolsController.java (94%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/features/PolicyControllerFeatureAPI.java (96%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/features/PolicyEngineFeatureAPI.java (97%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/persistence/SystemPersistence.java (98%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/coders/EventProtocolCoder.java (99%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/coders/JsonProtocolFilter.java (98%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/coders/ProtocolCoderToolset.java (97%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java (99%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/configuration/ControllerConfiguration.java (97%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/configuration/DroolsConfiguration.java (99%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/protocol/configuration/PdpdConfiguration.java (97%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/server/restful/RestManager.java (98%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/system/Main.java (96%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/system/PolicyController.java (87%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/system/PolicyControllerFactory.java (97%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/system/PolicyEngine.java (97%)
 rename policy-management/src/main/java/org/{openecomp => onap}/policy/drools/system/internal/AggregatedPolicyController.java (95%)
 rename policy-management/src/test/java/org/{openecomp => onap}/policy/drools/system/test/PolicyEngineTest.java (90%)
 rename policy-utils/src/main/java/org/{openecomp => onap}/policy/drools/utils/OrderedService.java (97%)
 rename policy-utils/src/main/java/org/{openecomp => onap}/policy/drools/utils/OrderedServiceImpl.java (99%)
 rename policy-utils/src/main/java/org/{openecomp => onap}/policy/drools/utils/Pair.java (97%)
 rename policy-utils/src/main/java/org/{openecomp => onap}/policy/drools/utils/PropertyUtil.java (99%)
 rename policy-utils/src/main/java/org/{openecomp => onap}/policy/drools/utils/ReflectionUtil.java (98%)
 rename policy-utils/src/main/java/org/{openecomp => onap}/policy/drools/utils/Triple.java (97%)
 rename policy-utils/src/test/java/org/{openecomp => onap}/policy/drools/utils/PropertyUtilTest.java (99%)

diff --git a/README.md b/README.md
index 6614ee66..8eae27be 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-This source repository contains the OpenECOMP Policy DroolsPDP code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
+This source repository contains the ONAP Policy DroolsPDP code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
 
 To build it using Maven 3, first build 'policy-common-modules' (which contains dependencies), and then run: mvn clean install
diff --git a/feature-eelf/pom.xml b/feature-eelf/pom.xml
index 3138c8d3..a18b2892 100644
--- a/feature-eelf/pom.xml
+++ b/feature-eelf/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>drools-pdp</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -104,12 +104,12 @@
 			<version>1.0.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
-			<artifactId>ECOMP-Logging</artifactId>
+			<groupId>org.onap.policy.common</groupId>
+			<artifactId>ONAP-Logging</artifactId>
 			<version>${common-modules.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>policy-management</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
diff --git a/feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java b/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
similarity index 86%
rename from feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java
rename to feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
index 83e7a4be..e0ada747 100644
--- a/feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java
+++ b/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.eelf;
+package org.onap.policy.drools.eelf;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.openecomp.policy.common.logging.eelf.Configuration;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.common.logging.eelf.Configuration;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.Main;
+import org.onap.policy.drools.system.PolicyEngine;
 
 /**
  * Feature EELF : Enables EELF Logging Libraries 
diff --git a/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 00000000..f2bcc4cb
--- /dev/null
+++ b/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.eelf.EelfFeature
diff --git a/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 70d1bb8e..00000000
--- a/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.eelf.EelfFeature
diff --git a/feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java b/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
similarity index 93%
rename from feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java
rename to feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
index 6023622d..f7003706 100644
--- a/feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java
+++ b/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.eelf.test;
+package org.onap.policy.drools.eelf.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -26,10 +26,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.drools.eelf.EelfFeature;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.drools.eelf.EelfFeature;
+import org.onap.policy.drools.system.Main;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -116,7 +116,7 @@ public class EElfTest {
 		
 		EELFLogger eelfAuditLogger = EELFManager.getInstance().getAuditLogger();
 		Logger slf4jAuditLogger = org.slf4j.LoggerFactory.getLogger(Configuration.AUDIT_LOGGER_NAME);
-		org.openecomp.policy.common.logging.flexlogger.Logger flexLogger = 
+		org.onap.policy.common.logging.flexlogger.Logger flexLogger = 
 												FlexLogger.getLogger(EElfTest.class, true);
 		
 		/* generate an error entry */
diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml
index 12c6b4d8..3355a2a5 100644
--- a/feature-healthcheck/pom.xml
+++ b/feature-healthcheck/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -99,19 +99,19 @@
 	  <scope>provided</scope>
 	</dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-management</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
index d91c2cc4..cb31e8f0 100644
--- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
+++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
@@ -21,7 +21,7 @@
 http.server.services=HEALTHCHECK
 http.server.services.HEALTHCHECK.host=0.0.0.0
 http.server.services.HEALTHCHECK.port=6969
-http.server.services.HEALTHCHECK.restClasses=org.openecomp.policy.drools.healthcheck.RestHealthCheck
+http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck
 http.server.services.HEALTHCHECK.managed=false
 http.server.services.HEALTHCHECK.swagger=true
 
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
similarity index 94%
rename from feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
rename to feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
index 324ea11b..0e4ed792 100644
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.healthcheck;
+package org.onap.policy.drools.healthcheck;
 
 import java.util.ArrayList;
 import java.util.Properties;
 
 import javax.ws.rs.core.Response;
 
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
similarity index 92%
rename from feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
rename to feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
index ac5b4b49..34c1fe3a 100644
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.healthcheck;
+package org.onap.policy.drools.healthcheck;
 
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
similarity index 95%
rename from feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
rename to feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
index f90363fc..3f51ba46 100644
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.healthcheck;
+package org.onap.policy.drools.healthcheck;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -25,7 +25,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.openecomp.policy.drools.healthcheck.HealthCheck.Reports;
+import org.onap.policy.drools.healthcheck.HealthCheck.Reports;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 00000000..2ae820ac
--- /dev/null
+++ b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.healthcheck.HealthCheckFeature
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 7e307d08..00000000
--- a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.healthcheck.HealthCheckFeature
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 47486bfb..4e57cd92 100644
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 7a00999b..e85dc53f 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -60,25 +60,25 @@
 	<!--  List any dependencies here that should be included in the installer zip -->
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>base</artifactId>
 			<version>${project.version}</version>
 			<type>tar.gz</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>policy-management</artifactId>
 			<version>${project.version}</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>feature-healthcheck</artifactId>
 			<version>${project.version}</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>feature-eelf</artifactId>
 			<version>${project.version}</version>
 			<type>zip</type>
diff --git a/packages/install/src/files/policy-management.conf b/packages/install/src/files/policy-management.conf
index 609aa868..1e5fd76b 100644
--- a/packages/install/src/files/policy-management.conf
+++ b/packages/install/src/files/policy-management.conf
@@ -1,5 +1,5 @@
 CONTROLLER_ARTIFACT_ID=policy-management
 CONTROLLER_NAME=policy-management-controller
 CONTROLLER_PORT=9696
-RULES_ARTIFACT=org.openecomp.policy:dummy-artifact:1.0.0-SNAPSHOT
+RULES_ARTIFACT=org.onap.policy:dummy-artifact:1.0.0-SNAPSHOT
 UEB_TOPIC=policyengine-develop
diff --git a/packages/pom.xml b/packages/pom.xml
index 9ed60d10..50021c1d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>drools-pdp</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index d0cd873b..902c38cb 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -25,7 +25,7 @@
 
   <artifactId>policy-core</artifactId>
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -54,7 +54,7 @@
       <version>6.5.0.Final</version>
     </dependency>
     <dependency>
-       <groupId>org.openecomp.policy.drools-pdp</groupId>
+       <groupId>org.onap.policy.drools-pdp</groupId>
        <artifactId>policy-utils</artifactId>
        <version>${project.version}</version>  
      </dependency>
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
similarity index 99%
rename from policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java
rename to policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
index 65bd5470..cf94bfcb 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core;
+package org.onap.policy.drools.core;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -34,7 +34,7 @@ import org.kie.api.builder.ReleaseId;
 import org.kie.api.builder.Results;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Startable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
similarity index 99%
rename from policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java
rename to policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
index 431d166d..77e16804 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core;
+package org.onap.policy.drools.core;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -36,7 +36,7 @@ import org.kie.api.event.rule.RuleFlowGroupActivatedEvent;
 import org.kie.api.event.rule.RuleFlowGroupDeactivatedEvent;
 import org.kie.api.event.rule.RuleRuntimeEventListener;
 import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.core.jmx.PdpJmx;
+import org.onap.policy.drools.core.jmx.PdpJmx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
similarity index 96%
rename from policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java
rename to policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
index 8792372b..6777eb59 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core;
+package org.onap.policy.drools.core;
 
 import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
 
 /**
  * This interface provides a way to invoke optional features at various
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java
similarity index 97%
rename from policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java
rename to policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java
index 7fa0dd0a..d3cf2e9d 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core.jmx;
+package org.onap.policy.drools.core.jmx;
 
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java
similarity index 98%
rename from policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java
rename to policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java
index 87354bf4..ceb7049e 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core.jmx;
+package org.onap.policy.drools.core.jmx;
 
 import java.lang.management.ManagementFactory;
 
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java
similarity index 95%
rename from policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java
rename to policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java
index a947e82b..37a9e4dc 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.core.jmx;
+package org.onap.policy.drools.core.jmx;
 
 public interface PdpJmxMBean {
 
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java b/policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
similarity index 96%
rename from policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java
rename to policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
index fd8681c3..ee1e7400 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.properties;
+package org.onap.policy.drools.properties;
 
 /**
  * Marks a entity as able to lock and unlock.
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java b/policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
similarity index 99%
rename from policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java
rename to policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
index 06082fcf..4cb5ef43 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.properties;
+package org.onap.policy.drools.properties;
 
 public interface PolicyProperties {
 	
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java b/policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
similarity index 97%
rename from policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java
rename to policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
index bb6334a2..e0f03bb1 100644
--- a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.properties;
+package org.onap.policy.drools.properties;
 
 /**
  * Declares the Startable property of any class class implementing
diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index 18d338ce..b34b6d33 100644
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
   
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>drools-pdp</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -166,7 +166,7 @@
 		</dependency> 
 
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>policy-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java
similarity index 92%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java
index 62640bd8..30174f1f 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
 
 /**
  * Essential Topic Data
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java
index 337d78e5..c1eb1e08 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.openecomp.policy.drools.event.comm.bus.NoopTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.NoopTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java
index a3c2230d..a7dedd27 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Listener for event messages entering the Policy Engine
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java
index 2ce8e9e7..540025e5 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Marks a Topic entity as registerable
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java
index c2c47798..b7937ec3 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Marks a given Topic Endpoint as able to send messages over a topic
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java
index 6d1cbda4..17cde607 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm;
+package org.onap.policy.drools.event.comm;
 
 /**
  * Marker for a Topic Entity, indicating that the entity is able to read
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java
similarity index 95%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java
index 3afd0add..9ddf4fff 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 /**
  * API
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java
similarity index 93%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java
index 59525334..99a600b0 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
-import org.openecomp.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSink;
 
 /**
  * Topic Sink over Bus Infrastructure (DMAAP/UEB)
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
similarity index 94%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
index 6796fc0a..4ef8e2d6 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
-import org.openecomp.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.TopicSource;
 
 /**
  * Generic Topic Source for UEB/DMAAP Communication Infrastructure
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java
similarity index 95%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java
index 3c55c9f3..982fcafa 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 public interface DmaapTopicSink extends BusTopicSink {
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
index 8b8ca530..759e97f7 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,8 +29,8 @@ import java.util.Properties;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.event.comm.bus.internal.InlineDmaapTopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.bus.internal.InlineDmaapTopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * DMAAP Topic Sink Factory
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java
similarity index 95%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java
index 8da7906a..8d9329fa 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 public interface DmaapTopicSource extends BusTopicSource {
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
similarity index 99%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
index 89793d28..d8aceca5 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,10 +27,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.internal.SingleThreadedDmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.internal.SingleThreadedDmaapTopicSource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * DMAAP Topic Source Factory
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java
similarity index 94%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java
index e9d503e2..4880525f 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java
@@ -17,12 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.bus.internal.TopicBase;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.bus.internal.TopicBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
index 788ea683..7a428dcd 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java
index 3966d1ff..57dd1f1a 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 /**
  * Topic Writer over UEB Infrastructure
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java
index 58d5dff5..50718097 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.internal.InlineUebTopicSink;
+import org.onap.policy.drools.event.comm.bus.internal.InlineUebTopicSink;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * UEB Topic Sink Factory
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java
index 4da01302..7d35a993 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 /**
  * Topic Source for UEB Communication Infrastructure
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
index 77b894db..d84ef355 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus;
+package org.onap.policy.drools.event.comm.bus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.internal.SingleThreadedUebTopicSource;
+import org.onap.policy.drools.event.comm.bus.internal.SingleThreadedUebTopicSource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * UEB Topic Source Factory
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java
index d8eb80b8..0555940e 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
index 54e0bcb2..46d6b60f 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.net.MalformedURLException;
 import java.security.GeneralSecurityException;
@@ -28,8 +28,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java
similarity index 95%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java
index 4beaa1f1..f145f3b8 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.bus.ApiKeyEnabled;
+import org.onap.policy.drools.event.comm.bus.ApiKeyEnabled;
 
 /**
  * Bus Topic Base
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
index 3f1f3610..f86c27c7 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.openecomp.policy.drools.event.comm.bus.BusTopicSink;
+import org.onap.policy.drools.event.comm.bus.BusTopicSink;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
index 37051e2f..912607fd 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.Map;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
 
 /**
  * This implementation publishes events for the associated DMAAP topic,
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
similarity index 94%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
index d657f06e..0c01c8b5 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
index 0fa90b50..c3960491 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +27,8 @@ import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.bus.BusTopicSource;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.bus.BusTopicSource;
 
 /**
  * This topic source implementation specializes in reading messages
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
index 7e3e3153..dc70e529 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
similarity index 94%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
index 641eddaa..e394e3df 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.List;
 
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
 
 /**
  * This topic source implementation specializes in reading messages
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java
index ff3d4667..0c8bf6a6 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.event.comm.bus.internal;
+package org.onap.policy.drools.event.comm.bus.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.collections4.queue.CircularFifoQueue;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.TopicListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java
similarity index 93%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java
index 2e81b2c8..e5becdf4 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java
@@ -17,11 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.client;
+package org.onap.policy.drools.http.client;
 
 import javax.ws.rs.core.Response;
 
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Startable;
 
 public interface HttpClient extends Startable {
 	
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java
similarity index 97%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java
index 15586b66..c434c64f 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.client;
+package org.onap.policy.drools.http.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.http.client.internal.JerseyClient;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.http.client.internal.JerseyClient;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java
index 6cbabb2c..fe36740b 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.client.internal;
+package org.onap.policy.drools.http.client.internal;
 
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
@@ -34,7 +34,7 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.openecomp.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.client.HttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java
similarity index 96%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java
index 106602bc..da515af9 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server;
+package org.onap.policy.drools.http.server;
 
-import org.openecomp.policy.drools.properties.Startable;
+import org.onap.policy.drools.properties.Startable;
 
 /**
  * A Jetty Server to server REST Requests
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java
index 83f4b3d7..56e9ccdd 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server;
+package org.onap.policy.drools.http.server;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,8 +27,8 @@ import java.util.Properties;
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import org.openecomp.policy.drools.http.server.internal.JettyJerseyServer;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.http.server.internal.JettyJerseyServer;
+import org.onap.policy.drools.properties.PolicyProperties;
 
 /**
  * Factory of HTTP Servlet-Enabled Servlets
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java
similarity index 99%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java
index c60a62ca..0c724fc8 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.internal;
+package org.onap.policy.drools.http.server.internal;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java
similarity index 98%
rename from policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java
rename to policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java
index 009ad303..d803fe0e 100644
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.internal;
+package org.onap.policy.drools.http.server.internal;
 
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -28,7 +28,7 @@ import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.security.Constraint;
 import org.eclipse.jetty.util.security.Credential;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.http.server.HttpServletServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java
similarity index 97%
rename from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java
rename to policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java
index a7d309a1..0717a091 100644
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -30,9 +30,9 @@ import javax.ws.rs.core.Response;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java
similarity index 98%
rename from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java
rename to policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java
index 6be96320..db2fa0a9 100644
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -28,7 +28,7 @@ import java.net.URL;
 import java.util.UUID;
 
 import org.junit.Test;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.http.server.HttpServletServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java
similarity index 88%
rename from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java
rename to policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java
index 924c2a2c..65269038 100644
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,12 +25,12 @@ import java.util.List;
 import java.util.Properties;
 
 import org.junit.Test;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.bus.NoopTopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.bus.NoopTopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java
similarity index 96%
rename from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java
rename to policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java
index c7e70069..3978caf2 100644
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java
similarity index 92%
rename from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java
rename to policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java
index b944a1d6..a21c9d3b 100644
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.openecomp.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.http.server.HttpServletServer;
 
 @Path("/junit/endpoints")
 public class RestEndpoints {
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java
similarity index 96%
rename from policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java
rename to policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java
index 2d1d9279..cb1405f6 100644
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.http.server.test;
+package org.onap.policy.drools.http.server.test;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/policy-endpoints/src/test/resources/logback-test.xml b/policy-endpoints/src/test/resources/logback-test.xml
index 607a60d1..d93bc4a7 100644
--- a/policy-endpoints/src/test/resources/logback-test.xml
+++ b/policy-endpoints/src/test/resources/logback-test.xml
@@ -8,7 +8,7 @@
         </encoder>
     </appender>
     
-    <logger name="org.openecomp.policy.drools.http.server.test" level="INFO"/>
+    <logger name="org.onap.policy.drools.http.server.test" level="INFO"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>
diff --git a/policy-management/config/policy-engine.properties b/policy-management/config/policy-engine.properties
index 27bd7651..bf28bc80 100644
--- a/policy-management/config/policy-engine.properties
+++ b/policy-management/config/policy-engine.properties
@@ -22,9 +22,9 @@ http.server.services.CONFIG.host=0.0.0.0
 http.server.services.CONFIG.port=9696
 http.server.services.CONFIG.userName=x
 http.server.services.CONFIG.password=y
-http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful
-#http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful,org.openecomp.policy.drools.healthcheck
-#http.server.services.CONFIG.restClasses=org.openecomp.policy.drools.server.restful.RestManager,org.openecomp.policy.drools.healthcheck.RestHealthCheck
-#http.server.services.CONFIG.restClasses=org.openecomp.policy.drools.server.restful.RestManager
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
+#http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful,org.onap.policy.drools.healthcheck
+#http.server.services.CONFIG.restClasses=org.onap.policy.drools.server.restful.RestManager,org.onap.policy.drools.healthcheck.RestHealthCheck
+#http.server.services.CONFIG.restClasses=org.onap.policy.drools.server.restful.RestManager
 http.server.services.CONFIG.managed=false
 http.server.services.CONFIG.swagger=true
diff --git a/policy-management/pom.xml b/policy-management/pom.xml
index e7d83851..4e375d55 100644
--- a/policy-management/pom.xml
+++ b/policy-management/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -142,13 +142,13 @@
   <dependencies>
     
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java
similarity index 94%
rename from policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java
rename to policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java
index 251cef11..c4c61a8a 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller;
+package org.onap.policy.drools.controller;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
 
 /**
  * Drools Controller is the abstractions that wraps the
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java
similarity index 94%
rename from policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java
rename to policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java
index 625eef56..c7a63a03 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller;
+package org.onap.policy.drools.controller;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,21 +26,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.controller.internal.MavenDroolsController;
-import org.openecomp.policy.drools.controller.internal.NullDroolsController;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.controller.internal.MavenDroolsController;
+import org.onap.policy.drools.controller.internal.NullDroolsController;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
-import org.openecomp.policy.drools.utils.Pair;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
+import org.onap.policy.drools.utils.Pair;
 
 /**
  * Drools Controller Factory to manage controller creation, destruction,
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
similarity index 96%
rename from policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java
rename to policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
index 4eacbd1c..db62f782 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller.internal;
+package org.onap.policy.drools.controller.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,18 +36,18 @@ import org.kie.api.runtime.rule.QueryResults;
 import org.kie.api.runtime.rule.QueryResultsRow;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.PolicySession;
-import org.openecomp.policy.drools.core.jmx.PdpJmx;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
-import org.openecomp.policy.drools.utils.ReflectionUtil;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.core.PolicySession;
+import org.onap.policy.drools.core.jmx.PdpJmx;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
+import org.onap.policy.drools.utils.ReflectionUtil;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java
similarity index 94%
rename from policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java
rename to policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java
index 7f5d4665..3fef6fa9 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.controller.internal;
+package org.onap.policy.drools.controller.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
 
 /**
  * no-op Drools Controller
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java
similarity index 96%
rename from policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java
rename to policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java
index 66f64a82..9d166f58 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.features;
+package org.onap.policy.drools.features;
 
 import java.util.Properties;
 
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
 
 public interface PolicyControllerFeatureAPI extends OrderedService {
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java
similarity index 97%
rename from policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java
rename to policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java
index df2ddd6f..eb65c706 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.features;
+package org.onap.policy.drools.features;
 
 import java.util.Properties;
 
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
 
 /**
  * Policy Engine Feature API.
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java b/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java
similarity index 98%
rename from policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java
rename to policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java
index dda20a08..52aac744 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.persistence;
+package org.onap.policy.drools.persistence;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -28,7 +28,7 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.utils.PropertyUtil;
+import org.onap.policy.drools.utils.PropertyUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java
similarity index 99%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java
index 819ee812..762f4476 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,11 +26,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.utils.Pair;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java
similarity index 98%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java
index 7831e7b8..6afeb26a 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.policy.drools.utils.Pair;
+import org.onap.policy.drools.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
similarity index 97%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
index bf7a43f3..8e7dec0b 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -30,11 +30,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
similarity index 99%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
index 3c112573..93737267 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.coders;
+package org.onap.policy.drools.protocol.coders;
 
 import java.util.List;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java
similarity index 97%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java
index 98af02ee..ded7a52c 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.configuration;
+package org.onap.policy.drools.protocol.configuration;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -214,7 +214,7 @@ public class ControllerConfiguration {
                 if (value instanceof DroolsConfiguration) {
                     setDrools(((DroolsConfiguration) value));
                 } else {
-                    throw new IllegalArgumentException(("property \"drools\" is of type \"org.openecomp.policy.drools.protocol.configuration.Drools\", but got "+ value.getClass().toString()));
+                    throw new IllegalArgumentException(("property \"drools\" is of type \"org.onap.policy.drools.protocol.configuration.Drools\", but got "+ value.getClass().toString()));
                 }
                 return true;
             default:
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java
similarity index 99%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java
index 87cf2348..5f32d7a4 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.configuration;
+package org.onap.policy.drools.protocol.configuration;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
similarity index 97%
rename from policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java
rename to policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
index 65de6656..d7295fd4 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.protocol.configuration;
+package org.onap.policy.drools.protocol.configuration;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -217,7 +217,7 @@ public class PdpdConfiguration {
                 if (value instanceof List) {
                     setControllers(((List<ControllerConfiguration> ) value));
                 } else {
-                    throw new IllegalArgumentException(("property \"controllers\" is of type \"java.util.List<org.openecomp.policy.drools.protocol.configuration.Controller>\", but got "+ value.getClass().toString()));
+                    throw new IllegalArgumentException(("property \"controllers\" is of type \"java.util.List<org.onap.policy.drools.protocol.configuration.Controller>\", but got "+ value.getClass().toString()));
                 }
                 return true;
             default:
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java
similarity index 98%
rename from policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java
rename to policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java
index be6c4962..4f5e33e7 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.server.restful;
+package org.onap.policy.drools.server.restful;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,26 +43,26 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter.FilterRule;
-import org.openecomp.policy.drools.protocol.coders.ProtocolCoderToolset;
-import org.openecomp.policy.drools.protocol.configuration.ControllerConfiguration;
-import org.openecomp.policy.drools.protocol.configuration.PdpdConfiguration;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter.FilterRule;
+import org.onap.policy.drools.protocol.coders.ProtocolCoderToolset;
+import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;
+import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
similarity index 96%
rename from policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java
rename to policy-management/src/main/java/org/onap/policy/drools/system/Main.java
index 1bb9a320..fe0cc01f 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.utils.PropertyUtil;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.utils.PropertyUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java
similarity index 87%
rename from policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java
rename to policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java
index 15d1acf3..e6e1ca7e 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
 
 /**
  * A Policy Controller is the higher level unit of control.  It corresponds to
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
similarity index 97%
rename from policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java
rename to policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
index 12a8acdc..34c8589f 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,10 +27,10 @@ import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-import org.openecomp.policy.drools.system.internal.AggregatedPolicyController;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.system.internal.AggregatedPolicyController;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
similarity index 97%
rename from policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java
rename to policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
index 02479ec8..1ee12304 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system;
+package org.onap.policy.drools.system;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,25 +26,25 @@ import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.jmx.PdpJmxListener;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.configuration.ControllerConfiguration;
-import org.openecomp.policy.drools.protocol.configuration.PdpdConfiguration;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.core.jmx.PdpJmxListener;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;
+import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
similarity index 95%
rename from policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java
rename to policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
index f0491624..e67e542f 100644
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.system.internal;
+package org.onap.policy.drools.system.internal;
 
 import java.util.HashMap;
 import java.util.List;
@@ -26,17 +26,17 @@ import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-import org.openecomp.policy.drools.system.PolicyController;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.system.PolicyController;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index 7b14644f..e21562f7 100644
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -51,7 +51,7 @@
 #        │   │   ├── logback-eelf.xml
 #        │   └── lib/
 #        │   │   └── dependencies/
-#        │   │   │   └── ECOMP-Logging-1.1.0-SNAPSHOT.jar
+#        │   │   │   └── ONAP-Logging-1.1.0-SNAPSHOT.jar
 #        │   │   │   └── eelf-core-1.0.0.jar
 #        │   │   └── feature/
 #        │   │       └── feature-eelf-1.1.0-SNAPSHOT.jar
diff --git a/policy-management/src/main/server-gen/bin/policy-management-controller b/policy-management/src/main/server-gen/bin/policy-management-controller
index d77a870c..a9f8ce0d 100644
--- a/policy-management/src/main/server-gen/bin/policy-management-controller
+++ b/policy-management/src/main/server-gen/bin/policy-management-controller
@@ -22,7 +22,7 @@
 
 SNAME="Policy Management"
 PNAME=policy-management
-CLASS=org.openecomp.policy.drools.system.Main
+CLASS=org.onap.policy.drools.system.Main
 
 
 function start() {
diff --git a/policy-management/src/main/server/config/policy-engine.properties b/policy-management/src/main/server/config/policy-engine.properties
index dbaf72af..70a5dcca 100644
--- a/policy-management/src/main/server/config/policy-engine.properties
+++ b/policy-management/src/main/server/config/policy-engine.properties
@@ -42,6 +42,6 @@ http.server.services.CONFIG.host=${{ENGINE_MANAGEMENT_HOST}}
 http.server.services.CONFIG.port=${{ENGINE_MANAGEMENT_PORT}}
 http.server.services.CONFIG.userName=${{ENGINE_MANAGEMENT_USER}}
 http.server.services.CONFIG.password=${{ENGINE_MANAGEMENT_PASSWORD}}
-http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
 http.server.services.CONFIG.managed=false
 http.server.services.CONFIG.swagger=true
diff --git a/policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java b/policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java
similarity index 90%
rename from policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java
rename to policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java
index 15a27767..a9b916b1 100644
--- a/policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.policy.drools.system.test;
+package org.onap.policy.drools.system.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -29,10 +29,10 @@ import javax.ws.rs.core.Response;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.system.PolicyEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,7 +50,7 @@ public class PolicyEngineTest {
 		engineProperties.put("http.server.services", "CONFIG");
 		engineProperties.put("http.server.services.CONFIG.host", "0.0.0.0");
 		engineProperties.put("http.server.services.CONFIG.port", "9696");
-		engineProperties.put("http.server.services.CONFIG.restPackages", "org.openecomp.policy.drools.server.restful");
+		engineProperties.put("http.server.services.CONFIG.restPackages", "org.onap.policy.drools.server.restful");
 		
 		assertFalse(PolicyEngine.manager.isAlive());
 		
diff --git a/policy-management/src/test/resources/logback-test.xml b/policy-management/src/test/resources/logback-test.xml
index e48b9a15..58e3248e 100644
--- a/policy-management/src/test/resources/logback-test.xml
+++ b/policy-management/src/test/resources/logback-test.xml
@@ -8,7 +8,7 @@
         </encoder>
     </appender>
     
-    <logger name="org.openecomp.policy.drools.system.test" level="INFO"/>
+    <logger name="org.onap.policy.drools.system.test" level="INFO"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>
diff --git a/policy-utils/pom.xml b/policy-utils/pom.xml
index 108d66d7..309839d5 100644
--- a/policy-utils/pom.xml
+++ b/policy-utils/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -26,7 +26,7 @@
   <artifactId>policy-utils</artifactId>
 
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java
similarity index 97%
rename from policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java
rename to policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java
index 0851413c..75a3cd7d 100644
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 /**
  * This is a base interface that is used to control the order of a list
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java
similarity index 99%
rename from policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java
rename to policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java
index 72bf7b8b..88a53313 100644
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java
similarity index 97%
rename from policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java
rename to policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java
index a5e34695..ee0bb6f6 100644
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 public class Pair<F,S> {
 	
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
similarity index 99%
rename from policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java
rename to policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
index 1e8dc267..9cfe2ed1 100644
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java
similarity index 98%
rename from policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java
rename to policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java
index 0d82e847..eeb7f1f6 100644
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java
@@ -21,7 +21,7 @@
 /**
  * 
  */
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java
similarity index 97%
rename from policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java
rename to policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java
index 214d949e..530d57a5 100644
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 public class Triple<F,S,T> {
 	
diff --git a/policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java b/policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java
similarity index 99%
rename from policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java
rename to policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java
index b45f1b45..9d2aa397 100644
--- a/policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java
+++ b/policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.policy.drools.utils;
+package org.onap.policy.drools.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/pom.xml b/pom.xml
index 91ebb245..8529f9dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -22,13 +22,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.openecomp.policy.drools-pdp</groupId>
+	<groupId>org.onap.policy.drools-pdp</groupId>
 	<artifactId>drools-pdp</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Policy Engine - Drools PDP</name>
 
-	<description>The ECOMP Policy Engine drools-based PDP Project</description>
+	<description>The ONAP Policy Engine drools-based PDP Project</description>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -74,35 +74,35 @@
 
 	<repositories>
 		<repository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
+			<id>onap-snapshots</id>
+			<name>ONAP Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshots.path}</url>
 		</repository>
 		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
+			<id>onap-releases</id>
+			<name>ONAP Release Repository</name>
 			<url>${nexusproxy}/${releases.path}</url>
 		</repository>
 		<repository>
-			<id>ecomp-staging</id>
-			<name>OpenECOMP Staging Repository</name>
+			<id>onap-staging</id>
+			<name>ONAP Staging Repository</name>
 			<url>${nexusproxy}/${staging.path}</url>
 		</repository>
 	</repositories>
 
 	<distributionManagement>
 		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
+			<id>onap-releases</id>
+			<name>ONAP Release Repository</name>
 			<url>${nexusproxy}/${releases.path}</url>
 		</repository>
 		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
+			<id>onap-snapshots</id>
+			<name>ONAP Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshots.path}</url>
 		</snapshotRepository>
 		<site>
-			<id>ecomp-site</id>
+			<id>onap-site</id>
 			<url>dav:${nexusproxy}${sitePath}</url>
 		</site>
 	</distributionManagement>
@@ -194,7 +194,7 @@
 				<configuration>
 					<nexusUrl>${nexusproxy}</nexusUrl>
 					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
+					<serverId>onap-staging</serverId>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -305,7 +305,7 @@
 					<configuration>
 						<dumpOnExit>true</dumpOnExit>
 						<includes>
-							<include>org.openecomp.*</include>
+							<include>org.onap.*</include>
 						</includes>
 					</configuration>
 					<executions>
-- 
2.16.6