diff --git a/cave/com.raytheon.uf.viz.derivparam.python/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.derivparam.python/META-INF/MANIFEST.MF
index 36a778a9ea..3e3aaad52a 100644
--- a/cave/com.raytheon.uf.viz.derivparam.python/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.derivparam.python/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174",
  com.raytheon.uf.viz.core;bundle-version="1.12.1174",
  com.raytheon.uf.viz.derivparam;bundle-version="1.12.1174",
  com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
- com.raytheon.edex.meteolib,
  org.jep;bundle-version="1.0.0",
  org.eclipse.ui;bundle-version="3.6.1",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
index 3367f1129f..2a23a1295d 100644
--- a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
@@ -52,8 +52,7 @@ Export-Package: com.raytheon.viz.gfe,
  com.raytheon.viz.gfe.ui,
  com.raytheon.viz.gfe.ui.runtimeui,
  com.raytheon.viz.gfe.ui.zoneselector
-Import-Package: com.raytheon.edex.meteoLib,
- com.raytheon.uf.common.activetable,
+Import-Package: com.raytheon.uf.common.activetable,
  com.raytheon.uf.common.dissemination,
  com.raytheon.uf.common.message,
  com.raytheon.uf.common.python.concurrent,
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
index 1b5d69be77..1ceed53715 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: com.raytheon.edex.common,
 Export-Package: com.raytheon.edex.plugin.sfcobs.common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.uf.common.dataplugin.sfcobs,
- com.raytheon.uf.common.dataplugin.sfcobs.dao,
  com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.pointdata.spatial,
  com.raytheon.uf.common.status,
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
index ad938a601c..8970ebf6aa 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
@@ -9,7 +9,7 @@
 	<bean id="sfcobsProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="sfcobsPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.sfcobs" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.sfcobs.dao.SfcObsDao" />
+		<property name="dao" value="com.raytheon.edex.plugin.sfcobs.SfcObsDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.sfcobs.ObsCommon" />
 	</bean>
 	
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
index 74331b1784..ffc9079a8e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
@@ -6,7 +6,7 @@
 	<bean id="sfcobsDecoder" class="com.raytheon.edex.plugin.sfcobs.SfcObsDecoder" />
 	<bean id="sfcobsSeparator" class="com.raytheon.edex.plugin.sfcobs.SfcObsSeparator" />
 
-    <bean id="sfcobsPointData" class="com.raytheon.uf.common.dataplugin.sfcobs.dao.SfcObsPointDataTransform">
+    <bean id="sfcobsPointData" class="com.raytheon.edex.plugin.sfcobs.SfcObsPointDataTransform">
         <constructor-arg ref="sfcobsPluginName" />
     </bean>
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/dao/SfcObsDao.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/dao/SfcObsDao.java
rename to edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDao.java
index 2d7fdd1b76..03750a95ef 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/dao/SfcObsDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDao.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.sfcobs.dao;
+package com.raytheon.edex.plugin.sfcobs;
 
 import java.util.List;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/dao/SfcObsPointDataTransform.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.java
similarity index 99%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/dao/SfcObsPointDataTransform.java
rename to edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.java
index 740faa56e9..c49eaf0f7b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/dao/SfcObsPointDataTransform.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.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.sfcobs.dao;
+package com.raytheon.edex.plugin.sfcobs;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF
index 97bbb6ee47..611558179c 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF
@@ -4,14 +4,15 @@ Bundle-Name: Cwat Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.cwat
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Require-Bundle: javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- org.geotools;bundle-version="2.5.2",
+ com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.monitor;bundle-version="1.11.5",
- com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0"
+ com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.datastorage
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: com.raytheon.uf.common.dataplugin.cwat,
- com.raytheon.uf.common.dataplugin.cwat.dao
+Export-Package: com.raytheon.uf.common.dataplugin.cwat
 Import-Package: org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF
index c331844c4d..cfc7833a07 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF
@@ -4,13 +4,12 @@ Bundle-Name: FFMP common Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.ffmp
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.dataplugin.ffmp,
- com.raytheon.uf.common.dataplugin.ffmp.dao,
  com.raytheon.uf.common.dataplugin.ffmp.dataaccess
 Require-Bundle: javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
+ com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.monitor;bundle-version="1.11.5",
  com.raytheon.uf.common.hydro;bundle-version="1.11.11",
  com.raytheon.uf.common.mpe;bundle-version="1.11.11",
@@ -24,4 +23,9 @@ Require-Bundle: javax.persistence;bundle-version="1.0.0",
  com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
  com.google.guava;bundle-version="1.0.0",
  javax.measure;bundle-version="1.0.0",
