Change the java package name

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

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

2 files changed, 229 insertions, 229 deletions

diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 505ea30d9..c43f3297d 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -6,20 +6,20 @@
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=getLoopNames()" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=getLoopNames()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET All Loop names FAILED: ${exception.stacktrace}" />
 
@@ -33,26 +33,26 @@
 				</doTry>
 			</route>
 		</get>
-		<get uri="/v2/loop/{loopName}" outType="org.onap.clamp.loop.Loop"
+		<get uri="/v2/loop/{loopName}" outType="org.onap.policy.clamp.loop.Loop"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}" />
 
@@ -68,32 +68,32 @@
 		</get>
 
 		<post uri="/v2/loop/updateGlobalProperties/{loopName}"
-			type="com.google.gson.JsonObject" consumes="application/json"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+              type="com.google.gson.JsonObject" consumes="application/json"
+              outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<setHeader headerName="GlobalPropertiesJson">
 						<simple>${body}</simple>
 					</setHeader>
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 
@@ -108,36 +108,36 @@
 			</route>
 		</post>
 		<post uri="/v2/loop/updateOperationalPolicies/{loopName}"
-			type="com.google.gson.JsonArray" consumes="application/json"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+              type="com.google.gson.JsonArray" consumes="application/json"
+              outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<setHeader headerName="OperationalPoliciesArray">
 						<simple>${body}</simple>
 					</setHeader>
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UPDATE Operational policies FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
 
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
@@ -150,39 +150,39 @@
 			</route>
 		</post>
 		<post uri="/v2/loop/updateMicroservicePolicy/{loopName}"
-			type="org.onap.clamp.policy.microservice.MicroServicePolicy"
+			type="org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
 			consumes="application/json"
-			outType="org.onap.clamp.policy.microservice.MicroServicePolicy"
+			outType="org.onap.policy.clamp.policy.microservice.MicroServicePolicy"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<setProperty propertyName="MicroServicePolicyObject">
 						<simple>${body}</simple>
 					</setProperty>
 
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${exchangeProperty[MicroServicePolicyObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${exchangeProperty[MicroServicePolicyObject]})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -194,7 +194,7 @@
 			</route>
 		</post>
 		<put uri="/v2/loop/deploy/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -204,32 +204,32 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:deploy-loop" />
 
 					<log loggingLevel="INFO"
 						message="DEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -241,38 +241,38 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}"
-			 outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|microServicePolicyName" />
 				<doTry>
 					<log loggingLevel="INFO"
 						 message="Refresh Micro Service Policy UI for loop: ${header.loopName} and ${header.microServicePolicyName}" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
+							uri="bean:org.onap.policy.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=refreshMicroServicePolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.microServicePolicyName})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=refreshMicroServicePolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.microServicePolicyName})" />
 					<log loggingLevel="INFO"
 						 message="REFRESH Micro Service policy request successfully executed for loop: ${header.loopName}" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -284,38 +284,38 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|operationalPolicyName" />
 				<doTry>
 					<log loggingLevel="INFO"
 						message="Refresh Operational Policy UI for loop: ${header.loopName} and ${header.operationalPolicyName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
+							uri="bean:org.onap.policy.clamp.loop.cds.CdsDataInstaller?method=updateCdsServiceProperties(${exchangeProperty[loopObject].getModelService()})" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=refreshOperationalPolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.operationalPolicyName})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=refreshOperationalPolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.operationalPolicyName})" />
 					<log loggingLevel="INFO"
 						message="REFRESH operational policy request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -327,7 +327,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/undeploy/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -337,31 +337,31 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:undeploy-loop" />
 
 					<log loggingLevel="INFO"
 						message="UNDEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -373,7 +373,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/stop/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -383,31 +383,31 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
 					<log loggingLevel="INFO"
 						message="STOP request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -419,7 +419,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/restart/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -429,32 +429,32 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:add-all-to-active-pdp-group" />
 					<log loggingLevel="INFO"
 						message="RESTART request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -466,7 +466,7 @@
 			</route>
 		</put>
 		<put uri="/v2/loop/submit/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
