diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt
index 76cc673e1d0..94df961bc42 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt
@@ -1,43 +1,160 @@
 -charset "iso-8859-1"
--sourcepath "../org.eclipse.rse.core/antadapter@sep@../org.eclipse.rse.core/batch@sep@../org.eclipse.rse.core/codeassist@sep@../org.eclipse.rse.core/compiler@sep@../org.eclipse.rse.core/dom@sep@../org.eclipse.rse.core/eval@sep@../org.eclipse.rse.core/formatter@sep@../org.eclipse.rse.core/model@sep@../org.eclipse.rse.core/search@sep@../org.eclipse.rse.debug/model@sep@../org.eclipse.rse.debug/jdi@sep@../org.eclipse.rse.debug/eval@sep@../org.eclipse.rse.debug.ui/ui@sep@../org.eclipse.rse.junit/src@sep@../org.eclipse.rse.junit.runtime/src@sep@../org.eclipse.rse.launching/launching@sep@../org.eclipse.rse.ui/ui@sep@../org.eclipse.rse.ui/core refactoring@sep@../org.eclipse.rse.ui/ui refactoring@sep@../org.eclipse.rse.ui/core extension@sep@../org.eclipse.rse.core.manipulation/refactoring@sep@../org.eclipse.rse.core.manipulation/common"
+-sourcepath "
+../org.eclipse.rse.connectorservice.dstore/src@sep@
+../org.eclipse.rse.connectorservice.local/src@sep@
+../org.eclipse.rse.connectorservice.ssh/src@sep@
+../org.eclipse.rse.core/src@sep@
+../org.eclipse.rse.dstore.security/src@sep@
+../org.eclipse.rse.eclipse.filesystem/src@sep@
+../org.eclipse.rse.files.ui/src@sep@
+../org.eclipse.rse.logging/src@sep@
+../org.eclipse.rse.processes.ui/src@sep@
+../org.eclipse.rse.services/src@sep@
+../org.eclipse.rse.services.dstore/src@sep@
+../org.eclipse.rse.services.files.ftp/src@sep@
+../org.eclipse.rse.services.local/src@sep@
+../org.eclipse.rse.services.ssh/src@sep@
+../org.eclipse.rse.shells.ui/src@sep@
+../org.eclipse.rse.subsystems.files.core/src@sep@
+../org.eclipse.rse.subsystems.files.dstore/src@sep@
+../org.eclipse.rse.subsystems.files.ftp/src@sep@
+../org.eclipse.rse.subsystems.files.local/src@sep@
+../org.eclipse.rse.subsystems.files.ssh/src@sep@
+../org.eclipse.rse.subsystems.processes.core/src@sep@
+../org.eclipse.rse.subsystems.processes.dstore/src@sep@
+../org.eclipse.rse.subsystems.processes.local/src@sep@
+../org.eclipse.rse.subsystems.shells.core/src@sep@
+../org.eclipse.rse.subsystems.shells.dstore/src@sep@
+../org.eclipse.rse.subsystems.shells.local/src@sep@
+../org.eclipse.rse.subsystems.shells.ssh/src@sep@
+../org.eclipse.rse.ui/filters@sep@
+../org.eclipse.rse.ui/persistence@sep@
+../org.eclipse.rse.ui/references@sep@
+../org.eclipse.rse.ui/model@sep@
+../org.eclipse.rse.ui/UI@sep@
+../org.eclipse.rse.ui/subsystems@sep@
+../org.eclipse.rse.ui/systems@sep@"
 -d reference/api
