From e0addf5b588a1244f9679becd90999dfcb4c3a94 Mon Sep 17 00:00:00 2001
From: "ITSERVICES\\rb7147" <rb7147@att.com>
Date: Tue, 25 Apr 2017 11:46:00 -0400
Subject: Policy 1707 commit to LF

Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>
---
 .../Windows/Dictionary/ActionPolicyDictionary.html |  89 -----------
 .../Windows/Dictionary/AttributeDictionary.html    |  80 ----------
 .../Windows/Dictionary/BRMSParamDictionary.html    |  47 ------
 .../Windows/Dictionary/CLPepOptionsDictionary.html |  65 --------
 .../Dictionary/CLServiceTypeDictionary.html        |  43 -----
 .../Windows/Dictionary/CLSiteDictionary.html       |  43 -----
 .../Windows/Dictionary/CLVarbindDictionary.html    |  48 ------
 .../Windows/Dictionary/CLVnfTypeDictionary.html    |  43 -----
 .../Windows/Dictionary/CLVsclActionDictionary.html |  43 -----
 .../Dictionary/DecisionSettingsDictionary.html     |  60 -------
 .../Dictionary/DescriptiveScopeDictionary.html     |  65 --------
 .../Windows/Dictionary/EcompNameDictionary.html    |  43 -----
 .../Windows/Dictionary/EnforcerTypeDictionary.html |  51 ------
 .../Windows/Dictionary/FWActionListDictionary.html |  43 -----
 .../Dictionary/FWAddressGroupDictionary.html       |  62 --------
 .../Windows/Dictionary/FWParentListDictionary.html |  81 ----------
 .../Windows/Dictionary/FWPortListDictionary.html   |  43 -----
 .../Windows/Dictionary/FWPrefixListDictionary.html |  49 ------
 .../Dictionary/FWProtocolListDictionary.html       |  43 -----
 .../Dictionary/FWSecurityZoneDictionary.html       |  43 -----
 .../Dictionary/FWServiceGroupDictionary.html       |  57 -------
 .../Dictionary/FWServiceListDictionary.html        |  87 ----------
 .../Windows/Dictionary/FWTermListDictionary.html   | 176 ---------------------
 .../Windows/Dictionary/FWZoneDictionary.html       |  43 -----
 .../Windows/Dictionary/MSConfigNameDictionary.html |  43 -----
 .../Windows/Dictionary/MSDCAEUUIDDictionary.html   |  43 -----
 .../Windows/Dictionary/MSLocationDictionary.html   |  43 -----
 .../Windows/Dictionary/MSModelsDictionary.html     |  41 -----
 .../Windows/Dictionary/PSClosedLoopDictionary.html |  43 -----
 .../Dictionary/PSGroupPolicyScopeDictionary.html   |  65 --------
 .../Windows/Dictionary/PSResourceDictionary.html   |  43 -----
 .../Windows/Dictionary/PSServiceDictionary.html    |  43 -----
 .../Windows/Dictionary/PSTypeDictionary.html       |  43 -----
 .../Windows/Dictionary/RiskTypeDictionary.html     |  43 -----
 .../Dictionary/SafePolicyWarningDictionary.html    |  49 ------
 .../app/policyApp/Windows/Edit_Roles_Window.html   |  48 ------
 .../Windows/PDPTabWindows/AddorEditPDPtoGroup.html |  56 -------
 .../Windows/PDPTabWindows/PdpStatusWindow.html     |  73 ---------
 .../PushtabWindow/removeGroupPoliciesWindow.html   |  35 ----
 .../app/policyApp/Windows/new_PDPGroup_Window.html |  94 -----------
 40 files changed, 2252 deletions(-)
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EcompNameDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceGroupDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html
 delete mode 100644 ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html

(limited to 'ecomp-sdk-app/src/main/webapp/app/policyApp/Windows')

diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html
deleted file mode 100644
index b30fc7530..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/ActionPolicyDictionary.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_actionPolicyDict_popup.html">
-    <div class="modal__informative font-showcase" style="width:80%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Attribute Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editActionDict.attributeName" style="width:500px;" />
-            </div>
-            <div class="fn-ebz-container">
-                <label>Type:<sup><b>*</b></sup></label><BR>
-                <select class="form-field" ng-model="editActionDict.type">
-                    <option>REST</option>
-                </select>
-            </div>
-			</br>
-            <div class="fn-ebz-container" >
-                <label>URL:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editActionDict.url" style="width:500px;" />
-            </div>
-			<div class="fn-ebz-container">
-                <label>Method:<sup><b>*</b></sup></label><BR>
-                <select class="form-field" ng-model="editActionDict.method">
-                    <option>GET</option>
- 					<option>PUT</option>
- 					<option>POST</option>
-                </select>
-            </div>
-			</br>
-			<div class="fn-ebz-container" >
-                <label>Description:</label><br>
-                <input type="text" ng-model="editActionDict.description" style="width:500px;" />
-            </div>
-			</br>
-			<div class="fn-ebz-container" >
-            <label>Headers:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default" ng-click="addNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in choices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<input type="text" class="form-field"  ng-model= "choice.option" placeholder="key" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<input type="text" class="form-field"  ng-model= "choice.number" placeholder="Value" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default" ng-show="$last" ng-click="removeChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-			</div> 
-			</br>
-			<div class="fn-ebz-container" >
-                <label>Body:</label><br>
-                <textarea type="text" ng-model="editActionDict.body" style="height :200px; width:500px;"></textarea>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveActionDict(editActionDict);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html
deleted file mode 100644
index e8ff563a5..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/AttributeDictionary.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_Attribute_popup.html">
-    <div class="modal__informative font-showcase" style="width:80%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Attribute Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editAttributeName.xacmlId" style="width:500px;" />
-            </div>
-            <div class="fn-ebz-container">
-                <label>Data Type:<sup><b>*</b></sup></label><BR>
-                <select class="form-field" ng-model="editAttributeName.datatypeBean.shortName">
-                    <option>string</option>
-                    <option>integer</option>
-                    <option>boolean</option>
-                    <option>double</option>
-                    <option>user</option>
-                </select>
-            </div>
-            </br>
-            <div class="fn-ebz-container">
-                <label>Description:</label><br>
-                <input type="text" ng-model="editAttributeName.description" style="width:500px;"/>
-            </div>
-			<div class="fn-ebz-container">
-                <label>Priority:</label><BR>
-                <select class="form-field" ng-model="editAttributeName.priority">
-					<option></option>
-                    <option>High</option>
-                </select>
-            </div>
-			</br>
-      		<div class="fn-ebz-container" >
-            <label>Attribute Values:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in attributes" class="form-horizontal" >
-        			<div  class="fn-ebz-container">
-            			 <input type="text" class="fn-ebz-text" ng-model="choice.attributeValues" maxlength="30" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default" ng-show="$last" ng-click="removeChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div>
-           
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveAttributeName(editAttributeName);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html
deleted file mode 100644
index d8013b997..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/BRMSParamDictionary.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
-<script type="text/ng-template" id="add_brmsParam_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Rule Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editBRMSParam.ruleName" style="width:500px;" />
-            </div>
-            <br/>
-            <div class="fn-ebz-container">
-                <label><sup><b></b></sup>Description:</label><br>
-                <input type="text" ng-model="editBRMSParam.description" style="width:500px;"/>
-            </div>
-            <div>
-				<input type="file" name="file" onchange="angular.element(this).scope().uploadFile(this.files)"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveBRMSParam(editBRMSParam);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html
deleted file mode 100644
index fba9e8de8..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLPepOptionsDictionary.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_PEPOptions_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>PEP Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editPEPOptions.pepName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text"  ng-model="editPEPOptions.description" style="width:500px;"/>
-            </div>
-           <br/>
-          <div>
-            <label>Actions:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in choices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<input type="text" class="form-field"  ng-model= "choice.option" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<input type="text" class="form-field"  ng-model= "choice.number" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveCLPepOptions(editPEPOptions);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html
deleted file mode 100644
index c3d0d3fac..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLServiceTypeDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_CLService_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Service Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editCLService.serviceName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text"  ng-model="editCLService.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveCLServiceDict(editCLService);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html
deleted file mode 100644
index f140f9d1b..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLSiteDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_CLSite_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Site Name:<sup><b>*</b></sup></label><br>
-                <input type="text"  ng-model="editCLSite.siteName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editCLSite.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveCLSite(editCLSite);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html
deleted file mode 100644
index 52754586c..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVarbindDictionary.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_varbind_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Varbind Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editCLVarbind.varbindName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editCLVarbind.varbindDescription" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Varbind OID:</label><br>
-                <input type="text" ng-model="editCLVarbind.varbindOID" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveCLVarbind(editCLVarbind);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html
deleted file mode 100644
index 3e01e6844..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVnfTypeDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_vnfType_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>VNF Type:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editVnfType.vnftype" style="width:500px;" />
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text"  ng-model="editVnfType.description" style="width:500px;" />
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveCLVnfType(editVnfType);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html
deleted file mode 100644
index 7716122dc..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/CLVsclActionDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_vsclAction_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>VSCL Action:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editvsclAction.vsclaction" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editvsclAction.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveCLVSCLAction(editvsclAction);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html
deleted file mode 100644
index 072ccbdb1..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DecisionSettingsDictionary.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_SettingsDict_popup.html">
-    <div class="modal__informative font-showcase" style="width:80%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Settings Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editSettingsDict.xacmlId" style="width:500px;"/>
-            </div>
-  			<div class="fn-ebz-container">
-                <label>Data Type:<sup><b>*</b></sup></label><BR>
-                <select class="form-field" ng-model="editSettingsDict.datatypeBean.shortName">
-                    <option>string</option>
-                    <option>integer</option>
-                    <option>boolean</option>
-                    <option>double</option>
-                    <option>user</option>
-                </select>
-            </div>
-            </br>
-            <div class="fn-ebz-container">
-                <label>Description:</label><br>
-                <input type="text" ng-model="editSettingsDict.description" style="width:500px;" />
-            </div>
-			<div class="fn-ebz-container">
-                <label>Priority:</label><BR>
-                <select class="form-field" ng-model="editSettingsDict.priority">
-					<option></option>
-                    <option>High</option>
-                </select>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveDecisionSettings(editSettingsDict);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html
deleted file mode 100644
index 2daaaf815..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/DescriptiveScopeDictionary.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_descriptiveScope_popup.html">
-    <div class="modal__informative font-showcase" style="width:80%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Descriptive Scope Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editDescriptiveScope.scopeName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editDescriptiveScope.description" style="width:500px;"/>
-            </div>
-			<br/>
-			<div class="fn-ebz-container" >
-            <label>Search Criteria:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in choices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<input type="text" class="form-field"  ng-model= "choice.option" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<input type="text" class="form-field"  ng-model= "choice.number" />
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-			</div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveDescriptiveScope(editDescriptiveScope);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EcompNameDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EcompNameDictionary.html
deleted file mode 100644
index 8bfb091de..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EcompNameDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_ecompName_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Ecomp Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editEcompName.ecompName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text"  ng-model="editEcompName.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveEcompName(editEcompName);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html
deleted file mode 100644
index 87aaae473..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/EnforcerTypeDictionary.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_EnforcerType_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Enforcer Type:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editEnforcerType.enforcingType" style="width:500px;"/>
-            </div>
-            <br/>
-            <div class="fn-ebz-container" >
-                <label>Script:</label><br>
-                <input type="text" ng-model="editEnforcerType.script" style="width:500px;"/>
-            </div>
-            <div class="fn-ebz-container" >
-                <label>Query for Connection:</label><br>
-                <input type="text"  ng-model="editEnforcerType.connectionQuery" style="width:500px;"/>
-            </div>
-            <div class="fn-ebz-container" >
-                <label>Query for Pre-populating value:</label><br>
-                <input type="text" ng-model="editEnforcerType.valueQuery" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveEnforcerType(editEnforcerType);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html
deleted file mode 100644
index 8bbb2cfd1..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWActionListDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWActionList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Action Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editActionList.actionName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editActionList.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWActionList(editActionList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html
deleted file mode 100644
index b0f9d6556..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWAddressGroupDictionary.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWAddressGroup_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Address Group:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editAddressGroup.groupName" style="width:500px;"/>
-            </div>
-			</br>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editAddressGroup.description" style="width:500px;"/>
-            </div>
-			<br/>
-          <div class="fn-ebz-container" >
-            <label>Prefix List:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addAPNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in apchoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in prefixListDictionaryDatas track by option"></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeAPChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWAddressGroup(editAddressGroup);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html
deleted file mode 100644
index f7de1685e..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWParentListDictionary.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_fwParentList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Parent Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editParentList.parentItemName" style="width:500px;"/>
-            </div>
-            <br/>
-			<div>
-                <label>Description:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editParentList.description" style="width:500px;"/>
-            </div>
-			</br>
-            <div class="fn-ebz-container">
-                <label>Service List:</label><br>  
-      			<form  method="post" class="form-horizontal" >
-    				<div class="form-group">
-        				<div class="col-xs-1">
-            				<button type="button" class="btn btn-default"  ng-click="addServiceGroupNewChoice()"><i class="fa fa-plus"></i></button>
-        				</div>
-    				</div>
-    				<div  data-ng-repeat="choice in slchoices" class="form-horizontal" >		
-        				<div  class="fn-ebz-container">
-            				<select  class="form-field"  ng-model="choice.option" ng-options="option for option in serviceListDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        				</div>
-        				<div  class="fn-ebz-container">
-            				<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeServiceGroupChoice()"><i class="fa fa-minus"></i></button>
-        				</div>
-        			</div>
-        		</form>	
-            </div>
- 			<br/>
-            <div class="fn-ebz-container">
-                <label>Address List:</label><br>  
-      			<form  method="post" class="form-horizontal" >
-    				<div class="form-group">
-        				<div class="col-xs-1">
-            				<button type="button" class="btn btn-default"  ng-click="addAddressGroupNewChoice()"><i class="fa fa-plus"></i></button>
-        				</div>
-    				</div>
-    				<div  data-ng-repeat="choice in alchoices" class="form-horizontal" >		
-        				<div  class="fn-ebz-container">
-            				<select  class="form-field"  ng-model="choice.option" ng-options="option for option in addressGroupDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        				</div>
-        				<div  class="fn-ebz-container">
-            				<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeAddressGroupChoice()"><i class="fa fa-minus"></i></button>
-        				</div>
-        			</div>
-        		</form>	
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWParentList(editParentList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html
deleted file mode 100644
index cb0991133..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPortListDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWPortList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Port Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editPortList.portName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editPortList.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWPortList(editPortList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html
deleted file mode 100644
index ab96f1faa..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWPrefixListDictionary.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWPrefixList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>PrefixList Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editPrefixList.prefixListName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>PrefixList Value:</label><br>
-                <input type="text" ng-model="editPrefixList.prefixListValue" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editPrefixList.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-			<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="validateFWPrefixList(editPrefixList);">Validate</button>
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWPrefixList(editPrefixList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html
deleted file mode 100644
index 92f478750..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWProtocolListDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWProtocolList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Protocol Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editProtocolList.protocolName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editProtocolList.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveProtocolList(editProtocolList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html
deleted file mode 100644
index 2e47c7ce1..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWSecurityZoneDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_fwSecurityZone_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Security Zone Name:<sup><b>*</b></sup></label><br>
-                <input type="text"  ng-model="editSecurityZone.zoneName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Security Zone Value:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editSecurityZone.zoneValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveSecurityZone(editSecurityZone);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceGroupDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceGroupDictionary.html
deleted file mode 100644
index 0936d342e..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceGroupDictionary.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_fwServiceGroup_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Service Group:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editServiceGroup.groupName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div class="fn-ebz-container">
-                <label>Service List:</label><br>  
-      			<form  method="post" class="form-horizontal" >
-    				<div class="form-group">
-        				<div class="col-xs-1">
-            				<button type="button" class="btn btn-default"  ng-click="addServiceGroupNewChoice()"><i class="fa fa-plus"></i></button>
-        				</div>
-    				</div>
-    				<div  data-ng-repeat="choice in slchoices" class="form-horizontal" >		
-        				<div  class="fn-ebz-container">
-            				<select  class="form-field"  ng-model="choice.option" ng-options="option for option in serviceListDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        				</div>
-        				<div  class="fn-ebz-container">
-            				<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeServiceGroupChoice()"><i class="fa fa-minus"></i></button>
-        				</div>
-        			</div>
-        		</form>	
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWServiceGroup(editServiceGroup);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html
deleted file mode 100644
index 46d2f1d24..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWServiceListDictionary.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWServiceList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Service Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editServiceList.serviceName" style="width:500px;"/>
-            </div>
-            <div>
-                <label>Description:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editServiceList.serviceDescription" style="width:500px;"/>
-            </div>
-			<br/>
-          <div class="fn-ebz-container" >
-            <label>Transport Protocol:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addTPNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in tpchoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in protocolListDictionaryDatas track by option" >
-                        <option value="">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeTPChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-  		<br/>
-          <div class="fn-ebz-container" >
-            <label>Application Protocol:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addAPNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in apchoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in protocolListDictionaryDatas track by option" >
-                        <option value="">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeAPChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-		<br/>
-        <div class="fn-ebz-container" >
-             <label>Service Ports:<sup><b>*</b></sup></label><br>
-             <input type="text" ng-model="editServiceList.servicePorts" style="width:500px;"/>
-         </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveFWServiceList(editServiceList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html
deleted file mode 100644
index 62b9f9b2d..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWTermListDictionary.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_fwTermList_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div class="fn-ebz-container" >
-                <label>Rule Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editTermList.termName" style="width:500px;" />
-            </div>
-            <div class="fn-ebz-container" >
-                <label>Rule Description:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editTermList.termDescription" style="width:500px;"/>
-            </div>
-			</br>
-			<div class="fn-ebz-container" >
-            <label>From-Zone:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addFromZoneNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in fromZonechoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in zoneDictionaryDatas track by option">
-						<option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeFromZoneChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-			</div> 
-			</br>
-			<div class="fn-ebz-container" >
-            <label>To-Zone:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addToZoneNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in toZonechoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in zoneDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeToZoneChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-			</div> 
-			</br>
-			<div class="fn-ebz-container" >
-            <label>Source-List:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addSourceListNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in sourceListchoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in addressGroupDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeSourceListChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-		</br>
-		<div class="fn-ebz-container" >
-            <label>Destination-List:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addDListNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in destinationListchoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in prefixListDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeDlistChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-		</br>
-		<div class="fn-ebz-container" >
-            <label>Source-Services:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addSourceServiceNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in sourceServicechoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in serviceListDictionaryDatas track by option" ng-options="option for option in serviceGroupDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeSourceServiceChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-		</br>
-		<div class="fn-ebz-container" >
-            <label>Destination-Services:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addDServicesNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in destinationServicechoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in serviceListDictionaryDatas track by option" ng-options="option for option in serviceGroupDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeDServicesChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-		</br>
-		<div class="fn-ebz-container" >
-            <label>Action-List:</label><br>
-             <form  method="post" class="form-horizontal" >
-    			<div class="form-group">
-        			<div class="col-xs-1">
-            			<button type="button" class="btn btn-default"  ng-click="addActionListNewChoice()"><i class="fa fa-plus"></i></button>
-        			</div>
-    			</div>
-    			<div  data-ng-repeat="choice in actionListchoices" class="form-horizontal" >		
-        			<div  class="fn-ebz-container">
-            			<select  class="form-field"  ng-model="choice.option" ng-options="option for option in actionListDictionaryDatas track by option"><option value = "">{{choice.option}}</option></select>
-        			</div>
-        			<div  class="fn-ebz-container">
-            			<button type="button" class="btn btn-default"  ng-show="$last" ng-click="removeActionListChoice()"><i class="fa fa-minus"></i></button>
-        			</div>
-        		</div>
-        	</form>	
-		</div> 
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveTermName(editTermList);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html
deleted file mode 100644
index 3ccc4660e..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/FWZoneDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_FWZone_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Zone Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editZoneName.zoneName" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Zone Value:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editZoneName.zoneValue" style="width:500px;" />
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveZoneName(editZoneName);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html
deleted file mode 100644
index d1dfd80c6..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSConfigNameDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_msConfigName_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Config Name:<sup><b>*</b></sup></label><br>
-                <input type="text"  ng-model="editMSConfig.name" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editMSConfig.descriptionValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveMSConfig(editMSConfig);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html
deleted file mode 100644
index 3edaf78fb..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSDCAEUUIDDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_DCAEuuid_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter UUID:<sup><b>*</b></sup></label><br>
-                <input type="text"  ng-model="editDCAEuuid.name" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label><sup><b></b></sup>Description:</label><br>
-                <input type="text" ng-model="editDCAEuuid.description" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveDCAEUUID(editDCAEuuid);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html
deleted file mode 100644
index d6994e951..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSLocationDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_msLocation_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Micro Service Location:<sup><b>*</b></sup></label><br>
-                <input type="text"  ng-model="editMSLocation.name" style="width:500px;" />
-            </div>
-            <br/>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editMSLocation.descriptionValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveMSLocation(editMSLocation);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html
deleted file mode 100644
index 816192e97..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/MSModelsDictionary.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_msModel_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editMSmodelName.description" style="width:500px;"/>
-            </div>
- 			<div>
-				<input type="file" name="file" onchange="angular.element(this).scope().uploadFile(this.files)"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveMSModel(editMSmodelName);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html
deleted file mode 100644
index eeb2def79..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSClosedLoopDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_PSClosedLoop_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Policy Scope Closed Loop Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editPSClosedLoop.name" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Enter Policy Scope Closed Loop Description:</label><br>
-                <input type="text" ng-model="editPSClosedLoop.descriptionValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="savePSClosedLoop(editPSClosedLoop);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html
deleted file mode 100644
index 93371ea97..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSGroupPolicyScopeDictionary.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_PSGroupPolicyScope_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Policy Scope Group Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editPSGroupPolicyScope.groupName" style="width:500px;"/>
-            </div>
-			</br>
-            <div>
-                <label>Description:</label><br>
-                <input type="text" ng-model="editPSGroupPolicyScope.description" style="width:500px;"/>
-            </div>
-			</br>
- 			<div class="fn-ebz-container" >
-            	<label>Policy Scope Resource:<sup><b>*</b></sup></label><br>
-            	<select class="form-field" style="width:400px;"  ng-model="editPSGroupPolicyScope1.resource"  ng-options="option for option in psResourceDictionaryDatas track by option">
-				<option value = "">{{editPSGroupPolicyScope1.resource[0]}}</option></select>
-     		 </div>
- 			<div class="fn-ebz-container" >
-           		 <label>Policy Scope Type:<sup><b>*</b></sup></label><br>
-            	 <select class="form-field" style="width:400px;"  ng-model="editPSGroupPolicyScope1.type"  ng-options="option for option in psTypeDictionaryDatas track by option">
-				<option value = "">{{editPSGroupPolicyScope1.type[0]}}</option></select>
-      		</div>
-			</br>
- 			<div class="fn-ebz-container" >
-            	<label>Policy Scope Service:<sup><b>*</b></sup></label><br>
-            	<select class="form-field" style="width:400px;" ng-model="editPSGroupPolicyScope1.service"  ng-options="option for option in psServiceDictionaryDatas track by option">
-				<option value = "">{{editPSGroupPolicyScope1.service[0]}}</option></select>
-      		</div>
- 			<div class="fn-ebz-container" >
-            	<label>Policy Scope ClosedLoop:<sup><b>*</b></sup></label><br>
-           	 	<select class="form-field" style="width:400px;"  ng-model="editPSGroupPolicyScope1.closedloop"  ng-options="option for option in psClosedLoopDictionaryDatas track by option">
-				<option value = "">{{editPSGroupPolicyScope1.closedloop[0]}}</option></select>
-      		</div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="savePSGroupPolicyScope(editPSGroupPolicyScope, editPSGroupPolicyScope1);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html
deleted file mode 100644
index c7d0f35d7..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSResourceDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_PSResource_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Policy Scope Resource Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editPSResource.name" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Enter Policy Scope Resource Description:</label><br>
-                <input type="text"  ng-model="editPSResource.descriptionValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="savePSResource(editPSResource);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html
deleted file mode 100644
index b2b9589bb..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSServiceDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_PSService_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Policy Scope Service Name:<sup><b>*</b></sup></label><br>
-                <input type="text" class="fn-ebz-text" ng-model="editPSService.name" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Enter Policy Scope Service Description:</label><br>
-                <input type="text" ng-model="editPSService.descriptionValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="savePSService(editPSService);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html
deleted file mode 100644
index f48e71f3c..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/PSTypeDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_PSType_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Policy Scope Type Name:<sup><b>*</b></sup></label><br>
-                <input type="text"  ng-model="editPSType.name" style="width:500px;"/>
-            </div>
-            <br/>
-            <div>
-                <label>Enter Policy Scope Type Description:</label><br>
-                <input type="text"  ng-model="editPSType.descriptionValue" style="width:500px;"/>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="savePSType(editPSType);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html
deleted file mode 100644
index 75b49bf46..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/RiskTypeDictionary.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_riskType_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label><sup><b>*</b></sup>Risk Type Name:</label><br>
-                <input type="text" ng-model="editRiskType.riskName" style="width:50%;"  />
-            </div>
-            <br/>
-            <div>
-                <label><sup><b></b></sup>Description:</label><br>
-                <input type="text"  ng-model="editRiskType.description" style="width:50%;"  />
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="saveRiskType(editRiskType);">Save</button>
-            <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html
deleted file mode 100644
index 726e02235..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Dictionary/SafePolicyWarningDictionary.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_SafePolicyWarning_popup.html">
-    <div class="modal__informative font-showcase" style="width:800px;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>Enter Safe Policy Warning Name:<sup><b>*</b></sup></label><br>
-                <input type="text" ng-model="editSafePolicyWarning.name" style="width:500px;"/>
-            </div>
-			</br>
-            <div>
-                <label>Message:</label><br>
-                <input type="text" ng-model="editSafePolicyWarning.message" style="width:500px;"/>
-            </div>
-			</br>
- 			<div class="fn-ebz-container" >
-           		 <label>Policy Scope Type:<sup><b>*</b></sup></label><br>
-            	 <select class="form-field" style="width:400px;"  ng-model="editSafePolicyWarning.riskType"  ng-options="option for option in riskTypeDictionaryDatas track by option"></select>
-      		</div>
-			</br>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveSafePolicyWarning(editSafePolicyWarning);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
deleted file mode 100644
index 2c19e02dd..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="edit_Role_popup.html">
-	<div class="modal__informative font-showcase" style="width:50%;">
-		<div class="modal__header">
-			<h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-		</div>
-		<div class="divider-container"><hr> </div>
-		<div class="modal__content">
-			<div class="fn-ebz-container" >
-				<label class="fn-ebz-text-label"><sup><b>*</b></sup>Name:</label><br>
-				<input type="text" class="fn-ebz-text" ng-readonly="true" ng-model="editRole.loginid.userName" maxlength="30" />
-			</div>
-			<br/>
-			<div class="fn-ebz-container" >
-				<label class="fn-ebz-text-label"><sup><b>*</b></sup>Role:</label><br>
-				<input type="text" class="fn-ebz-text" ng-readonly="true" ng-model="editRole.role" maxlength="30" />
-			</div>
-			<br/>
-			<div class="fn-ebz-container" >
-				<label class="fn-ebz-text-label"><sup><b>*</b></sup>Scope:</label><br>
-				<select class="form-field" multiple style="width:400px;" ng-model="editRole.scope" ng-options="option for option in scopeDatas" ></select>
-			</div>
-		</div>
-		<div class="modal__footer">
-			<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="saveRole(editRole);">Save</button>
-			<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
-		</div>
-	</div>
-</script>
\ No newline at end of file
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html
deleted file mode 100644
index a38b0bb9e..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/AddorEditPDPtoGroup.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="create_newPDP_InGroup.html">
-    <div class="modal__informative font-showcase" style="width:80%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div>
-                <label>PDP URL:<sup><b>*</b></sup> </label><br>
-                <input type="text"  class="form-control" ng-model="editPDPInGroup.id" style="width:500px;" />
-            </div>
-			</br>
-            <div>
-                <label>JMX Port:<sup><b>*</b></sup></label><br>
-                <input type="text"  class="form-control" ng-model="editPDPInGroup.jmxPort"
-                       style="width:500px;"  />
-            </div>
-			</br>
-            <div>
-                <label>PDP Name:<sup><b>*</b></sup></label><br>
-                <input type="text"  class="form-control" ng-model="editPDPInGroup.name"
-                      style="width:500px;"  />
-            </div>
-			</br>
-            <div>
-                <label>PDP Description:</label><br>
-                <input type="text"  class="form-control" ng-model="editPDPInGroup.description"
-                      style="width:500px;" />
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="btn btn-success"  herf="javascript:void(0)" ng-click="savePDPInGroup(editPDPInGroup);">Save</button>
-            <button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html
deleted file mode 100644
index 195ac8332..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PDPTabWindows/PdpStatusWindow.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<style>
-table {
-    font-family: arial, sans-serif;
-    border-collapse: collapse;
-    width: 100%;
-}
-
-td, th {
-    border: 1px solid #dddddd;
-    text-align: left;
-    padding: 8px;
-}
-
-tr:nth-child(even) {
-    background-color: #dddddd;
-}
-</style>
-<script type="text/ng-template" id="pdpGroupStatusWindow.html">
-    <div class="modal__informative font-showcase" style="width:90%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="modal__content">
-            <div >
-			<table>
-  			<tr>
-				<th>Status</th>
-    			<td>{{pdpStatusDatas.status}}</td>
-  			</tr>
-			<tr>
-			<th>Errors</th>
-			<td>{{pdpStatusDatas.loadErrors}}</td>
-			</tr>
-			<tr>
-			<th>Warnings</th>
-			<td>{{pdpStatusDatas.loadWarnings}}</td>
-			</tr>
-			<tr>
-			<th>Policies Loaded</th>
-			<td><div style="width: 100%; height: 400px;" ui-grid = "policiesGrid" ui-grid-pagination class= "grid"></div></td>
-			</tr>
-			<tr>
-			<th>Policies Failed to Load</th>
-			<td>{{pdpStatusDatas.failedPolicies}}</td>
-			</tr>
-			</table>
-            </div>
-        </div>
-        <div class="modal__footer">
-            <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html
deleted file mode 100644
index 389d31374..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/PushtabWindow/removeGroupPoliciesWindow.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="remove_PDPGroupPolicies_popup.html">
-    <div class="modal__informative font-showcase" style="width:90%;">
-        <div class="modal__header">
-            <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-        </div>
-        <div class="divider-container"><hr> </div>
-        <div class="modal__content">
-            <div style="width: 100%; height: 400px;" ui-grid = "removePoliciesGrid" ui-grid-pagination ui-grid-selection ui-grid-exporter class= "grid"></div>
-        </div>
-        <div class="modal__footer">
-            <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="removePolicies();">Remove</button>
-            <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Close</button>
-        </div>
-    </div>
-</script>
diff --git a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html b/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html
deleted file mode 100644
index 9de838015..000000000
--- a/ecomp-sdk-app/src/main/webapp/app/policyApp/Windows/new_PDPGroup_Window.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP Policy Engine
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<script type="text/ng-template" id="add_pdp_group_popup.html">
-	<div class="modal__informative font-showcase" style="width:50%;">
-		<div class="modal__header">
-			<h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-		</div>
-		<div class="divider-container"><hr> </div>
-		<div class="modal__content">
-			<div>
-				<label>Group Name:<sup><b>*</b></sup> </label><br>
-				<input type="text"  class="form-control" ng-model="editPDPGroup.groupName"  style="width:500px;"  />
-			</div>
-			<br/>
-			<div>
-				<label><sup><b></b></sup>Group Description:</label><br>
-				<input type="text"   class="form-control" ng-model="editPDPGroup.description"
-					    style="width:500px;"  />
-			</div>
-		</div>
-		<div class="modal__footer">
-			<button class="btn btn-success" herf="javascript:void(0)" ng-click="savePDPGroup(editPDPGroup);">Save</button>
-			<button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-		</div>
-	</div>
-</script>
-
-<script type="text/ng-template" id="edit_pdp_group_popup.html">
-	<div class="modal__informative font-showcase" style="width:90%;">
-		<div class="modal__header">
-			<h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
-		</div>
-		<div class="divider-container"><hr> </div>
-		<div class="modal__content">
-			<div>
-				<label> Group Name:<sup><b>*</b></sup></label><br>
-				<input type="text"  class="form-control"  ng-model="editPDPGroup.name" style="width:500px;" />
-			</div>
-			</br>
-			<div>
-				<label>Group Description:</label><br>
-				<input type="text" class="form-control" ng-model="editPDPGroup.description" style="width:500px;" />
-			</div>
-			<div >
-				<label>Policies:</label><br>
-				<div style="width: 100%; height: 400px;" ui-grid = "policiesGrid" ui-grid-pagination ui-grid-selection ui-grid-exporter class= "grid"></div>
-			</div>
-			<div >
-				<label>PDP's In Group:</label><br>
-				<div style="width: 100%; height: 200px;" ui-grid = "pdpsGrid" ui-grid-pagination ui-grid-selection ui-grid-exporter class= "grid"></div>
-			</div>
-		</div>
-	<div class="modal__footer">
-		<button class="btn btn-success" herf="javascript:void(0)" ng-click="savePDPGroup(editPDPGroup);">Save</button>
-		<button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-	</div>
-	</div>
-</script>
-
-<script type="text/ng-template" id="show_policies_pdp_group_popup.html">
-	<div class="modal__informative font-showcase" style="width:90%;">
-		<div class="modal__header">
-			<h2 class="font-showcase-font-name" style="width: 500px;">View PDP Group Policies</h2>
-		</div>
-		<div class="divider-container"><hr> </div>
-		<div class="modal__content">
-			<div >
-				<label>Policies:</label><br>
-				<div style="width: 100%; height: 400px;" ui-grid = "policiesGrid" ui-grid-pagination ui-grid-selection ui-grid-exporter class= "grid"></div>
-			</div>
-		</div>
-	<div class="modal__footer">
-		<button class="btn btn-default" herf="javascript:void(0)" ng-click="close()">Close</button>
-	</div>
-	</div>
-</script>
-- 
cgit 1.2.3-korg