diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index a8183ab588..13a4c85867 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -77,6 +77,7 @@
 		<exclude>purgeutil-request.xml</exclude>
 		<!-- end of ncep excludes -->
 	</mode>
+    
 	<mode name="ingest">
 		<exclude>webservices.xml</exclude>
 		<exclude>ebxml.*\.xml</exclude>
@@ -111,6 +112,7 @@
 		<exclude>cpgsrv-spring.xml</exclude>
         <exclude>.*sbn-simulator.*</exclude>
 	</mode>
+    
     <mode name="ingestHydro">
     	<include>distribution-spring.xml</include>
     	<include>manualIngest-common.xml</include>
@@ -147,6 +149,7 @@
     	<exclude>fssobs-ingest.xml</exclude>
     	<exclude>fssobs-common.xml</exclude>
     </mode>
+    
     <mode name="requestHydro">
         <include>ohd-common-database.xml</include>
     	<include>ohd-common.xml</include>
@@ -174,6 +177,7 @@
     	<include>eventbus-common.xml</include>
     	<include>edex-request.xml</include>
     </mode>
+    
 	<mode name="ingestGrib">
 		<include>time-common.xml</include>
 		<include>auth-common.xml</include>
@@ -198,6 +202,7 @@
         <includeMode>statsTemplate</includeMode>
         <includeMode>excludeDpaAndOgc</includeMode>
 	</mode>
+    
 	<!-- Runs separate now, not just high mem -->
 	<mode name="ingestDat">
 	    <include>nwsauth-request.xml</include>
@@ -245,6 +250,7 @@
         <includeMode>excludeDpaAndOgc</includeMode>
         <includeMode>statsTemplate</includeMode>
 	</mode>
+    
 	<mode name="registry">
         <!-- Registry production mode -->
         <include>ebxml.*\.xml</include>
@@ -253,9 +259,9 @@
         <include>bandwidth-datadelivery-.*-wfo.xml</include>
         <exclude>.*datadelivery.*-ncf.*</exclude>
         <exclude>.*datadelivery.*-monolithic.*</exclude>
-        <exclude>harvester-*</exclude>
-        <exclude>crawler-*</exclude>
+        <includeMode>excludeHarvester</includeMode>
 	</mode>
+    
     <mode name="centralRegistry">
         <!-- Central Registry production mode -->
         <include>ebxml.*\.xml</include>
@@ -263,6 +269,7 @@
         <include>bandwidth-datadelivery-.*-ncf.xml</include>
         <exclude>.*datadelivery.*-wfo.*</exclude>
         <exclude>.*datadelivery.*-monolithic.*</exclude>
+        <exclude>.*dpa.*</exclude>
     </mode>
 
     <mode name="statsTemplate" template="true">
@@ -270,6 +277,7 @@
         <include>eventbus-common.xml</include>
         <include>stats-common.xml</include>
     </mode>
+    
     <mode name="dataDeliveryTemplate" template="true">
         <include>database-common.xml</include>
         <include>.*datadelivery.*</include>
@@ -301,9 +309,9 @@
             that should be loaded when running datadelivery with the registry in a separate JVM 
         -->
         <exclude>.*datadelivery-standalone.*</exclude>
-
         <includeMode>statsTemplate</includeMode>
     </mode>
+    
     <mode name="excludeDpaAndOgc" template="true">
         <!-- exclude dpa services -->
         <exclude>.*dpa.*</exclude>
@@ -312,6 +320,15 @@
         <exclude>grid-metadata.xml</exclude>
         <exclude>wxsrv-dataset-urn.xml</exclude>
     </mode>
+    
+    <mode name="excludeHarvester" template="true">
+        <!-- exclude dpa services -->
+        <exclude>.*dpa.*</exclude>
+        <!-- exclude crawler/harvester -->
+        <exclude>.*harvester.*</exclude>
+        <exclude>.*crawler*</exclude>
+    </mode>
+  
     <mode name="inMemoryBandwidthManager">
         <!-- This is not an edex runtime mode -->
         <include>bandwidth-datadelivery-inmemory-impl.xml</include>
@@ -327,19 +344,23 @@
         <include>bandwidth-datadelivery-edex-impl-monolithic.xml</include>
         <include>bandwidth-datadelivery-wfo.xml</include>
         <exclude>.*datadelivery.*-ncf.*</exclude>