--classpath @rt@@sep@../org.apache.ant/lib/ant.jar@sep@../org.eclipse.debug.core/@dot@sep@../org.eclipse.compare/@dot@sep@../org.eclipse.help/@dot@sep@../org.eclipse.help.ui/@dot@sep@../org.eclipse.core.resources/@dot@sep@../org.eclipse.core.runtime/@dot@sep@../org.eclipse.core.filebuffers/@dot@sep@../org.eclipse.core.expressions/@dot@sep@../org.eclipse.swt.win32.win32.x86/@dot@sep@../org.eclipse.ui/@dot@sep@../org.eclipse.rse.debug/jdi.jar@sep@../org.eclipse.debug.ui/@dot@sep@../org.eclipse.search/@dot@sep@../org.eclipse.jface/@dot@sep@../org.eclipse.jface.text/@dot@sep@../org.eclipse.text/@dot@sep@../org.eclipse.ui.editors/@dot@sep@../org.eclipse.ui.views/@dot@sep@../org.eclipse.ui.workbench/@dot@sep@../org.eclipse.ui.workbench.texteditor/@dot@sep@../org.eclipse.core.variables/@dot@sep@../org.eclipse.ui.ide/@dot@sep@../org.eclipse.rse.junit/@dot@sep@../org.eclipse.osgi/@dot@sep@../org.eclipse.osgi.services/@dot@sep@../org.eclipse.osgi.util/@dot@sep@../org.eclipse.ui.forms/@dot@sep@../org.eclipse.core.commands/@dot@sep@../org.eclipse.ltk.core.refactoring/@dot@sep@../org.eclipse.ltk.ui.refactoring/@dot@sep@../org.eclipse.core.filesystem/@dot@sep@../org.eclipse.core.jobs/@dot@sep@../org.eclipse.equinox.registry/@dot@sep@../org.eclipse.equinox.common/@dot@sep@../org.eclipse.core.contenttype/@dot@sep@../org.eclipse.equinox.preferences/@dot@sep@../org.eclipse.equinox.supplement/@dot@sep@../org.eclipse.core.runtime.content/@dot@sep@../org.eclipse.core.runtime.jobs/@dot@sep@../org.eclipse.core.runtime.preferences/@dot@sep@../org.eclipse.rse.core.manipulation/@dot
+-classpath @rt@
 -breakiterator
 -use
 -splitIndex
 -windowtitle "RSE API Specification"
 -doctitle "RSE API Specification"
 -header "<b>RSE</b><br>Release 1.0"
--bottom "Copyright (c) IBM Corporation and others 2000, 2006.  All Rights Reserved."
+-bottom "Copyright (c) IBM Corporation and others 2000, 2006. All Rights Reserved."
 -group "RSE Core Plug-in Packages" "org.eclipse.rse.core;org.eclipse.rse.core.*"
 -group "RSE UI Plug-in Packages" "org.eclipse.rse.ui;org.eclipse.rse.ui.*"
--link http://java.sun.com/j2se/1.4/docs/api
+-link http://java.sun.com/j2se/1.5/docs/api
 -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
--linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi
 
-org.eclipse.rse.core
-org.eclipse.rse.logging
 org.eclipse.rse.connectorservice.dstore
+org.eclipse.rse.connectorservice.dstore.util
 org.eclipse.rse.connectorservice.local
 org.eclipse.rse.connectorservice.ssh
+org.eclipse.rse.core
+org.eclipse.rse.dstore.security
+org.eclipse.rse.dstore.security.preference
+org.eclipse.rse.dstore.security.util
+org.eclipse.rse.dstore.security.widgets
+org.eclipse.rse.dstore.security.wizards
+org.eclipse.rse.eclipse.filesystem
+org.eclipse.rse.eclipse.filesystem.ui.actions
+org.eclipse.rse.files.ui
+org.eclipse.rse.files.ui.actions
+org.eclipse.rse.files.ui.compare
+org.eclipse.rse.files.ui.dialogs
+org.eclipse.rse.files.ui.propertypages
+org.eclipse.rse.files.ui.resources
+org.eclipse.rse.files.ui.search
+org.eclipse.rse.files.ui.view
+org.eclipse.rse.files.ui.widgets
+org.eclipse.rse.files.ui.wizards
+org.eclipse.rse.logging
+org.eclipse.rse.logging.performance
+org.eclipse.rse.processes.ui
+org.eclipse.rse.processes.ui.actions
+org.eclipse.rse.processes.ui.dialogs
+org.eclipse.rse.processes.ui.propertypages
+org.eclipse.rse.processes.ui.view
 org.eclipse.rse.services
