diff --git a/cave/com.raytheon.uf.viz.ncwf/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.ncwf/META-INF/MANIFEST.MF
index 55610027e6..219f8f05b5 100644
--- a/cave/com.raytheon.uf.viz.ncwf/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.ncwf/META-INF/MANIFEST.MF
@@ -7,9 +7,7 @@ Bundle-Activator: com.raytheon.uf.viz.ncwf.Activator
 Bundle-Vendor: RAYTHEON
 Eclipse-RegisterBuddy: com.raytheon.viz.core, com.raytheon.uf.viz.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.edex.db.dao,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.ncwf,
+Import-Package: com.raytheon.uf.common.dataplugin,
  com.raytheon.uf.common.dataplugin.persist,
  com.raytheon.uf.common.datastorage,
  com.raytheon.uf.common.datastorage.records,
@@ -43,4 +41,5 @@ Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.viz.ncwf,
  com.raytheon.uf.viz.ncwf.rsc
 Require-Bundle: com.raytheon.uf.viz.core,
- com.raytheon.viz.core;bundle-version="1.11.16"
+ com.raytheon.viz.core,
+ com.raytheon.uf.common.dataplugin.bufrncwf
diff --git a/edexOsgi/com.raytheon.uf.common.alertmonitor/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.alertmonitor/META-INF/MANIFEST.MF
index aceb2765b5..05bc1ffb54 100644
--- a/edexOsgi/com.raytheon.uf.common.alertmonitor/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.alertmonitor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: AlertMonitor Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.alertmonitor
 Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.uf.common.message,
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/META-INF/MANIFEST.MF
index cda17b19f0..44b9eecb27 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Providerretrieval
 Bundle-SymbolicName: com.raytheon.uf.common.datadelivery.retrieval
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
  com.raytheon.uf.common.datadelivery.registry;bundle-version="1.0.0",
  com.raytheon.uf.common.status;bundle-version="1.12.1174",
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF
index 1b6c8d7e78..584bcb27f5 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/META-INF/MANIFEST.MF
@@ -4,14 +4,15 @@ Bundle-Name: Binlightning Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.binlightning
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.dataplugin.binlightning,
  com.raytheon.uf.common.dataplugin.binlightning.impl
-Require-Bundle: com.raytheon.edex.common,
+Require-Bundle: com.raytheon.uf.common.serialization,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.common.dataplugin.binlightning,
- com.raytheon.uf.edex.decodertools.core,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.datastorage
+Import-Package: com.raytheon.uf.edex.decodertools.core,
  com.raytheon.uf.edex.decodertools.time
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF
index 6bcacba4a3..63e2bbe112 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/MANIFEST.MF
@@ -6,11 +6,10 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.dataplugin.bufrascat
-Require-Bundle: com.raytheon.edex.common,
- org.geotools,
- javax.persistence,
- javax.measure
+Require-Bundle: javax.persistence,
+ javax.measure,
+ com.raytheon.uf.common.serialization,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial
 Import-Package: com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.edex.decodertools.time,
- com.raytheon.uf.edex.pointdata
+ com.raytheon.uf.common.pointdata.spatial
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF
index 647376a2bc..5c73cd8571 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/META-INF/MANIFEST.MF
@@ -5,12 +5,11 @@ Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrhdw
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.bufrhdw,
- com.raytheon.uf.common.dataplugin.bufrhdw.dao
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
- org.geotools,
+Export-Package: com.raytheon.uf.common.dataplugin.bufrhdw
+Require-Bundle: com.raytheon.uf.common.pointdata,
  javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.serialization
 Import-Package: com.raytheon.uf.common.status
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF
index c62589c344..a53878d4f5 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/MANIFEST.MF
@@ -5,12 +5,11 @@ Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrmthdw
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.bufrmthdw,
- com.raytheon.uf.common.dataplugin.bufrmthdw.dao
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
- org.geotools,
+Export-Package: com.raytheon.uf.common.dataplugin.bufrmthdw
+Require-Bundle: com.raytheon.uf.common.pointdata,
  javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.serialization
 Import-Package: com.raytheon.uf.common.status
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF
index 054d413a2c..f89760ca23 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF
@@ -3,18 +3,16 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Ncwf Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrncwf
 Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.ncwf,