@@ -476,12 +476,12 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})" />
 					<setProperty propertyName="raiseHttpExceptionFlag">
 						<simple resultType="java.lang.Boolean">false</simple>
 					</setProperty>
@@ -529,20 +529,20 @@
 					<log loggingLevel="INFO"
 						message="SUBMIT request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -563,12 +563,12 @@
 						<simple resultType="java.lang.Boolean">true</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:undeploy-loop" />
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
 					<log loggingLevel="INFO"
@@ -602,22 +602,22 @@
 						<to uri="direct:delete-policy" />
 					</split>
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=deleteLoop(${header.loopName})" />
+						uri="bean:org.onap.policy.clamp.loop.LoopController?method=deleteLoop(${header.loopName})" />
 					<log loggingLevel="INFO"
 						message="DELETE request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -629,38 +629,38 @@
 			</route>
 		</put>
 		<get uri="/v2/loop/getstatus/{loopName}"
-			outType="org.onap.clamp.loop.Loop" produces="application/json">
+             outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<log loggingLevel="INFO"
 						message="GET STATUS request for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:update-policy-status-for-loop" />
 					<to uri="direct:update-dcae-status-for-loop" />
 					<to uri="direct:update-loop-state" />
 
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET STATUS request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 					</doCatch>
 					<doFinally>
 						<setBody>
@@ -674,32 +674,32 @@
 			</route>
 		</get>
 
-		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -711,14 +711,14 @@
 				</doTry>
 			</route>
 		</put>
-		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" outType="org.onap.policy.clamp.loop.Loop" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion|policyName" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<setProperty propertyName="policyName">
 						<simple>${header.policyName}</simple>
@@ -735,22 +735,22 @@
 					</setProperty>
 					<to uri="direct:delete-policy" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -762,33 +762,33 @@
 			</route>
 		</put>
 		<post
-				uri="/v2/loop/create/{loopName}?templateName={templateName}"
-				outType="org.onap.clamp.loop.Loop" consumes="application/json"
-				produces="application/json">
+                uri="/v2/loop/create/{loopName}?templateName={templateName}"
+                outType="org.onap.policy.clamp.loop.Loop" consumes="application/json"
+                produces="application/json">
 			<route>
 				<removeHeaders
 						pattern="*"
 						excludePattern="loopName|templateName" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to
-							uri="bean:org.onap.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})" />
+							uri="bean:org.onap.policy.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})" />
 						<setHeader headerName="CamelHttpResponseCode">
 							<constant>500</constant>
 						</setHeader>
@@ -800,25 +800,25 @@
 			</route>
 		</post>
 		<get uri="/v2/dictionary"
-			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+             outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Dictionary request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -838,20 +838,20 @@
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Dictionary request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -865,26 +865,26 @@
 			</route>
 		</get>
 		<get uri="/v2/dictionary/{dictionaryName}"
-			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+             outType="org.onap.policy.clamp.tosca.Dictionary" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 					excludePattern="dictionaryName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -897,29 +897,29 @@
 				</doTry>
 			</route>
 		</get>
-		<put uri="/v2/dictionary" type="org.onap.clamp.tosca.Dictionary"
-			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
-			produces="application/json">
+		<put uri="/v2/dictionary" type="org.onap.policy.clamp.tosca.Dictionary"
+             outType="org.onap.policy.clamp.tosca.Dictionary" consumes="application/json"
+             produces="application/json">
 			<route>
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="DictionaryObject">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="PUT Dictionary request failed for: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -934,30 +934,30 @@
 		</put>
 
 		<put uri="/v2/dictionary/{name}"
-			type="org.onap.clamp.tosca.Dictionary"
-			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
-			produces="application/json">
+             type="org.onap.policy.clamp.tosca.Dictionary"
+             outType="org.onap.policy.clamp.tosca.Dictionary" consumes="application/json"
+             produces="application/json">
 			<route>
 				<removeHeaders pattern="*" excludePattern="name" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="DictionaryObject">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -976,20 +976,20 @@
 				<removeHeaders pattern="*" excludePattern="name" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1010,20 +1010,20 @@
 					excludePattern="name|shortName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<to