+org.eclipse.rse.services.files
+org.eclipse.rse.services.processes
+org.eclipse.rse.services.search
+org.eclipse.rse.services.shells
 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.ftp
 org.eclipse.rse.services.local
+org.eclipse.rse.services.local.files
+org.eclipse.rse.services.local.processes
+org.eclipse.rse.services.local.search
+org.eclipse.rse.services.local.shells
 org.eclipse.rse.services.ssh
+org.eclipse.rse.shells.ui
+org.eclipse.rse.shells.ui.actions
+org.eclipse.rse.shells.ui.propertypages
+org.eclipse.rse.shells.ui.view
 org.eclipse.rse.subsystems.files.core
+org.eclipse.rse.subsystems.files.core.model
+org.eclipse.rse.subsystems.files.core.servicesubsystem
+org.eclipse.rse.subsystems.files.core.subsystems
+org.eclipse.rse.subsystems.files.core.util
 org.eclipse.rse.subsystems.files.dstore
+org.eclipse.rse.subsystems.files.dstore.model
+org.eclipse.rse.subsystems.files.dstore.old
+org.eclipse.rse.subsystems.files.dstore.subsystem
 org.eclipse.rse.subsystems.files.ftp
+org.eclipse.rse.subsystems.files.ftp.connectorservice
+org.eclipse.rse.subsystems.files.ftp.model
 org.eclipse.rse.subsystems.files.local
+org.eclipse.rse.subsystems.files.local.model
 org.eclipse.rse.subsystems.files.ssh
-org.eclipse.rse.subsystems.shells.core
-org.eclipse.rse.subsystems.shells.dstore
-org.eclipse.rse.subsystems.shells.local
-org.eclipse.rse.subsystems.shells.ssh
 org.eclipse.rse.subsystems.processes.core
+org.eclipse.rse.subsystems.processes.core.subsystem
+org.eclipse.rse.subsystems.processes.core.subsystem.impl
+org.eclipse.rse.subsystems.processes.servicesubsystem
 org.eclipse.rse.subsystems.processes.dstore
 org.eclipse.rse.subsystems.processes.local
+org.eclipse.rse.subsystems.shells.core
+org.eclipse.rse.subsystems.shells.core.model
+org.eclipse.rse.subsystems.shells.core.subsystems
+org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem
+org.eclipse.rse.subsystems.shells.dstore
+org.eclipse.rse.subsystems.shells.dstore.model
+org.eclipse.rse.subsystems.shells.local
+org.eclipse.rse.subsystems.shells.local.model
+org.eclipse.rse.subsystems.shells.ssh
+org.eclipse.rse.filters
+org.eclipse.rse.persistence
+org.eclipse.rse.persistence.dom
+org.eclipse.rse.references
+org.eclipse.rse.model
 org.eclipse.rse.ui
-org.eclipse.rse.files.ui
-org.eclipse.rse.shells.ui
-org.eclipse.rse.processes.ui
+org.eclipse.rse.ui.actions
+org.eclipse.rse.ui.dialogs
+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.open
+org.eclipse.rse.ui.operations
+org.eclipse.rse.ui.validators
+org.eclipse.rse.ui.view
+org.eclipse.rse.ui.view.monitor
+org.eclipse.rse.ui.view.scratchpad
+org.eclipse.rse.ui.view.search
+org.eclipse.rse.ui.view.team
+org.eclipse.rse.ui.widgets
+org.eclipse.rse.ui.widgets.services
+org.eclipse.rse.ui.wizards
+org.eclipse.rse.core.servicesubsystem
+org.eclipse.rse.core.subsystems
+org.eclipse.rse.core.subsystems.util
+org.eclipse.rse.core
+org.eclipse.rse.core.comm
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml
index a167552bb6b..0cfc46b64fb 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml
@@ -5,37 +5,14 @@
 <!-- ============================================================================= -->
 <toc label="Guide">
 	<topic label="RSE Architecture" href="guide/rse_int_architecture.html">