- com.raytheon.uf.common.dataplugin.ncwf.dao
-Require-Bundle: com.raytheon.edex.common,
- org.geotools,
+Export-Package: com.raytheon.uf.common.dataplugin.ncwf
+Require-Bundle: com.raytheon.uf.common.serialization,
  javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial
 Import-Package: com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.pointdata.spatial,
  com.raytheon.uf.common.status,
- com.raytheon.uf.edex.decodertools.core,
- com.raytheon.uf.edex.decodertools.time,
- com.raytheon.uf.edex.pointdata
+ com.raytheon.uf.edex.decodertools.core
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF
index b2e894377d..53d3cde7b9 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF
@@ -5,12 +5,11 @@ Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrquikscat
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.bufrquikscat,
- com.raytheon.uf.common.dataplugin.bufrquikscat.dao
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
- org.geotools,
+Export-Package: com.raytheon.uf.common.dataplugin.bufrquikscat
+Require-Bundle: com.raytheon.uf.common.pointdata,
  javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.serialization
 Import-Package: com.raytheon.uf.common.status
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF
index efbcf35827..96b838b35e 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/MANIFEST.MF
@@ -3,20 +3,17 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Bufrsigwx Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrsigwx
 Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.dataplugin.bufrsigwx,
- com.raytheon.uf.common.dataplugin.bufrsigwx.dao,
  com.raytheon.uf.common.dataplugin.bufrsigwx.common
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+Require-Bundle: com.raytheon.uf.common.serialization,
+ com.raytheon.uf.common.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.common.dataplugin
 Import-Package: com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.status,
- com.raytheon.uf.edex.decodertools.time,
- com.raytheon.uf.edex.pointdata,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF
index dfa2741b8e..d60ddb0465 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF
@@ -3,19 +3,17 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Bufrssmi Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrssmi
 Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.bufrssmi,
- com.raytheon.uf.common.dataplugin.bufrssmi.dao
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
- org.geotools,
+Export-Package: com.raytheon.uf.common.dataplugin.bufrssmi
+Require-Bundle: com.raytheon.uf.common.serialization,
+ com.raytheon.uf.common.pointdata,
  javax.persistence,
- javax.measure
+ javax.measure,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin
 Import-Package: com.raytheon.uf.common.dataplugin.bufrssmi,
  com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.status,
- com.raytheon.uf.edex.decodertools.time,
- com.raytheon.uf.edex.pointdata
+ com.raytheon.uf.edex.decodertools.time
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF
index 023d098b49..7af6c5461b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF
@@ -5,15 +5,19 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrascat
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.raytheon.uf.common.dataplugin.bufrascat;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+Require-Bundle: com.raytheon.uf.common.dataplugin.bufrascat,
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  com.raytheon.uf.common.localization,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.common.status,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.serialization
+Import-Package: com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.status,
  com.raytheon.uf.edex.bufrtools,
+ com.raytheon.uf.edex.core,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF
index 78870b1865..77419b8cb3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF
@@ -6,12 +6,17 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrhdw;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.edex.bufrtools,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.serialization
+Import-Package: com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.edex.bufrtools,
+ com.raytheon.uf.edex.core,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
index 205903fcc1..6d2a769b00 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
@@ -9,7 +9,7 @@
 	<bean id="bufrhdwProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="bufrhdwPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrhdw" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.bufrhdw.dao.BufrHDWObsDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrhdw.BufrHDWObsDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrhdw.BufrHDWObs" />
 	</bean>
 	
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/dao/BufrHDWObsDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/BufrHDWObsDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/dao/BufrHDWObsDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/BufrHDWObsDao.java
index 68fa464b8a..03fb632ae1 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/dao/BufrHDWObsDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/BufrHDWObsDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.bufrhdw.dao;
+package com.raytheon.uf.edex.plugin.bufrhdw;
 
 import java.util.List;
 import com.raytheon.uf.common.dataplugin.PluginException;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java
