diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/build.properties b/cave/com.raytheon.uf.viz.npp.nucaps/build.properties
index 370759338c..ef36a70027 100644
--- a/cave/com.raytheon.uf.viz.npp.nucaps/build.properties
+++ b/cave/com.raytheon.uf.viz.npp.nucaps/build.properties
@@ -1,6 +1,5 @@
 output.com.raytheon.uf.viz.npp.nucaps.jar = bin/
 bin.includes = META-INF/,\
-               localization/,\
                plugin.xml,\
                com.raytheon.uf.viz.npp.nucaps.jar
 source.com.raytheon.uf.viz.npp.nucaps.jar = src/
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/build.properties b/cave/com.raytheon.uf.viz.npp.viirs/build.properties
index 7f2b8b4116..5b4b618637 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/build.properties
+++ b/cave/com.raytheon.uf.viz.npp.viirs/build.properties
@@ -1,7 +1,6 @@
 output.com.raytheon.uf.viz.npp.viirs.jar = bin/
 bin.includes = META-INF/,\
                plugin.xml,\
-               localization/,\
                res/,\
                com.raytheon.uf.viz.npp.viirs.jar
 source.com.raytheon.uf.viz.npp.viirs.jar = src/
diff --git a/cave/com.raytheon.uf.viz.npp/build.properties b/cave/com.raytheon.uf.viz.npp/build.properties
index 22e876efc1..135de25f4f 100644
--- a/cave/com.raytheon.uf.viz.npp/build.properties
+++ b/cave/com.raytheon.uf.viz.npp/build.properties
@@ -1,5 +1,4 @@
 output.com.raytheon.uf.viz.npp.jar = bin/
 bin.includes = META-INF/,\
-               localization/,\
                com.raytheon.uf.viz.npp.jar
 source.com.raytheon.uf.viz.npp.jar = src/
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
index 6edd3102d9..5d50c956dc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseSatellite.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<contribute xsi:type="separator" id="Separator"/>
     <contribute xsi:type="titleItem" titleText="------ Legacy Satellitle Data ------" id="legacySat"/>
     <contribute xsi:type="subMenu" menuText="Legacy Satellite Data">
     <contribute xsi:type="titleItem" titleText="------ Composite Imagery ------" id="CompositeImagery" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
index 3be4f18446..cde150bcc8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
@@ -3,7 +3,7 @@
 	<include installTo="menu:satellite?before=GOESR" 
         fileName="menus/satellite/goesr/goesrMenu.xml">
     </include>
-	<include installTo="menu:satellite?after=GOESR"
+	<include installTo="menu:satellite"
 		fileName="menus/satellite/baseSatellite.xml">
 	</include>
 </menuContributionFile>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
new file mode 100644
index 0000000000..e505116f82
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+<bundle>
+    <displayList>
+        <displays xsi:type="mapRenderableDisplay"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <descriptor xsi:type="mapDescriptor">
+                <resource>
+                    <loadProperties />
+                    <resourceData xsi:type="nucapsSoundingMapResourceData">
+                        <metadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="nucaps"
+                                    constraintType="EQUALS" />
+                            </mapping>
+                        </metadataMap>
+                    </resourceData>
+                </resource>
+            </descriptor>
+        </displays>
+    </displayList>
+</bundle>
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/bundles/npp/nucapsAvailability.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml
similarity index 96%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/bundles/npp/nucapsAvailability.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml
index 51e6f4d37d..c2d461a3c8 100644
--- a/cave/com.raytheon.uf.viz.npp.nucaps/localization/bundles/npp/nucapsAvailability.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/soundingAvailability.xml
@@ -30,7 +30,7 @@
             <descriptor xsi:type="mapDescriptor">
                 <resource>
                     <loadProperties />
-                    <resourceData xsi:type="nucapsSoundingMapResourceData">
+                    <resourceData xsi:type="nppSoundingMapResourceData">
                         <nsharpResourceData>${soundingResourceData}</nsharpResourceData>
                         <resourceName>${name;Unknown}</resourceName>
                         <metadataMap>
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/index.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/nucapsMenuItems.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/nucapsMenuItems.xml
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/nucaps/nucapsConfig.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/nucaps/nucapsConfig.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.nucaps/localization/nucaps/nucapsConfig.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/nucaps/nucapsConfig.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/singlePanelComposite.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/singlePanelComposite.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/singlePanelComposite.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/singlePanelComposite.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsDayNightBandImagery.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml
similarity index 99%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsDayNightBandImagery.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml
index 9213120e92..207c4f480d 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsDayNightBandImagery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsDayNightBandImagery.xml
@@ -42,16 +42,17 @@
                             <mapping key="parameter">
                                 <constraint constraintValue="0.7Ref" constraintType="EQUALS"/>
                             </mapping>
-                            <mapping key="region">
-                                <constraint constraintValue="${region}" constraintType="EQUALS"/>
-                            </mapping>
                             <mapping key="pluginName">
                                 <constraint constraintValue="viirs" constraintType="EQUALS"/>
                             </mapping>