- com.raytheon.uf.common.message;bundle-version="1.12.1174"
+ com.raytheon.uf.common.message;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataquery,
+ com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.common.dataplugin
+Import-Package: com.raytheon.uf.common.util,
+ com.raytheon.uf.edex.database.dao
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF
index 24ced4a1df..6e4b4fd6e9 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/MANIFEST.MF
@@ -4,12 +4,15 @@ Bundle-Name: Fog common Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.fog
 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.fog, com.raytheon.uf.common.dataplugin.fog.dao, com.raytheon.uf.common.dataplugin.fog.analysis
+Export-Package: com.raytheon.uf.common.dataplugin.fog,
+ com.raytheon.uf.common.dataplugin.fog.analysis
 Require-Bundle: javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- org.geotools;bundle-version="2.5.2",
+ com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.monitor;bundle-version="1.11.5",
  com.raytheon.uf.common.localization;bundle-version="1.11.13",
- com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0"
+ com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.datastorage
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/META-INF/MANIFEST.MF
index 2b14e1822b..f3943d7f94 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: FSS Obs
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.fssobs
 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
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.dataplugin.fssobs
 Require-Bundle: com.raytheon.uf.common.dataplugin,
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.obs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.obs/META-INF/MANIFEST.MF
index 575a6bf386..7c20698618 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.obs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.obs/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Obs
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.obs
 Bundle-Version: 1.0.0.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.obs.metar,
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF
index d5eceea58f..e181fabf76 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/MANIFEST.MF
@@ -6,14 +6,16 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Require-Bundle: javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
+ com.raytheon.uf.common.serialization,
  org.geotools;bundle-version="2.5.2",
  com.raytheon.uf.common.monitor;bundle-version="1.11.5",
  com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
- javax.measure;bundle-version="1.0.0"
-Export-Package: com.raytheon.uf.common.dataplugin.preciprate,
- com.raytheon.uf.common.dataplugin.preciprate.dao
+ javax.measure;bundle-version="1.0.0",
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.datastorage
+Export-Package: com.raytheon.uf.common.dataplugin.preciprate
 Import-Package: com.raytheon.uf.common.status,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF
index a45017ee3f..f8dd63b523 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF
@@ -4,13 +4,14 @@ Bundle-Name: QPF common Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.qpf
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.qpf,
- com.raytheon.uf.common.dataplugin.qpf.dao
+Export-Package: com.raytheon.uf.common.dataplugin.qpf
 Require-Bundle: javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- org.geotools;bundle-version="2.5.2",
+ com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.monitor;bundle-version="1.11.5",
- com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0"
+ com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.datastorage
 Import-Package: org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF
index 0b02e76ef3..49cbb488cf 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/MANIFEST.MF
@@ -4,18 +4,21 @@ Bundle-Name: QPF common Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.scan
 Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.dataplugin.scan,
- com.raytheon.uf.common.dataplugin.scan.dao,
  com.raytheon.uf.common.dataplugin.scan.data
 Require-Bundle: javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
- com.raytheon.uf.common.monitor;bundle-version="1.11.5",
- com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.11.26",
+ com.raytheon.uf.common.serialization,
+ com.raytheon.uf.common.monitor,
+ com.raytheon.uf.common.dataplugin.binlightning,
  com.raytheon.uf.common.dataplugin.grid,
- com.raytheon.uf.common.sounding;bundle-version="1.12.1112",
- com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
- com.raytheon.uf.common.status;bundle-version="1.12.1174"
-Import-Package: org.apache.commons.logging
+ com.raytheon.uf.common.sounding,
+ com.raytheon.uf.common.dataplugin.radar,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.datastorage
+Import-Package: com.raytheon.uf.common.time,
+ org.apache.commons.logging
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF
index c0b1ddc4b1..b15080e99e 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/META-INF/MANIFEST.MF
@@ -3,18 +3,15 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Sfcobs Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.sfcobs
 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
-Require-Bundle: com.raytheon.edex.common,
- org.geotools,
+Require-Bundle: com.raytheon.uf.common.serialization,
  javax.persistence,
  javax.measure,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.16",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.16"
-Export-Package: com.raytheon.uf.common.dataplugin.sfcobs,
- com.raytheon.uf.common.dataplugin.sfcobs.dao
+ com.raytheon.uf.common.pointdata,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial
+Export-Package: com.raytheon.uf.common.dataplugin.sfcobs
 Import-Package: com.raytheon.uf.common.status,