index e650461481..310107c8ee 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/src/com/raytheon/uf/edex/plugin/bufrhdw/HDWDecoder.java
@@ -25,7 +25,6 @@ import java.util.List;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.bufrhdw.BufrHDWObs;
-import com.raytheon.uf.common.dataplugin.bufrhdw.dao.BufrHDWObsDao;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF
index 8521a28b37..db83438e9d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF
@@ -5,13 +5,14 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrmthdw
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.raytheon.uf.common.dataplugin.bufrmthdw;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+Require-Bundle: com.raytheon.uf.common.dataplugin.bufrmthdw,
+ com.raytheon.edex.common,
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  org.geotools,
  javax.persistence,
  javax.measure
-Import-Package: com.raytheon.uf.edex.bufrtools,
+Import-Package: com.raytheon.uf.common.status,
+ com.raytheon.uf.edex.bufrtools,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
index bcbb91c222..904e28dbb0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
@@ -9,7 +9,7 @@
 	<bean id="bufrmthdwProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="bufrmthdwPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmthdw" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.bufrmthdw.dao.BufrMTHDWObsDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmthdw.BufrMTHDWObsDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmthdw.BufrMTHDWObs" />
 	</bean>
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/dao/BufrMTHDWObsDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/BufrMTHDWObsDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/dao/BufrMTHDWObsDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/BufrMTHDWObsDao.java
index 0de0db4959..977f3fff93 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/dao/BufrMTHDWObsDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/BufrMTHDWObsDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.bufrmthdw.dao;
+package com.raytheon.uf.edex.plugin.bufrmthdw;
 
 import java.util.List;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java
index 0773a1f9d6..951bde9883 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/src/com/raytheon/uf/edex/plugin/bufrmthdw/MTHDWDecoder.java
@@ -25,7 +25,6 @@ import java.util.List;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.bufrmthdw.BufrMTHDWObs;
-import com.raytheon.uf.common.dataplugin.bufrmthdw.dao.BufrMTHDWObsDao;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF
index 7ed7297634..47adc79c6f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF
@@ -6,12 +6,17 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrncwf,
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.edex.bufrtools,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.serialization
+Import-Package: com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.edex.bufrtools,
+ com.raytheon.uf.edex.core,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
index 582278f39e..0fe9da8ee0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
@@ -9,7 +9,7 @@
     <bean id="bufrncwfProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="bufrncwfPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrncwf" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.ncwf.dao.BUFRncwfDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrncwf.BUFRncwfDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.ncwf.BUFRncwf" />
     </bean>
     
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/dao/BUFRncwfDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/dao/BUFRncwfDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java
index 76c3221e1d..256f25ce2a 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/dao/BUFRncwfDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.ncwf.dao;
+package com.raytheon.uf.edex.plugin.bufrncwf;
 
 import java.util.List;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDecoder.java
