diff --git a/cave/com.raytheon.uf.viz.ccfp/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.ccfp/META-INF/MANIFEST.MF
index 2af972442a..fdcfff3df6 100644
--- a/cave/com.raytheon.uf.viz.ccfp/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.ccfp/META-INF/MANIFEST.MF
@@ -4,9 +4,10 @@ Bundle-Name: Ccfp Plug-in
 Bundle-SymbolicName: com.raytheon.uf.viz.ccfp;singleton:=true
 Bundle-Version: 1.14.0
 Bundle-Vendor: RAYTHEON
+Require-Bundle: com.raytheon.uf.viz.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.edex.plugin.ccfp,
- com.raytheon.uf.common.dataplugin,
+Bundle-ActivationPolicy: lazy
+Import-Package: com.raytheon.uf.common.dataplugin,
  com.raytheon.uf.common.dataplugin.ccfp,
  com.raytheon.uf.common.geospatial,
  com.raytheon.uf.common.status,
@@ -17,14 +18,9 @@ Import-Package: com.raytheon.edex.plugin.ccfp,
  com.raytheon.uf.viz.core.map,
  com.raytheon.uf.viz.core.rsc,
  com.raytheon.uf.viz.core.rsc.capabilities,
- com.raytheon.uf.viz.core.status,
  com.vividsolutions.jts.geom,
- org.eclipse.core.runtime,
  org.eclipse.swt.graphics,
  org.eclipse.ui.plugin,
  org.opengis.referencing.crs,
  org.osgi.framework
-Bundle-ActivationPolicy: lazy
-Require-Bundle: com.raytheon.uf.viz.core,
- org.geotools;bundle-version="2.5.2"
 Export-Package: com.raytheon.uf.viz.ccfp.rsc
diff --git a/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
index 45f4fd3c8c..ca8042a3a5 100644
--- a/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.alerts,
  com.raytheon.viz.texteditor,
  org.geotools,
- com.raytheon.edex.plugin.ccfp,
+ com.raytheon.uf.common.dataplugin.ccfp,
  com.raytheon.uf.common.pointdata;bundle-version="1.11.7",
  com.raytheon.uf.common.serialization,
  com.raytheon.edex.plugin.taf;bundle-version="1.12.1174",
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/.project b/edexOsgi/com.raytheon.edex.plugin.ccfp/.project
deleted file mode 100644
index e82c70ee1c..0000000000
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.raytheon.edex.plugin.ccfp</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/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml
index de824ef366..29e01809e2 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/build.xml
@@ -66,7 +66,7 @@
 			<property name="ws" value="gtk"/>
 			<property name="os" value="linux"/>
 		</ant>
-		<ant antfile="build.xml" dir="../com.raytheon.edex.plugin.ccfp" target="${target}">
+		<ant antfile="build.xml" dir="../com.raytheon.uf.edex.plugin.ccfp" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="ws" value="gtk"/>
 			<property name="os" value="linux"/>
@@ -314,7 +314,7 @@
 				<include name="feature.xml"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.binlightning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ldadhydro:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.goessounding:0.0.0,1.0.0.201206061635,com.raytheon.edex.plugin.airep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ccfp:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.goessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadhydro:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldad:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadmanual:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadprofiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.modelsounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.obs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.pirep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.poessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.recco:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.redbook:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.taf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level.handler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.loctables:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.mesowest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.poessounding:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.airep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.pirep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.obs:0.0.0,1.0.0.201206061635,"/>
+		<eclipse.idReplacer featureFilePath="${feature.temp.folder}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.binlightning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ldadhydro:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.goessounding:0.0.0,1.0.0.201206061635,com.raytheon.edex.plugin.airep:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ccfp:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.goessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadhydro:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldad:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadmanual:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadprofiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.modelsounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.obs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.pirep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.poessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.recco:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.redbook:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.taf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level.handler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.loctables:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.mesowest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.poessounding:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.airep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.pirep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.obs:0.0.0,1.0.0.201206061635,"/>
 		<eclipse.gatherFeature 
 		   metadataRepository="${p2.build.repo}"
 		   artifactRepository="${p2.build.repo}"