+        <exclude>.*dpa.*</exclude>
     </mode>
+    
     <mode name="sbnSimulator">
         <include>.*sbn-simulator-wfo.*</include>
         <include>event-common.xml</include>
         <include>eventbus-common.xml</include>
         <exclude>.*sbn-simulator-ncf.*</exclude>
     </mode>
+    
     <mode name="centralSbnSimulator">
         <include>.*sbn-simulator-ncf.*</include>
         <include>event-common.xml</include>
         <include>eventbus-common.xml</include>
         <exclude>.*sbn-simulator-wfo.*</exclude>
     </mode>
+    
 	<mode name="grib">
 		<include>grib-decode.xml</include>
 		<include>grid-staticdata-process.xml</include>
@@ -349,6 +370,7 @@
 		<include>distribution-spring.xml</include>
 		<include>manualIngest-spring.xml</include>
 	</mode>
+    
 	<mode name="text">
 		<include>text-.*</include>
 		<include>textdb-.*</include>
@@ -358,6 +380,7 @@
 		<include>distribution-spring.xml</include>
 		<include>manualIngest-spring.xml</include>
 	</mode>
+    
 	<mode name="gfe">
 		<include>.*gfe.*</include>
 		<include>serialize-request.xml</include>
@@ -365,6 +388,7 @@
 		<include>distribution-spring.xml</include>
 		<include>manualIngest-spring.xml</include>
 	</mode>
+    
 	<mode name="noHydro">
         <exclude>ebxml.*\.xml</exclude>
 		<exclude>alarmWhfs-spring.xml</exclude>
@@ -385,17 +409,20 @@
 		<exclude>satpre-spring.xml</exclude>
         <exclude>.*sbn-simulator.*</exclude>
 	</mode>
+    
 	<mode name="localization">
 		<include>auth-request.xml</include>
 		<include>utility-request.xml</include>
 	</mode>
+    
     <mode name="datadeliveryonly">
         <include>.*datadelivery-standalone.*</include>
         <exclude>.*datadelivery-registry.*</exclude>
         <includeMode>datadeliverytemplate</includeMode>
     </mode>
+    
 	<mode name="dataProviderAgentTemplate" template="true">
-		<include>manualIngest*</include>
+		<include>manualIngest.*</include>
 		<include>time-common.xml</include>
 		<include>distribution-spring.xml</include>
 		<include>persist-ingest.xml</include>
@@ -422,6 +449,7 @@
 		<include>purge-spring-impl.xml</include>
         <include>purge-logs.xml</include>
 	</mode>
+    
 	<!-- This is MADIS implmentation of dataprovideragent -->
 	<mode name="dataprovideragent">
 		<includeMode>dataProviderAgentTemplate</includeMode>
@@ -430,15 +458,5 @@
 		<include>madis-common.xml</include>
 		<include>madis-ogc.xml</include>
 		<include>madis-ogc-registry.xml</include>
-		<!-- pointdata/obs specific services 
-		<include>obs-common.xml</include>
-		<include>pointdata-common.xml</include>
-		<include>obs-dpa-ingest.xml</include>
-		<include>obs-ogc.xml</include>-->
-		<!-- grid specific services 
-		<include>gridcoverage-.*.xml</include>
-		<include>grib-distribution.xml</include>
-		<include>level-common.xml</include>
-		<include>parameter-common.xml</include>	-->
 	</mode>
 </edexModes>
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml
index f43208df98..17a49b9be3 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml
@@ -51,4 +51,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.classpath
new file mode 100644
index 0000000000..3bc247511f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.project b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.project
new file mode 100644
index 0000000000..5fd446dedf
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution</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.plugin.datadelivery.retrieval.dist/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..c537b63063
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.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.plugin.datadelivery.retrieval.dist/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..840d6cfb74
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Dist
+Bundle-SymbolicName: com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: RAYTHEON
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/build.properties
new file mode 100644
index 0000000000..73974cda80
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               res/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/res/spring/retrieval-ingest.xml
similarity index 60%
rename from edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-ingest.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/res/spring/retrieval-ingest.xml
index a3d8fffdba..a41f1b1e1a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/res/spring/retrieval-ingest.xml
@@ -3,10 +3,17 @@
     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 factory-bean="distributionSrv" factory-method="register">