- com.raytheon.uf.edex.decodertools.core,
- com.raytheon.uf.edex.decodertools.time,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
index 3b22185219..11c352f3ce 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=optional,
- com.raytheon.edex.common;bundle-version="1.11.7",
  com.raytheon.uf.common.monitor;bundle-version="1.11.7",
  org.apache.commons.collections,
  com.raytheon.uf.common.dataplugin.cwat;bundle-version="1.0.0",
@@ -19,10 +18,17 @@ Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=
  com.raytheon.uf.common.sounding;bundle-version="1.12.1174",
  com.raytheon.uf.common.dataplugin.grid,
  com.raytheon.uf.edex.plugin.scan;bundle-version="1.12.1174",
- com.raytheon.uf.edex.dat.utils;bundle-version="1.12.1174"
+ com.raytheon.uf.edex.dat.utils;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.serialization,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.edex.database,
+ com.raytheon.uf.common.datastorage
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.edex.plugin.cwat,
  com.raytheon.uf.edex.plugin.cwat.common
-Import-Package: com.raytheon.uf.edex.plugin.scan.common,
+Import-Package: com.raytheon.edex.urifilter,
+ com.raytheon.uf.common.util,
+ com.raytheon.uf.edex.plugin.scan.common,
  org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
index 315a8f71b7..9c1d3ea182 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
@@ -10,7 +10,7 @@
    <bean id="cwatProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="cwatPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.cwat" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.cwat.dao.CWATDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.cwat.CWATDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.cwat.CWATRecord" />
 		<property name="dependencyFQNs">
 		    <list>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/dao/CWATDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/dao/CWATDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATDao.java
index 6e7c5a8eee..8e4e0809d6 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/dao/CWATDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATDao.java
@@ -1,4 +1,4 @@
-package com.raytheon.uf.common.dataplugin.cwat.dao;
+package com.raytheon.uf.edex.plugin.cwat;
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATGenerator.java
index 6705caa142..3ae35f6153 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/CWATGenerator.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import com.raytheon.edex.urifilter.URIFilter;
 import com.raytheon.edex.urifilter.URIGenerateMessage;
 import com.raytheon.uf.common.dataplugin.cwat.CWATRecord;
-import com.raytheon.uf.common.dataplugin.cwat.dao.CWATDao;
 import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
index 28dd4a09db..4b01c009cb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
@@ -9,7 +9,7 @@
     <bean id="ffmpProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="ffmpPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.ffmp" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.ffmp.dao.FFMPDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.ffmp.FFMPDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord" />
 		<property name="dependencyFQNs">
 		    <list>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dao/FFMPDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPDao.java