+                            <mapping key="region">
+                                <constraint constraintValue="${region}" constraintType="EQUALS"/>
+                            </mapping>
+
                         </metadataMap>
                     </resourceData>
 				</resource>
 			</descriptor>
 		</displays>
 	</displayList>
-</bundle>
\ No newline at end of file
+</bundle>
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsImagery.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsImagery.xml
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/bundles/npp/viirs/viirsImagery.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/bundles/npp/viirs/viirsImagery.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/index.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/index.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/index.xml
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
old mode 100644
new mode 100755
similarity index 65%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
index f370df32e3..391fa8e3ec
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml
@@ -30,14 +30,6 @@
     menuText="0.64 μm Imagery Band 1 (CH 01)" id="Img0.64J">
     <substitute key="parameter" value="0.64Ref"/>
   </contribute>
-  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-    menuText="0.865 μm Imagery Band 2 (CH 02)" id="Img0.865J">
-    <substitute key="parameter" value="0.865Ref"/>
-  </contribute>
-   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-    menuText="1.61 μm Imagery Band 3 (CH I3 (R))" id="Img1.61J">
-    <substitute key="parameter" value="1.61Ref"/>
-  </contribute> 
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
     menuText="3.74 μm Imagery Band 4 (CH 04)" id="Img3.74J">
     <substitute key="parameter" value="3.74BT"/>
@@ -46,21 +38,8 @@
     menuText="11.45 μm Imagery Band 5 (CH 05)" id="Img11.45J">
     <substitute key="parameter" value="11.45BT"/>
   </contribute>
-  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-    menuText="Moderate Band 14 (8.55u)" id="Mod8.55J">
-     <substitute key="parameter" value="8.55BT"/>
-  </contribute>
-  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-    menuText="Moderate Band 15 (10.763u)" id="Mod10.763J">
-    <substitute key="parameter" value="10.763BT"/>
-  </contribute>
-  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
-    menuText="Moderate Band 16 (12.013u)" id="Mod12.013J">
-    <substitute key="parameter" value="12.013BT"/>
-  </contribute> 
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="0.7 μm Near Constant Contrast" id="NCC0.7J">
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7J">
   <substitute key="channelType" value="Moderate"/>
   </contribute>
-  
 </menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
old mode 100644
new mode 100755
similarity index 95%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
index 569ed49cbe..653d753bf5
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml
@@ -27,7 +27,7 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <contribute xsi:type="titleItem" id="VIIRSTitleJPSS" titleText="------ Imagery ------"/>
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="0.7 μm Near Constant Contrast" id="NCC0.7J">
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7J">
   <substitute key="channelType" value="Moderate"/> 
   </contribute>
 </menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml
old mode 100644
new mode 100755
similarity index 96%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml
index aa53a04410..e1837edfa3
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems.xml
@@ -27,7 +27,7 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <contribute xsi:type="titleItem" id="VIIRSTitle" titleText="------ Imagery ------"/>
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="0.7 μm Near Constant Contrast" id="NCC0.7">
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7">
   <substitute key="channelType" value="Moderate"/> 
   </contribute>
   
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems_AK.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml
similarity index 97%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems_AK.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml
index 3a48ac3070..1fcfcaebf3 100755
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsBundleItems_AK.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsBundleItems_AK.xml
@@ -30,6 +30,7 @@
     menuText="0.64 μm Imagery Band 1 (CH 01)" id="Img0.64">
     <substitute key="parameter" value="0.64Ref"/>
   </contribute>
+<!--
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
     menuText="0.865 μm Imagery Band 2 (CH 02)" id="Img0.865">
     <substitute key="parameter" value="0.865Ref"/>
@@ -38,6 +39,7 @@
     menuText="1.61 μm Imagery Band 3 (CH I3 (R))" id="Img1.61">
     <substitute key="parameter" value="1.61Ref"/>
   </contribute> 
+-->
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
     menuText="3.74 μm Imagery Band 4 (CH 04)" id="Img3.74">
     <substitute key="parameter" value="3.74BT"/>
@@ -57,7 +59,7 @@
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
     menuText="Moderate Band 13 (4.05u)" id="Mod4.05">
     <substitute key="parameter" value="4.05BT"/>
-  </contribute> -->
+  </contribute> 
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
     menuText="Moderate Band 14 (8.55u)" id="Mod8.55">
     <substitute key="parameter" value="8.55BT"/>
@@ -70,8 +72,9 @@
     menuText="Moderate Band 16 (12.013u)" id="Mod12.013">
     <substitute key="parameter" value="12.013BT"/>
   </contribute> 
+-->
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="0.7 μm Near Constant Contrast" id="NCC0.7">
+    menuText="0.7 μm Near Constant Contrast" id="Moderate0.7">
   <substitute key="channelType" value="Moderate"/>
   </contribute>
   
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
old mode 100644
new mode 100755
similarity index 61%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
index dfdb665186..b7a25f46e9
--- a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsMenuItems.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
@@ -45,45 +45,51 @@
          Lee Byerle 1/2/2018
    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <contribute xsi:type="titleItem" titleText="------ VIIRS ------" id="ImageryLine"/>