-						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
+						uri="bean:org.onap.policy.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1038,26 +1038,26 @@
 		</delete>
 
 		<get uri="/v2/policyToscaModels"
-			outType="org.onap.clamp.loop.template.PolicyModel"
+			outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Policy Models request failed for: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1071,27 +1071,27 @@
 			</route>
 		</get>
 		<get uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
-			outType="org.onap.clamp.loop.template.PolicyModel"
+			outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 					excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType},${header.policyModelVersion})" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType},${header.policyModelVersion})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1111,20 +1111,20 @@
 					excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1140,29 +1140,29 @@
 
 		<post uri="/v2/policyToscaModels"
 			type="java.lang.String"
-			outType="org.onap.clamp.loop.template.PolicyModel"
+			outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			consumes="plain/text" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"/>
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="PolicyModelTosca">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
+						uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="POST Policy Model YAML request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1177,30 +1177,30 @@
 		</post>
 		<put uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
 			  type="java.lang.String"
-			  outType="org.onap.clamp.loop.template.PolicyModel"
+			  outType="org.onap.policy.clamp.loop.template.PolicyModel"
 			  consumes="plain/text" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 							   excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+							uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
 					<setProperty propertyName="PolicyModelTosca">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-							uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=updatePolicyModelTosca(${header.policyModelType},${policyModelVersion},${exchangeProperty[PolicyModelTosca]})" />
+							uri="bean:org.onap.policy.clamp.loop.template.PolicyModelsService?method=updatePolicyModelTosca(${header.policyModelType},${policyModelVersion},${exchangeProperty[PolicyModelTosca]})" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+							uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="MODIFY Policy Model YAML request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1215,26 +1215,26 @@
 		</put>
 
 		<get uri="/v2/templates"
-			outType="org.onap.clamp.loop.template.LoopTemplate"
+			outType="org.onap.policy.clamp.loop.template.LoopTemplate"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
+						uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET ALL templates request failed: ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1248,27 +1248,27 @@
 			</route>
 		</get>
 		<get uri="/v2/templates/{templateName}"
-			outType="org.onap.clamp.loop.template.LoopTemplate"
+			outType="org.onap.policy.clamp.loop.template.LoopTemplate"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
 					excludePattern="templateName" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
+						uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET Template request failed for template: ${header.templateName},  ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1287,20 +1287,20 @@
 				<removeHeaders pattern="*" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
 					<to
-						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+						uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
+						uri="bean:org.onap.policy.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+						uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
 							<constant>true</constant>
 						</handled>
 						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+								uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
 							 message="GET All Template names request failed for template:  ${exception.stacktrace}" />
 						<setHeader headerName="CamelHttpResponseCode">
@@ -1313,10 +1313,10 @@
 				</doTry>
 			</route>
 		</get>
-		<get uri="/v2/clampInformation" outType="org.onap.clamp.clds.model.ClampInformation"
+		<get uri="/v2/clampInformation" outType="org.onap.policy.clamp.clds.model.ClampInformation"
 			 produces="application/json">
 			<to
-					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=getClampInformation()" />
+					uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=getClampInformation()" />
 		</get>
 	</rest>
 </rests>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index ce52f31d6..61e1efbdc 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -1,10 +1,10 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
 	<rest>
 		<get uri="/v1/healthcheck" produces="application/json"
-			outType="org.onap.clamp.clds.model.CldsHealthCheck">
+			outType="org.onap.policy.clamp.clds.model.CldsHealthCheck">
 			<route>
 				<setBody>
-					<method ref="org.onap.clamp.clds.service.CldsHealthcheckService"
+					<method ref="org.onap.policy.clamp.clds.service.CldsHealthcheckService"
 						method="gethealthcheck()" />
 				</setBody>
 				<when>
@@ -18,7 +18,7 @@
 		</get>
 
 		<get uri="/v1/user/getUser" produces="text/plain">
-			<to uri="bean:org.onap.clamp.authorization.UserService?method=getUser()" />
+			<to uri="bean:org.onap.policy.clamp.authorization.UserService?method=getUser()" />
 		</get>
 	</rest>
 </rests>