-		<topic label="Overview" href="guide/rse_int_overview.html">
-		</topic>
-		<topic label="Services" href="guide/rse_int_services.html">
-		<!--
-			<topic label="RSE Core options" href="guide/rse_api_options.htm" />
-			-->
-		
-		</topic>
-		<topic label="Subsystems" href="guide/rse_int_subsystems.html">
-		<!--
-			<topic label="RSE Core options" href="guide/rse_api_options.html" />
-			-->
-		</topic>
-		<topic label="Connector Services" href="guide/rse_int_connectorservices.html">
-		  <!--
-			<topic label="RSE Core options" href="guide/rse_api_options.htm" />
-			-->
-		</topic>	
-		<topic label="Hosts" href="guide/rse_int_hosts.html">
-		  <!--
-			<topic label="RSE Core options" href="guide/rse_api_options.htm" />
-			-->
-		</topic>
-		<topic label="UI" href="guide/rse_int_ui.html">
-		<!--
-			<topic label="RSE Core options" href="guide/rse_api_options.htm" />
-			-->
-		</topic>		
+		<topic label="Overview" href="guide/rse_int_overview.html"/>
+		<topic label="Services" href="guide/rse_int_services.html"/>
+		<topic label="Subsystems" href="guide/rse_int_subsystems.html"/>
+		<topic label="Connector Services" href="guide/rse_int_connectorservices.html"/>
+		<topic label="Hosts" href="guide/rse_int_hosts.html"/>
+		<topic label="UI" href="guide/rse_int_ui.html"/>
 	</topic>
-	</topic>
-		<topic label="Using the RSE API" href="guide/usingAPIs.html">
+	<topic label="Using the RSE API" href="guide/usingAPIs.html"/>
 		<topic label="RSE User Interface API" href="guide/api/uiAPI.html" />
 		<topic label="RSE Remote Resource API" href="guide/api/resourceAPI.html" />
 		<topic label="RSE Model API" href="guide/api/modelAPI.html" />
@@ -49,7 +26,7 @@
 	</topic>
 	<topic label="Tutorials" href="guide/tutorials.html">
 		<topic label="Creating a Remote Resource Popup Menu Action" href="guide/tutorial/popup.html" />
-		<topic label="Creating a Remote Resource Property Page"     href="guide/tutorial/propertypage.html" />
+		<topic label="Creating a Remote Resource Property Page" href="guide/tutorial/propertypage.html" />
 		<topic label="Creating a Subsystem Factory" href="guide/tutorial/subsystem.html" />
 	</topic>
 </toc>
\ No newline at end of file
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 f5ef22f6473..748752055b2 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
@@ -6,40 +6,44 @@
 <toc label="Reference">
 
 	<topic label="Extension Points Reference">
