diff --git a/plugins/org.eclipse.dd.examples.dsf/.externalToolBuilders/PreProcessor.launch b/plugins/org.eclipse.dd.examples.dsf/.externalToolBuilders/PreProcessor.launch
index db347261494..948b857d441 100644
--- a/plugins/org.eclipse.dd.examples.dsf/.externalToolBuilders/PreProcessor.launch
+++ b/plugins/org.eclipse.dd.examples.dsf/.externalToolBuilders/PreProcessor.launch
@@ -3,10 +3,10 @@
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.dd.examples.dsf/build_preprocess.xml"/>
+<listEntry value="/org.eclipse.dd.examples.dsf"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
diff --git a/plugins/org.eclipse.dd.examples.dsf/.project b/plugins/org.eclipse.dd.examples.dsf/.project
index 0b69e7c2499..41747515732 100644
--- a/plugins/org.eclipse.dd.examples.dsf/.project
+++ b/plugins/org.eclipse.dd.examples.dsf/.project
@@ -5,16 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/PreProcessor.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -30,6 +20,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/PreProcessor.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.dd.examples.dsf/build_preprocess.xml b/plugins/org.eclipse.dd.examples.dsf/build_preprocess.xml
index 8805fb7203c..a0cb444f0d3 100644
--- a/plugins/org.eclipse.dd.examples.dsf/build_preprocess.xml
+++ b/plugins/org.eclipse.dd.examples.dsf/build_preprocess.xml
@@ -33,7 +33,6 @@
          = = = = = = = = = = = = = = = = = -->
     <macrodef name="process">
         <attribute name="packagedir"/>
-    	<attribute name="symbols"/>
         <sequential>
             <delete dir="src/@{packagedir}"/>
             <mkdir dir="src/@{packagedir}"/>
@@ -47,7 +46,8 @@
         </sequential>
     </macrodef>
 
-	<process packagedir="org/eclipse/dd/examples/dsf/requestmonitor" symbols="answers"/>
+	<process packagedir="org/eclipse/dd/examples/dsf/requestmonitor"/>
+    <process packagedir="org/eclipse/dd/examples/dsf/dataviewer"/>
 	</target>
 
 </project>
diff --git a/plugins/org.eclipse.dd.examples.dsf/plugin.xml b/plugins/org.eclipse.dd.examples.dsf/plugin.xml
index 798b7f3e230..67936f7f0eb 100644
--- a/plugins/org.eclipse.dd.examples.dsf/plugin.xml
+++ b/plugins/org.eclipse.dd.examples.dsf/plugin.xml
@@ -28,19 +28,19 @@
             <groupMarker name="concurrent"/>
          </menu>
          <action
-               class="org.eclipse.dd.examples.dsf.concurrent.CancellableInputCoalescingSlowDataProviderAction"
+               class="org.eclipse.dd.examples.dsf.dataviewer.CancellableInputCoalescingSlowDataProviderAction"
                id="org.eclipse.dd.dsf.test.cancellableInputCoalescingSlowDataProvider"
                label="Open Dialog with Cancellable Input-Coalescing Slow Data Provider"
                menubarPath="org.eclipse.dd.dsf.examples.timers/concurrent"
                style="push"/>
          <action
-               class="org.eclipse.dd.examples.dsf.concurrent.InputCoalescingSlowDataProviderAction"
+               class="org.eclipse.dd.examples.dsf.dataviewer.InputCoalescingSlowDataProviderAction"
                id="org.eclipse.dd.dsf.test.inputCoalescingSlowDataProvider"
                label="Open Dialog with Input-Coalescing Slow Data Provider"
                menubarPath="org.eclipse.dd.dsf.examples.timers/concurrent"
                style="push"/>
          <action
-               class="org.eclipse.dd.examples.dsf.concurrent.SlowDataProviderAction"
+               class="org.eclipse.dd.examples.dsf.dataviewer.SlowDataProviderAction"
                id="org.eclipse.dd.dsf.test.slowDataProvider"
                label="Open Dialog with Slow Data Provider"
                menubarPath="org.eclipse.dd.dsf.examples.timers/concurrent"