similarity index 99%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dao/FFMPDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPDao.java
index ae02f0e7ab..7926c9acbb 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/dao/FFMPDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPDao.java
@@ -1,4 +1,4 @@
-package com.raytheon.uf.common.dataplugin.ffmp.dao;
+package com.raytheon.uf.edex.plugin.ffmp;
 
 /**
  * This software was developed and / or modified by Raytheon Company,
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
index 2cc6408d3d..78b029cccf 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
@@ -47,7 +47,6 @@ import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates;
 import com.raytheon.uf.common.dataplugin.ffmp.FFMPTemplates.MODE;
 import com.raytheon.uf.common.dataplugin.ffmp.FFMPUtils;
 import com.raytheon.uf.common.dataplugin.ffmp.SourceBinList;
-import com.raytheon.uf.common.dataplugin.ffmp.dao.FFMPDao;
 import com.raytheon.uf.common.dataplugin.radar.RadarStation;
 import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
 import com.raytheon.uf.common.datastorage.DataStoreFactory;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
index dad28505e4..a149b7a507 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
@@ -10,7 +10,7 @@
    <bean id="fogProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="fogPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.fog" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.fog.dao.FogDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.fog.FogDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.fog.FogRecord" />
    </bean>   
    
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/dao/FogDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/dao/FogDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogDao.java
index babb4fbba3..3119c7c23b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/dao/FogDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogDao.java
@@ -1,4 +1,4 @@
-package com.raytheon.uf.common.dataplugin.fog.dao;
+package com.raytheon.uf.edex.plugin.fog;
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogGenerator.java
index bcfc14d19e..8a9aa4eefc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/src/com/raytheon/uf/edex/plugin/fog/FogGenerator.java
@@ -23,7 +23,6 @@ import com.raytheon.edex.site.SiteUtil;
 import com.raytheon.edex.urifilter.URIFilter;
 import com.raytheon.edex.urifilter.URIGenerateMessage;
 import com.raytheon.uf.common.dataplugin.fog.FogRecord;
-import com.raytheon.uf.common.dataplugin.fog.dao.FogDao;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
index b8e04e8334..ce7cf62e54 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
@@ -10,7 +10,7 @@
    <bean id="preciprateProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="precipratePluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.preciprate" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.preciprate.dao.PrecipRateDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.preciprate.PrecipRateDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.preciprate.PrecipRateRecord" />
 		<property name="dependencyFQNs">
 		    <list>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/dao/PrecipRateDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateDao.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/dao/PrecipRateDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateDao.java
index b07b3bdc7c..562ac93d12 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/dao/PrecipRateDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateDao.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.preciprate.dao;
+package com.raytheon.uf.edex.plugin.preciprate;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateGenerator.java
index 2457c47d68..a4eb34215c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/src/com/raytheon/uf/edex/plugin/preciprate/PrecipRateGenerator.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import com.raytheon.edex.urifilter.URIFilter;
 import com.raytheon.edex.urifilter.URIGenerateMessage;
 import com.raytheon.uf.common.dataplugin.preciprate.PrecipRateRecord;
-import com.raytheon.uf.common.dataplugin.preciprate.dao.PrecipRateDao;
 import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants.DHRValues;
 import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
index 8c3028c7c8..e512baadbe 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.12.1174.qualifier
 Bundle-Vendor: RAYTHEON
 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
 Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0",
- com.raytheon.edex.common;bundle-version="1.11.1",
  com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.1";resolution:=optional,
  com.raytheon.uf.common.dataplugin.qpf,
  com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.0.0",
@@ -15,8 +14,14 @@ Require-Bundle: com.raytheon.uf.common.monitor;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.scan;bundle-version="1.12.1174",
  com.raytheon.uf.edex.dat.utils;bundle-version="1.12.1174",
- com.raytheon.uf.edex.plugin.scan;bundle-version="1.12.1174"
-Import-Package: com.raytheon.uf.common.dataplugin.grid,
+ com.raytheon.uf.edex.plugin.scan;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.serialization,
+ com.raytheon.uf.common.datastorage,
+ com.raytheon.uf.edex.database
+Import-Package: com.raytheon.edex.urifilter,
+ com.raytheon.uf.common.dataplugin.grid,
  com.raytheon.uf.edex.plugin.scan.common,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
index 57dc7ceed3..eb7fac9e89 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
@@ -10,7 +10,7 @@
    <bean id="qpfProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" ref="qpfPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.qpf" />
-		<property name="dao" value="com.raytheon.uf.common.dataplugin.qpf.dao.QPFDao" />
+		<property name="dao" value="com.raytheon.uf.edex.plugin.qpf.QPFDao" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.qpf.QPFRecord" />
 		<property name="dependencyFQNs">
 		    <list>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/dao/QPFDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFDao.java
similarity index 99%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/dao/QPFDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFDao.java
index 298eeea0f9..02e226d7a6 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/dao/QPFDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.uf.common.dataplugin.qpf.dao;
+package com.raytheon.uf.edex.plugin.qpf;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFGenerator.java
index 750eecde04..4ecea91968 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFGenerator.java
@@ -28,7 +28,6 @@ import com.raytheon.edex.urifilter.URIFilter;
 import com.raytheon.edex.urifilter.URIGenerateMessage;
 import com.raytheon.uf.common.dataplugin.qpf.QPFRecord;
 import com.raytheon.uf.common.dataplugin.qpf.QPFRecord.DATA_TYPE;
-import com.raytheon.uf.common.dataplugin.qpf.dao.QPFDao;
 import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
index 6a83da250f..628155e235 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
@@ -10,7 +10,7 @@
 		<property name="pluginName" ref="scanPluginName" />
 		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.scan" />
 		<property name="dao"
-			value="com.raytheon.uf.common.dataplugin.scan.dao.ScanDao" />
+			value="com.raytheon.uf.edex.plugin.scan.ScanDao" />
 		<property name="record"
 			value="com.raytheon.uf.common.dataplugin.scan.ScanRecord" />
 		<property name="compression" value="LZF"/>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/dao/ScanDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanDao.java
similarity index 99%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/dao/ScanDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanDao.java
index 90f9f416ef..aa2ef5191b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/dao/ScanDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanDao.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.uf.common.dataplugin.scan.dao;
+package com.raytheon.uf.edex.plugin.scan;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java
index 406bef6cc3..cd58a1715c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/src/com/raytheon/uf/edex/plugin/scan/ScanGenerator.java
@@ -30,7 +30,6 @@ import com.raytheon.edex.urifilter.URIFilter;
 import com.raytheon.edex.urifilter.URIGenerateMessage;
 import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
 import com.raytheon.uf.common.dataplugin.scan.ScanRecord;
-import com.raytheon.uf.common.dataplugin.scan.dao.ScanDao;
 import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData;
 import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;