diff --git a/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml
index 11694fb264..3ae35f8f27 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml
@@ -44,4 +44,9 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="com.raytheon.uf.viz.d2d.ui.obs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 </feature>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath b/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath
+++ b/cave/com.raytheon.uf.viz.d2d.ui.local/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF
index 108ffd3551..f1e75e2037 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.d2d.ui.local/META-INF/MANIFEST.MF
@@ -2,12 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: D2D Local Menu
 Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui.local;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: com.raytheon.uf.viz.d2d.ui.local.Activator
+Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.uf.viz.d2d.ui;bundle-version="1.12.1174",
  com.raytheon.viz.grid;bundle-version="1.12.1174",
  com.raytheon.viz.pointdata;bundle-version="1.12.1174"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties
index 15f66d39dc..2c349c5dd1 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties
+++ b/cave/com.raytheon.uf.viz.d2d.ui.local/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.local/src/com/raytheon/uf/viz/d2d/ui/local/Activator.java b/cave/com.raytheon.uf.viz.d2d.ui.local/src/com/raytheon/uf/viz/d2d/ui/local/Activator.java
deleted file mode 100644
index 329bce5946..0000000000
--- a/cave/com.raytheon.uf.viz.d2d.ui.local/src/com/raytheon/uf/viz/d2d/ui/local/Activator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.raytheon.uf.viz.d2d.ui.local;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath
index ad32c83a78..bc74aabe31 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF
index dbe3d61ce5..3bc40371db 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/META-INF/MANIFEST.MF
@@ -2,8 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: D2D Ncep Hydro
 Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui.ncephydro;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: com.raytheon.uf.viz.d2d.ui.ncephydro.Activator
+Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.uf.viz.d2d.ui;bundle-version="1.12.1174",
@@ -13,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.viz.warnings;bundle-version="1.12.1174",
  com.raytheon.uf.viz.tcs;bundle-version="1.12.1174",
  com.raytheon.uf.viz.ccfp;bundle-version="1.12.1174"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties
index 15f66d39dc..2c349c5dd1 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/src/com/raytheon/uf/viz/d2d/ui/ncephydro/Activator.java b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/src/com/raytheon/uf/viz/d2d/ui/ncephydro/Activator.java
deleted file mode 100644
index b4803c6be7..0000000000
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/src/com/raytheon/uf/viz/d2d/ui/ncephydro/Activator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.raytheon.uf.viz.d2d.ui.ncephydro;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/.classpath b/cave/com.raytheon.uf.viz.d2d.ui.obs/.classpath
new file mode 100644
index 0000000000..67e2a52cbd
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/.project b/cave/com.raytheon.uf.viz.d2d.ui.obs/.project
new file mode 100644
index 0000000000..e5aaf73ae0
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.viz.d2d.ui.obs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.d2d.ui.obs/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f42de363af
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui.obs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6d736eed0d
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: D2D UI Obs
+Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui.obs;singleton:=true
+Bundle-Version: 1.14.0.qualifier
+Bundle-Vendor: RAYTHEON
+Require-Bundle: org.eclipse.core.runtime,
+ com.raytheon.uf.viz.d2d.ui;bundle-version="1.14.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/build.properties b/cave/com.raytheon.uf.viz.d2d.ui.obs/build.properties
new file mode 100644
index 0000000000..06d20723f9
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/build.properties
@@ -0,0 +1,3 @@
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
new file mode 100644
index 0000000000..40992fe09b
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<?eclipse version="3.5"?>
+<plugin>
+    <extension point="org.eclipse.ui.menus">
+        <menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=d2d.obsMenu">
+            <menu id="obs" label="Obs" mnemonic="O">
+                <visibleWhen>
+                    <reference
+                        definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
+                    </reference>
+                </visibleWhen>
+                <separator name="SURFACE" visible="false">
+                </separator>
+                <separator name="EndOfInitial" visible="true">
+                </separator>
+                <command commandId="com.raytheon.viz.ui.actions.titleAction"
+                    label="------ METAR ------">
+                </command>
+                <separator name="METAR" visible="false">
+                </separator>
+                <separator name="EndOfMetar" visible="true">
+                </separator>
+                <command commandId="com.raytheon.viz.ui.actions.titleAction"
+                    label="------ Synoptic ------">
+                </command>
+                <separator name="SYNOPTIC" visible="false">
+                </separator>
+                <separator name="EndOfSynoptic" visible="true">
+                </separator>
+                <command commandId="com.raytheon.viz.ui.actions.titleAction"
+                    label="------ Local data ------">
+                </command>
+                <separator name="LocalData" visible="false">
+                </separator>
+                <separator name="EndOfLocalData" visible="true">
+                </separator>
+                <command commandId="com.raytheon.viz.ui.actions.titleAction"
+                    label="------ Maritime ------" id="MARITIME">
+                </command>
+                <separator name="EndOfMaritime" visible="true">
+                </separator>
+                <command commandId="com.raytheon.viz.ui.actions.titleAction"
+                    label="------ Hazards ------">
+                </command>
+                <separator name="HAZARDS" visible="false" />
+                <separator name="LIGHTNINGPLACEHOLDER"
+                    visible="false" />
+                <separator name="FOGPLACEHOLDER" visible="false" />
+                <separator name="SNOWPLACEHOLDER" visible="false" />
+                <separator name="EndOfHazards" visible="true">
+                </separator>
+            </menu>
+        </menuContribution>
+    </extension>
+</plugin>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.ui/META-INF/MANIFEST.MF
index 0a90970240..b30d251d35 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.d2d.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ui Plug-in
 Bundle-SymbolicName: com.raytheon.uf.viz.d2d.ui;singleton:=true
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.14.0.qualifier
 Bundle-Activator: com.raytheon.uf.viz.d2d.ui.Activator
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.viz.d2d.ui,
  com.raytheon.uf.viz.d2d.ui.actions,
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 15d2495e18..8db642bcaf 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -293,80 +293,7 @@
              </visibleWhen>
              <separator name="top" visible="false"/>
           </menu>
