diff --git a/rse/doc/org.eclipse.dstore.doc.isv/options.txt b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
index 9ef27b1553c..ee78dfe5ef9 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
@@ -19,7 +19,7 @@
 org.eclipse.dstore.core
 org.eclipse.dstore.core.client
 org.eclipse.dstore.core.java
-org.eclipse.dstore.core.miners.miner
+org.eclipse.dstore.core.miners
 org.eclipse.dstore.core.model
 org.eclipse.dstore.core.server
 org.eclipse.dstore.core.util
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/toc.xml b/rse/doc/org.eclipse.dstore.doc.isv/toc.xml
index 6ea4c48d12a..23369707088 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/toc.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/toc.xml
@@ -22,7 +22,7 @@
 		     <topic label="org.eclipse.dstore.core.client" href="reference/api/org/eclipse/dstore/core/client/package-summary.html" />
 		     <topic label="org.eclipse.dstore.core.server" href="reference/api/org/eclipse/dstore/core/server/package-summary.html" />
 		     <topic label="org.eclipse.dstore.core.util" href="reference/api/org/eclipse/dstore/core/util/package-summary.html" />
-		     <topic label="org.eclipse.dstore.core.miners.miner" href="reference/api/org/eclipse/dstore/core/miners/miner/package-summary.html" />
+		     <topic label="org.eclipse.dstore.core.miners" href="reference/api/org/eclipse/dstore/core/miners/package-summary.html" />
 	    </topic>
 	    <anchor id="reference_additions"/>
 	</topic>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
index 2701b528732..3d7c1ac1daa 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
+++ b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
@@ -228,11 +228,11 @@ following summarizes the minimum set of classes you will be creating in order to
             <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html#configureFilterDialog(org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog)">configureFilterDialog</a></samp>
             and in it calling <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/dialogs/SystemChangeFilterDialog.html#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)">setFilterStringEditPane</a></samp>
             on the given dialog.
-      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.html#getNewFilterPoolFilterAction(org.eclipse.rse.core.filters.ISystemFilterPool, org.eclipse.swt.widgets.Shell)">getNewFilterPoolFilterAction(SystemFilterPool, Shell)</a></samp>
+      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/ui/subsystems/ISubSystemConfigurationAdapter.html#getNewFilterPoolFilterAction(org.eclipse.rse.core.filters.ISystemFilterPool, org.eclipse.swt.widgets.Shell)">getNewFilterPoolFilterAction(SystemFilterPool, Shell)</a></samp>
             method in your subsystem factory, to return an instance of your new-filter action.
             You can actually avoid creating an action subclass if you choose, by calling the configuration methods
             in the RSE-supplied <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter action class</a>.
-      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.html#getChangeFilterAction(org.eclipse.rse.core.filters.ISystemFilter, org.eclipse.swt.widgets.Shell)">getChangeFilterAction(SystemFilter, Shell)</a></samp>
+      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/ui/subsystems/ISubSystemConfigurationAdapter.html#getChangeFilterAction(org.eclipse.rse.core.filters.ISystemFilter, org.eclipse.swt.widgets.Shell)">getChangeFilterAction(SystemFilter, Shell)</a></samp>
             method in your subsystem factory, to return an instance of your change-filter action.
             You can actually avoid creating an action subclass if you choose, by calling the configuration methods
             in the RSE-supplied <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html">change-filter action class</a>.
diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt
index dec6460ce55..bbe45f39656 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt
@@ -63,7 +63,6 @@ org.eclipse.rse.core.model
 org.eclipse.rse.core.references
 org.eclipse.rse.core.servicesubsystem
 org.eclipse.rse.core.subsystems
-org.eclipse.rse.core.subsystems.util
 org.eclipse.rse.dstore.universal.miners
 org.eclipse.rse.files.ui
 org.eclipse.rse.files.ui.actions
@@ -86,11 +85,6 @@ org.eclipse.rse.services.clientserver.processes
 org.eclipse.rse.services.clientserver.processes.handlers
 org.eclipse.rse.services.clientserver.search
 org.eclipse.rse.services.dstore
-org.eclipse.rse.services.dstore.files
-org.eclipse.rse.services.dstore.processes
-org.eclipse.rse.services.dstore.rmtservice
-org.eclipse.rse.services.dstore.search
-org.eclipse.rse.services.dstore.shells
 org.eclipse.rse.services.dstore.util
 org.eclipse.rse.services.files
 org.eclipse.rse.services.processes
@@ -128,6 +122,7 @@ org.eclipse.rse.ui.filters
 org.eclipse.rse.ui.filters.actions
 org.eclipse.rse.ui.filters.dialogs
 org.eclipse.rse.ui.messages
+org.eclipse.rse.ui.model
 org.eclipse.rse.ui.open
 org.eclipse.rse.ui.operations
 org.eclipse.rse.ui.propertypages
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
index 25d2840ac23..795711f0f12 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
@@ -32,7 +32,6 @@
 			<topic label="org.eclipse.rse.core.events" href="reference/api/org/eclipse/rse/core/events/package-summary.html" />
 			<topic label="org.eclipse.rse.core.servicesubsystem" href="reference/api/org/eclipse/rse/core/servicesubsystem/package-summary.html" />
 			<topic label="org.eclipse.rse.core.subsystems" href="reference/api/org/eclipse/rse/core/subsystems/package-summary.html" />
-			<topic label="org.eclipse.rse.core.subsystems.util" href="reference/api/org/eclipse/rse/core/subsystems/util/package-summary.html" />
 	    </topic>
 	    <topic label="Logging" href="provisional_api.html">
 	    	<topic label="org.eclipse.rse.logging" href="reference/api/org/eclipse/rse/logging/package-summary.html"/>
@@ -62,11 +61,6 @@
 		</topic>
 		<topic label="Services Implementations" href="provisional_api.html">
 			<topic label="org.eclipse.rse.services.dstore" href="reference/api/org/eclipse/rse/services/dstore/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.files" href="reference/api/org/eclipse/rse/services/dstore/files/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.processes" href="reference/api/org/eclipse/rse/services/dstore/processes/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.shells" href="reference/api/org/eclipse/rse/services/dstore/shells/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.rmtservice" href="reference/api/org/eclipse/rse/services/dstore/rmtservice/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.search" href="reference/api/org/eclipse/rse/services/dstore/search/package-summary.html"/>
 			<topic label="org.eclipse.rse.services.dstore.util" href="reference/api/org/eclipse/rse/services/dstore/util/package-summary.html"/>
 		</topic>
 		<topic label="DStore Miners" href="provisional_api.html">