diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
index 9e3074e584..b52ce9f77f 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent.feature/feature.xml
@@ -47,4 +47,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.edex.dataprovideragent"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.classpath b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.project b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.project
new file mode 100644
index 0000000000..1f025c2fb5
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.dataprovideragent</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.dataprovideragent/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..c537b63063
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..b55c014926
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EDEX Data Provider Agent
+Bundle-SymbolicName: com.raytheon.uf.edex.dataprovideragent
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: RAYTHEON
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: com.raytheon.uf.edex.purgesrv;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.core;bundle-version="1.12.1174",
+ com.raytheon.uf.common.util;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.registry.ebxml;bundle-version="1.0.0",
+ com.raytheon.uf.common.datadelivery.request;bundle-version="1.0.0"
diff --git a/edexOsgi/com.raytheon.uf.edex.dataprovideragent/build.properties b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/build.properties
new file mode 100644
index 0000000000..5791d48d5f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               res/
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/dpa-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/res/spring/dpa-datadelivery.xml
similarity index 100%
rename from edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/dpa-datadelivery.xml
rename to edexOsgi/com.raytheon.uf.edex.dataprovideragent/res/spring/dpa-datadelivery.xml
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/res/spring/ogc-purge.xml
similarity index 86%
rename from edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml
rename to edexOsgi/com.raytheon.uf.edex.dataprovideragent/res/spring/ogc-purge.xml
index ca4373358e..2df2f1d9fd 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/ogc-purge.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/res/spring/ogc-purge.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<bean id="purgeManager" class="com.raytheon.uf.edex.datadelivery.harvester.purge.OGCPurgeManager">
+	<bean id="purgeManager" class="com.raytheon.uf.edex.dataprovideragent.purge.OGCPurgeManager">
 		<property name="clusterLimit" value="${purge.clusterlimit}"/>
 		<property name="serverLimit" value="${purge.serverlimit}"/>
 		<property name="deadPurgeJobAge" value="${purge.deadjobage}"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/purge/OGCPurgeManager.java b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/src/com/raytheon/uf/edex/dataprovideragent/purge/OGCPurgeManager.java
similarity index 97%
rename from edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/purge/OGCPurgeManager.java
rename to edexOsgi/com.raytheon.uf.edex.dataprovideragent/src/com/raytheon/uf/edex/dataprovideragent/purge/OGCPurgeManager.java
index bc64a50a03..728c47897c 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/purge/OGCPurgeManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.dataprovideragent/src/com/raytheon/uf/edex/dataprovideragent/purge/OGCPurgeManager.java
@@ -1,4 +1,4 @@
-package com.raytheon.uf.edex.datadelivery.harvester.purge;
+package com.raytheon.uf.edex.dataprovideragent.purge;
 
 /**
  * This software was developed and / or modified by Raytheon Company,
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-dpa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-dpa-ingest.xml
index 34f8bf4b7e..274da91e38 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-dpa-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.madis.ogc/res/spring/madis-dpa-ingest.xml
@@ -3,6 +3,14 @@
 	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="registryManagerInstanceInitializer" class="java.lang.String">
+        <!-- required for depends-on -->
+    </bean>
+    
+    <bean id="registerDataDeliveryHandlers" class="java.lang.String">
+        <!-- required for depends-on -->
+    </bean>
+
 	<bean id="madisDecoder" class="com.raytheon.uf.edex.plugin.madis.MadisDecoder">
         <constructor-arg ref="madisPluginName" />
     </bean>