-          <menu
-                id="obs"
-                label="Obs"
-                mnemonic="O">
-             <visibleWhen>
-                <reference
-                      definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
-                </reference>
-             </visibleWhen>
-             <separator
-                   name="SURFACE"
-                   visible="false">
-             </separator>
-             <separator
-                   name="EndOfInitial"
-                   visible="true">
-             </separator>
-             <command
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ METAR ------">
-             </command>
-             <separator
-                   name="METAR"
-                   visible="false">
-             </separator>
-             <separator
-                   name="EndOfMetar"
-                   visible="true">
-             </separator>
-             <command
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ Synoptic ------">
-             </command>
-             <separator
-                   name="SYNOPTIC"
-                   visible="false">
-             </separator>
-             <separator
-                   name="EndOfSynoptic"
-                   visible="true">
-             </separator>
-             <command
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ Local data ------">
-             </command>
-                <separator
-                   name="LocalData"
-                   visible="false">
-                </separator>
-             <separator
-                   name="EndOfLocalData"
-                   visible="true">
-             </separator>
-             <command
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ Maritime ------" id="MARITIME">
-             </command>
-             <separator
-                   name="EndOfMaritime"
-                   visible="true">
-             </separator>
-             <command
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ Hazards ------" >
-             </command>
-             <separator name="HAZARDS" visible="false"/>
-             <separator name="LIGHTNINGPLACEHOLDER" visible="false"/>
-             <separator name="FOGPLACEHOLDER" visible="false"/>
-             <separator name="SNOWPLACEHOLDER" visible="false"/>
-             <separator
-                   name="EndOfHazards"
-                   visible="true">
-             </separator>
-          </menu>
+          <separator name="d2d.obsMenu" visible="false"/>
           <separator name="d2d.ncepHydroMenu" visible="false"/>
           <separator name="d2d.localMenu" visible="false"/>
           <separator name="d2d.upperAirMenu" visible="false"/>
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml
index 217bd5daa9..81ae1eac72 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseLocalData.xml
@@ -115,7 +115,7 @@
 		</contribute>
     </contribute>
     <contribute xsi:type="command" 
-                menuText="Collection/Dissemintation..." id="CollectionDissemintation"
+                menuText="Collection/Dissemination..." id="CollectionDissemination"
                 commandId="com.raytheon.uf.viz.app.launcher.appLauncherHandler">
         <parameter key="bundleLocation" value="bundles/run-ldadScheduler.xml"/>
     </contribute>