-  <contribute xsi:type="subMenu" menuText="S-NPP CONUS" id="CONUSid">
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems.xml">
-      <substitute key="region" value="CONUS"/>
-    </contribute>
-    </contribute>
+  <contribute xsi:type="titleItem" titleText="------ S-NPP ------" id="ImageryLine"/>
+
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="S-NPP CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="CONUS"/>
+  </contribute>
+
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="S-NPP Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="Pacific"/>
+  </contribute>
+
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="S-NPP Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="Puerto Rico"/>
+  </contribute>
   <contribute xsi:type="subMenu" menuText="S-NPP Alaska" id="Alaskaid">
     <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems_AK.xml">
       <substitute key="region" value="Alaska"/>
     </contribute>
-    </contribute>
-  <contribute xsi:type="subMenu" menuText="S-NPP Pacific" id="Pacificid">
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems.xml">
-      <substitute key="region" value="Pacific"/>
-    </contribute>
-    </contribute>
-  <contribute xsi:type="subMenu" menuText="S-NPP Puerto Rico" id="PuertoRicoid">
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems.xml">
-      <substitute key="region" value="Puerto Rico"/>
-    </contribute>
-    </contribute>
-  <contribute xsi:type="subMenu" menuText="NOAA-20 CONUS" id="CONUSidJPSS">
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml">
-      <substitute key="region" value="CONUSJPSS"/>
-    </contribute>
+  </contribute>
+
+
+  <contribute xsi:type="titleItem" titleText="------ NOAA-20 ------" id="ImageryLine"/>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="NOAA-20 CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="CONUSJPSS"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="NOAA-20 Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="PacificJPSS"/>
+  </contribute>
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="NOAA-20 Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7J">
+    <substitute key="channelType" value="Moderate"/>
+    <substitute key="region" value="Puerto_RicoJPSS"/>
   </contribute>
   <contribute xsi:type="subMenu" menuText="NOAA-20 Alaska" id="AlaskaidJPSS">
     <contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_AK_JPSS.xml">
       <substitute key="region" value="AlaskaJPSS"/>
     </contribute>
   </contribute>
-  <contribute xsi:type="subMenu" menuText="NOAA-20 Pacific" id="PacificidJPSS">
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml">
-      <substitute key="region" value="PacificJPSS"/>
-    </contribute> 
-  </contribute>
-  <contribute xsi:type="subMenu" menuText="NOAA-20 Puerto Rico" id="PuertoRicoidJPSS">
-    <contribute xsi:type="subinclude" fileName="menus/npp/viirs/jpss/viirsBundleItems_JPSS.xml">
-      <substitute key="region" value="Puerto_RicoJPSS"/>
-    </contribute> 
-  </contribute>
 </menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsRGBBundleItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsRGBBundleItems.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.npp.viirs/localization/menus/npp/viirs/viirsRGBBundleItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsRGBBundleItems.xml
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.npp/build.properties
index 34d2e4d2da..544aa7de88 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               utility/
diff --git a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
old mode 100644
new mode 100755
similarity index 90%
rename from cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
index 6b8ea24031..adade8d8b4
--- a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/index.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
@@ -24,5 +24,5 @@
         of the file. 
     -->
 <menuContributionFile>
-    <include installTo="menu:satellite?before=GROUP5" fileName="menus/npp/nppMenuItems.xml" />
-</menuContributionFile>
\ No newline at end of file
+    <include installTo="menu:satellite" fileName="menus/npp/nppMenuItems.xml" />
+</menuContributionFile>
diff --git a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
similarity index 81%
rename from cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
index 7f1486a348..9aef4ab0fe 100644
--- a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
@@ -24,12 +24,10 @@
         of the file. 
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="subMenu" id="NPPProducts" menuText="S-NPP and NOAA-20">
-        <contribute xsi:type="separator" id="Imagery"
-            visible="false" />
-        <contribute xsi:type="titleItem" id="SoundingsTitle"
-            titleText="------ Soundings ------" />
-        <contribute xsi:type="separator" id="Soundings"
-            visible="false" />
+    <contribute xsi:type="separator" id="MySeparatorId" />
+    <contribute xsi:type="titleItem" titleText="------ Polar Orbiting Satellites ------" id="polarSat"/>
+    <contribute xsi:type="subMenu" id="NPPProducts" menuText="S-NPP and NOAA-20 VIIRS Imagery">
+        <contribute xsi:type="separator" id="Imagery" visible="false" />
     </contribute>
+
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
index 21398aeb45..c31c03b187 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.edex.plugin.satellite,
  org.apache.commons.codec,
  javax.xml.bind,
- ar.com.hjg.pngj;bundle-version="2.1.1"
+ ar.com.hjg.pngj
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.raytheon.uf.common.localization,
  com.raytheon.uf.common.menus,