-		<topic label="org.eclipse.rse.core.archivehandlers" href="reference/api/com_ibm_etools_systems_core_archivehandlers.html" />
-		<topic label="org.eclipse.rse.core.compile" href="reference/api/com_ibm_etools_systems_core_compile.html" />
-		<topic label="org.eclipse.rse.core.mountPathMappers" href="reference/api/com_ibm_etools_systems_core_mountPathMappers.html" />
-		<topic label="org.eclipse.rse.core.passwordPersistence" href="reference/api/com_ibm_etools_systems_core_passwordPersistence.html" />
-		<topic label="org.eclipse.rse.core.popupMenus" href="reference/api/com_ibm_etools_systems_core_popupMenus.html" />
-		<topic label="org.eclipse.rse.core.propertyPages" href="reference/api/com_ibm_etools_systems_core_propertyPages.html" />
-		<topic label="org.eclipse.rse.core.remoteSystemsViewPreferencesAction" href="reference/api/com_ibm_etools_systems_core_remoteSystemsViewPreferencesAction.html" />
-		<topic label="org.eclipse.rse.core.subsystemfactory" href="reference/api/com_ibm_etools_systems_core_subsystemfactory.html" />
-		<topic label="org.eclipse.rse.core.systemtype" href="reference/api/com_ibm_etools_systems_core_systemtype.html" />
+		<topic label="org.eclipse.rse.core.systemTypes" href="reference/extension_points/org_eclipse_rse_core_systemTypes.html" />
+		<topic label="org.eclipse.rse.ui.archivehandlers" href="reference/extension_points/org_eclipse_rse_ui_archivehandlers.html" />
+		<topic label="org.eclipse.rse.ui.compile" href="reference/extension_points/org_eclipse_rse_ui_compile.html" />
+		<topic label="org.eclipse.rse.ui.dynamicPopupMenuExtensions" href="reference/extension_points/org_eclipse_rse_ui_dynamicPopupMenuExtensions.html" />
+		<topic label="org.eclipse.rse.ui.keystoreProviders" href="reference/extension_points/org_eclipse_rse_ui_keystoreProviders.html" />
+		<topic label="org.eclipse.rse.ui.mountPathMappers" href="reference/extension_points/org_eclipse_rse_ui_mountPathMappers.html" />
+		<topic label="org.eclipse.rse.ui.passwordPersistence" href="reference/extension_points/org_eclipse_rse_ui_passwordPersistence.html" />
+		<topic label="org.eclipse.rse.ui.persistenceProviders" href="reference/extension_points/org_eclipse_rse_ui_persistenceProviders.html" />
+		<topic label="org.eclipse.rse.ui.popupMenus" href="reference/extension_points/org_eclipse_rse_ui_popupMenus.html" />
+		<topic label="org.eclipse.rse.ui.propertyPages" href="reference/extension_points/org_eclipse_rse_ui_propertyPages.html" />
+		<topic label="org.eclipse.rse.ui.remoteSystemsViewPreferencesAction" href="reference/extension_points/org_eclipse_rse_ui_remoteSystemsViewPreferencesAction.html" />
+		<topic label="org.eclipse.rse.ui.rseConfigDefaults" href="reference/extension_points/org_eclipse_rse_ui_rseConfigDefaults.html" />
+		<topic label="org.eclipse.rse.ui.subsystemConfiguration" href="reference/extension_points/org_eclipse_rse_ui_subsystemConfiguration.html" />
 		<anchor id="rse-extension-points-ref" />
 	</topic>
 
 	<topic label="Remote Systems API Reference By Topic">
 		<topic label="Core">
-		  <topic label="org.eclipse.rse.core" href="reference/api/com/ibm/etools/systems/core/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.comm" href="reference/api/com/ibm/etools/systems/core/comm/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.resources" href="reference/api/com/ibm/etools/systems/core/resources/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.search" href="reference/api/com/ibm/etools/systems/core/search/package-summary.html" />
+		  <topic label="org.eclipse.rse.core" href="reference/api/org/eclipse/rse/core/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.comm" href="reference/api/org/eclipse/rse/core/comm/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.resources" href="reference/api/org/eclipse/rse/core/resources/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.search" href="reference/api/org/eclipse/rse/core/search/package-summary.html" />
 	    </topic>
 		<topic label="User Interface">