index e32a309751..90637fedad 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDecoder.java
@@ -26,7 +26,6 @@ import java.util.List;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.ncwf.BUFRncwf;
-import com.raytheon.uf.common.dataplugin.ncwf.dao.BUFRncwfDao;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF
index 52a350de7e..83925d43c7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF
@@ -5,13 +5,18 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrquikscat
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.raytheon.uf.common.dataplugin.bufrquikscat;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+Require-Bundle: com.raytheon.uf.common.dataplugin.bufrquikscat,
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.edex.bufrtools,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.serialization
+Import-Package: com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.edex.bufrtools,
+ com.raytheon.uf.edex.core,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
index 260efdc31d..66bfc0f295 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
@@ -9,7 +9,7 @@
     <bean id="bufrquikscatProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="bufrquikscatPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrquikscat" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.bufrquikscat.dao.QUIKScatObsDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrquikscat.QUIKScatObsDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs" />
     </bean>
     
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java
index 645f44eb53..0e8806247f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java
@@ -26,7 +26,6 @@ import java.util.List;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs;
-import com.raytheon.uf.common.dataplugin.bufrquikscat.dao.QUIKScatObsDao;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/dao/QUIKScatObsDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatObsDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/dao/QUIKScatObsDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatObsDao.java
index af3f3fa01c..38ed7fd3c2 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/dao/QUIKScatObsDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatObsDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.bufrquikscat.dao;
+package com.raytheon.uf.edex.plugin.bufrquikscat;
 
 import java.util.List;
 import com.raytheon.uf.common.dataplugin.PluginException;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF
index 8f52bf99a7..eea9c6a081 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF
@@ -6,12 +6,17 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrsigwx,
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.edex.bufrtools,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.serialization
+Import-Package: com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.edex.bufrtools,
+ com.raytheon.uf.edex.core,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
index a5c5eb2e46..3d3ef094c7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
@@ -9,7 +9,7 @@
     <bean id="bufrsigwxProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="bufrsigwxPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrsigwx" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.bufrsigwx.dao.SigWxDataDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrsigwx.SigWxDataDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData" />
     </bean>
     
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/dao/SigWxDataDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/dao/SigWxDataDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java
index ed7f7b6048..16037672a8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/dao/SigWxDataDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.bufrsigwx.dao;
+package com.raytheon.uf.edex.plugin.bufrsigwx;
 
 import java.util.List;
 import java.util.Map;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java
index 067a7f2ecd..4235e2a9f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java
@@ -26,7 +26,6 @@ import java.util.List;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
-import com.raytheon.uf.common.dataplugin.bufrsigwx.dao.SigWxDataDao;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF
index b6a5a2fb82..13a76f3e24 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF
@@ -5,13 +5,18 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrssmi
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.raytheon.uf.common.dataplugin.bufrssmi;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
+Require-Bundle: com.raytheon.uf.common.dataplugin.bufrssmi,
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.edex.pointdata,
  org.geotools,
  javax.persistence,
- javax.measure
-Import-Package: com.raytheon.uf.edex.bufrtools,
+ javax.measure,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.serialization
+Import-Package: com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.edex.bufrtools,
+ com.raytheon.uf.edex.core,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
index 6fb9bfd74b..53ec824c28 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
@@ -9,7 +9,7 @@
     <bean id="bufrssmiProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
         <property name="pluginName" ref="bufrssmiPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrssmi" />
-        <property name="dao" value="com.raytheon.uf.common.dataplugin.bufrssmi.dao.SSMIScanDataDao" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrssmi.SSMIScanDataDao" />
         <property name="record" value="com.raytheon.uf.common.dataplugin.bufrssmi.SSMIScanData" />
     </bean>
     
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java
index 05a11d0d16..afd3a40459 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIDecoder.java
@@ -25,7 +25,6 @@ import java.util.List;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.bufrssmi.SSMIScanData;
-import com.raytheon.uf.common.dataplugin.bufrssmi.dao.SSMIScanDataDao;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
 import com.raytheon.uf.edex.decodertools.bufr.BUFRDataDocument;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/dao/SSMIScanDataDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIScanDataDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/dao/SSMIScanDataDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIScanDataDao.java
index 89a3be33a8..23a03b9bbd 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/dao/SSMIScanDataDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/SSMIScanDataDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.bufrssmi.dao;
+package com.raytheon.uf.edex.plugin.bufrssmi;
 
 import java.util.List;
 import com.raytheon.uf.common.dataplugin.PluginException;