+    <bean id="dataDeliveryRetrievalPluginName" class="java.lang.String">
+        <constructor-arg type="java.lang.String" value="dataDeliveryRetrieval" />
+    </bean>
+
+    <!-- Writes files that match pattern to DataDeliveryRetrieval process 
+        Queue -->
+    <bean factory-bean="distributionSrv"
+        factory-method="register">
         <constructor-arg ref="dataDeliveryRetrievalPluginName" />
         <constructor-arg
-            value="jms-durable:queue:dataDeliveryRetrievalProcess"/>
+            value="jms-durable:queue:dataDeliveryRetrievalProcess" />
     </bean>
 
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/src/com/raytheon/uf/edex/plugin/datadelivery/retrieval/distribution/package-info.java b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/src/com/raytheon/uf/edex/plugin/datadelivery/retrieval/distribution/package-info.java
new file mode 100644
index 0000000000..e0bd864252
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/src/com/raytheon/uf/edex/plugin/datadelivery/retrieval/distribution/package-info.java
@@ -0,0 +1,37 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+/**
+ * Place holder
+ * 
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * May 14, 2014  #3168     dhladky     Initial creation
+ *
+ * </pre>
+ *
+ * @author dhladky
+ * @version 1.0	
+ */
+
+package com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution;
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/utility/edex_static/base/distribution/dataDeliveryRetrieval.xml b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/utility/edex_static/base/distribution/dataDeliveryRetrieval.xml
similarity index 100%
rename from edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/utility/edex_static/base/distribution/dataDeliveryRetrieval.xml
rename to edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/utility/edex_static/base/distribution/dataDeliveryRetrieval.xml
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/datadelivery-wfo-retrieval-process.xml b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/datadelivery-wfo-retrieval-process.xml
index 0aef8ec85f..2b015a2523 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/datadelivery-wfo-retrieval-process.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/datadelivery-wfo-retrieval-process.xml
@@ -4,22 +4,21 @@
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="dataDeliveryRetrievalDecoder"
-        class="com.raytheon.uf.edex.plugin.datadelivery.retrieval.SbnDataDeliveryRetrievalDecoder">
-        <constructor-arg value="notifyRetrieval" />
-    </bean>
+    class="com.raytheon.uf.edex.plugin.datadelivery.retrieval.SbnDataDeliveryRetrievalDecoder">
+    <constructor-arg value="notifyRetrieval" />
+</bean>
 
     <camelContext id="dataDeliveryRetrieval-camel"
         xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
         <route id="dataDeliveryRetrievalProcess">
             <from
-                uri="jms-generic:queue:dataDeliveryRetrievalProcess?destinationResolver=#qpidDurableResolver" />
+                uri="jms-durable:queue:dataDeliveryRetrievalProcess" />
             <doTry>
                 <bean ref="stringToFile" />
                 <bean ref="dataDeliveryRetrievalDecoder" method="process" />
                 <doCatch>
                     <exception>java.lang.Throwable</exception>
-                    <to
-                        uri="log:dataDeliveryRetrieval" />
+                    <to uri="log:dataDeliveryRetrieval" />
                 </doCatch>
             </doTry>
         </route>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
deleted file mode 100644
index 05f6d4c83f..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    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
-  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <bean id="dataDeliveryRetrievalPluginName" class="java.lang.String">
-        <constructor-arg type="java.lang.String" value="dataDeliveryRetrieval" />
-    </bean>
-
-    <bean id="dataDeliveryRetrievalProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-        <property name="pluginName" ref="dataDeliveryRetrievalPluginName" />
-        <property name="pluginFQN"
-            value="com.raytheon.uf.edex.plugin.datadelivery.retrieval" />
-    </bean>
-
-    <bean id="dataDeliveryRetrievalRegistered" factory-bean="pluginRegistry"
-        factory-method="register">
-        <constructor-arg ref="dataDeliveryRetrievalPluginName" />
-        <constructor-arg ref="dataDeliveryRetrievalProperties" />
-    </bean>
-
-</beans>
\ No newline at end of file