-		  <topic label="org.eclipse.rse.core.ui" href="reference/api/com/ibm/etools/systems/core/ui/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.actions" href="reference/api/com/ibm/etools/systems/core/ui/actions/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.commands" href="reference/api/com/ibm/etools/systems/core/ui/commands/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.dialogs" href="reference/api/com/ibm/etools/systems/core/ui/dialogs/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.messages" href="reference/api/com/ibm/etools/systems/core/ui/messages/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.open" href="reference/api/com/ibm/etools/systems/core/ui/open/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.propertypages" href="reference/api/com/ibm/etools/systems/core/ui/propertypages/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.validators" href="reference/api/com/ibm/etools/systems/core/ui/validators/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.view" href="reference/api/com/ibm/etools/systems/core/ui/view/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.view.commands" href="reference/api/com/ibm/etools/systems/core/ui/view/commands/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.view.search" href="reference/api/com/ibm/etools/systems/core/ui/view/search/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.view.team" href="reference/api/com/ibm/etools/systems/core/ui/view/team/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.widgets" href="reference/api/com/ibm/etools/systems/core/ui/widgets/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.wizards" href="reference/api/com/ibm/etools/systems/core/ui/wizards/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui" href="reference/api/org/eclipse/rse/ui/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.actions" href="reference/api/org/eclipse/rse/ui/actions/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.commands" href="reference/api/org/eclipse/rse/ui/commands/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.dialogs" href="reference/api/org/eclipse/rse/ui/dialogs/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.messages" href="reference/api/org/eclipse/rse/ui/messages/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.open" href="reference/api/org/eclipse/rse/ui/open/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.propertypages" href="reference/api/org/eclipse/rse/ui/propertypages/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.validators" href="reference/api/org/eclipse/rse/ui/validators/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.view" href="reference/api/org/eclipse/rse/ui/view/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.view.commands" href="reference/api/org/eclipse/rse/ui/view/commands/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.view.search" href="reference/api/org/eclipse/rse/ui/view/search/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.view.team" href="reference/api/org/eclipse/rse/ui/view/team/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.widgets" href="reference/api/org/eclipse/rse/ui/widgets/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.wizards" href="reference/api/org/eclipse/rse/ui/wizards/package-summary.html" />
 	    </topic>
 		<topic label="Profiles and Connections">
 		  <topic label="org.eclipse.rse.model" href="reference/api/com/ibm/etools/systems/model/package-summary.html" />
@@ -85,17 +89,17 @@
 		  <topic label="org.eclipse.rse.references.util" href="reference/api/com/ibm/etools/systems/references/util/package-summary.html" />
 	    </topic>
 		<topic label="User Actions">
-		  <topic label="org.eclipse.rse.core.ui.uda" href="reference/api/com/ibm/etools/systems/core/ui/uda/package-summary.html" />
-		  <topic label="org.eclipse.rse.core.ui.uda.util" href="reference/api/com/ibm/etools/systems/core/ui/uda/util/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.uda" href="reference/api/org/eclipse/rse/ui/uda/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.uda.util" href="reference/api/org/eclipse/rse/ui/uda/util/package-summary.html" />
 	    </topic>
 		<topic label="Compile Commands">
-		  <topic label="org.eclipse.rse.core.ui.compile" href="reference/api/com/ibm/etools/systems/core/ui/compile/package-summary.html" />
+		  <topic label="org.eclipse.rse.core.ui.compile" href="reference/api/org/eclipse/rse/ui/compile/package-summary.html" />
 	    </topic>
 		<topic label="Common Client and Server Helpers">
-		  <topic label="org.eclipse.rse.services.clientserver.archiveutils" href="reference/api/com/ibm/etools/systems/core/archiveutils/package-summary.html" />
-		  <topic label="org.eclipse.rse.services.clientserver" href="reference/api/com/ibm/etools/systems/core/clientserver/package-summary.html" />
-		  <topic label="org.eclipse.rse.services.clientserver.search" href="reference/api/com/ibm/etools/systems/core/clientserver/search/package-summary.html" />
-		  <topic label="org.eclipse.rse.services.clientserver.util.tar" href="reference/api/com/ibm/etools/systems/core/clientserver/util/tar/package-summary.html" />
+		  <topic label="org.eclipse.rse.services.clientserver.archiveutils" href="reference/api/org/eclipse/rse/core/archiveutils/package-summary.html" />
+		  <topic label="org.eclipse.rse.services.clientserver" href="reference/api/org/eclipse/rse/core/clientserver/package-summary.html" />
+		  <topic label="org.eclipse.rse.services.clientserver.search" href="reference/api/org/eclipse/rse/core/clientserver/search/package-summary.html" />
+		  <topic label="org.eclipse.rse.services.clientserver.util.tar" href="reference/api/org/eclipse/rse/core/clientserver/util/tar/package-summary.html" />
 	    </topic>
 	</topic>