@@ -334,7 +334,7 @@
 				<include name="feature.xml"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.binlightning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ldadhydro:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.goessounding:0.0.0,1.0.0.201206061635,com.raytheon.edex.plugin.airep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ccfp:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.goessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadhydro:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldad:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadmanual:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadprofiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.modelsounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.obs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.pirep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.poessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.recco:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.redbook:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.taf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level.handler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.loctables:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.mesowest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.poessounding:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.airep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.pirep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.obs:0.0.0,1.0.0.201206061635,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/com.raytheon.uf.edex.dataplugins.feature_1.0.0.201206061635/feature.xml"  selfVersion="1.0.0.201206061635" featureIds="" pluginIds="com.raytheon.uf.common.dataplugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.binlightning:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.ldadhydro:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.goessounding:0.0.0,1.0.0.201206061635,com.raytheon.edex.plugin.airep:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ccfp:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.goessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadhydro:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldad:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadmanual:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.ldadprofiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.modelsounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.obs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.pirep:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.poessounding:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.profiler:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.recco:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.redbook:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.sfcobs:0.0.0,1.12.1174.201206061635,com.raytheon.edex.plugin.taf:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acars:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.acarssounding:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.cwa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.ldadmesonet:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level.handler:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.level:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.loctables:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.lsr:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.mesowest:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.qc:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.svrwx:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcg:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.tcs:0.0.0,1.12.1174.201206061635,com.raytheon.uf.edex.plugin.vaa:0.0.0,1.12.1174.201206061635,com.raytheon.uf.common.dataplugin.poessounding:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.airep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.pirep:0.0.0,1.0.0.201206061635,com.raytheon.uf.common.dataplugin.obs:0.0.0,1.0.0.201206061635,"/>
 		<antcall target="rootFiles">
 			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
 		</antcall>
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
index 6de1612be3..62015e6f02 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
@@ -137,7 +137,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.raytheon.edex.plugin.ccfp"
+         id="com.raytheon.uf.edex.plugin.ccfp"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/.classpath
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/.classpath
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/.classpath
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/.settings/org.eclipse.jdt.core.prefs
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/.settings/org.eclipse.jdt.core.prefs
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/META-INF/MANIFEST.MF
similarity index 78%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/META-INF/MANIFEST.MF
index e67e0df630..ea432442f1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ccfp Plug-in
-Bundle-SymbolicName: com.raytheon.edex.plugin.ccfp
-Bundle-Version: 1.12.1174.qualifier
+Bundle-SymbolicName: com.raytheon.uf.edex.plugin.ccfp
+Bundle-Version: 1.14.0
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.edex.common
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
@@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.edex.common,
  org.geotools,
  javax.persistence,
  com.raytheon.uf.common.status
-Export-Package: com.raytheon.edex.plugin.ccfp
+Export-Package: com.raytheon.uf.edex.plugin.ccfp
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.raytheon.uf.common.dataplugin.ccfp,
  com.raytheon.uf.common.status
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/build.properties
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/build.properties
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/build.properties
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/com.raytheon.edex.plugin.ccfp.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/com.raytheon.edex.plugin.ccfp.ecl
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/com.raytheon.edex.plugin.ccfp.ecl
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/com.raytheon.edex.plugin.ccfp.ecl
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/res/spring/ccfp-common.xml
similarity index 89%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/res/spring/ccfp-common.xml
index 58513d0b2e..8293eabc68 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/res/spring/ccfp-common.xml
@@ -5,7 +5,7 @@
 
 	<bean id="ccfpProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
 		<property name="pluginName" value="ccfp" />
-		<property name="pluginFQN" value="com.raytheon.edex.plugin.ccfp" />
+		<property name="pluginFQN" value="com.raytheon.uf.edex.plugin.ccfp" />
 		<property name="record" value="com.raytheon.uf.common.dataplugin.ccfp.CcfpRecord" />
 	</bean>
 	
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
similarity index 91%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
index 15f6adeddc..5f674367e9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
@@ -3,8 +3,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-	<bean id="ccfpDecoder" class="com.raytheon.edex.plugin.ccfp.CcfpDecoder" />
-	<bean id="ccfpSeparator" class="com.raytheon.edex.plugin.ccfp.CcfpSeparator" />
+	<bean id="ccfpDecoder" class="com.raytheon.uf.edex.plugin.ccfp.CcfpDecoder" />
+	<bean id="ccfpSeparator" class="com.raytheon.uf.edex.plugin.ccfp.CcfpSeparator" />
 
 	<bean id="ccfpDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/src/com/raytheon/uf/edex/plugin/ccfp/CcfpDecoder.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpDecoder.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/src/com/raytheon/uf/edex/plugin/ccfp/CcfpDecoder.java
index 90c920752d..87d3c2dc05 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/src/com/raytheon/uf/edex/plugin/ccfp/CcfpDecoder.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.plugin.ccfp;
+package com.raytheon.uf.edex.plugin.ccfp;
 
 import java.util.Calendar;
 import java.util.regex.Matcher;
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/src/com/raytheon/uf/edex/plugin/ccfp/CcfpSeparator.java
similarity index 99%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpSeparator.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/src/com/raytheon/uf/edex/plugin/ccfp/CcfpSeparator.java
index 37326fa041..33ba4ceddb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/src/com/raytheon/uf/edex/plugin/ccfp/CcfpSeparator.java
@@ -18,7 +18,7 @@
  * further licensing information.
  **/
 
-package com.raytheon.edex.plugin.ccfp;
+package com.raytheon.uf.edex.plugin.ccfp;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/utility/common_static/base/purge/ccfpPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/utility/common_static/base/purge/ccfpPurgeRules.xml
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/utility/common_static/base/purge/ccfpPurgeRules.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/utility/common_static/base/purge/ccfpPurgeRules.xml
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/utility/edex_static/base/distribution/ccfp.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ccfp/utility/edex_static/base/distribution/ccfp.xml
similarity index 100%
rename from edexOsgi/com.raytheon.edex.plugin.ccfp/utility/edex_static/base/distribution/ccfp.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.ccfp/utility/edex_static/base/distribution/ccfp.xml
diff --git a/javaUtilities/com.raytheon.uf.docs.datauri/.classpath b/javaUtilities/com.raytheon.uf.docs.datauri/.classpath
index a721ea282d..8aebf994a3 100644
--- a/javaUtilities/com.raytheon.uf.docs.datauri/.classpath
+++ b/javaUtilities/com.raytheon.uf.docs.datauri/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.binlightning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.bufrmos"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.bufrua"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.ccfp"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.edex.plugin.ccfp"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.gfe"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.goessounding"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.edex.plugin.grib"/>