diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java
index 39936b851c7..9d430b3b9a7 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java
+++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java
@@ -67,7 +67,7 @@ public class DaytimeSubsystemConfiguration extends ServiceSubSystemConfiguration
 	/**
 	 * Instantiate and return an instance of OUR subystem. 
 	 * Do not populate it yet though!
-	 * @see org.eclipse.rse.core.subsystems.impl.SubSystemFactoryImpl#createSubSystemInternal(IHost)
+	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(IHost)
 	 */
 	public ISubSystem createSubSystemInternal(IHost host) {
 		IConnectorService connectorService = getConnectorService(host);
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java
index 63e36cae335..6ca5cbefd50 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultConfiguration.java
@@ -60,63 +60,63 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu
 	}
 	
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#setParentResultSet(org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultSet)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#setParentResultSet(org.eclipse.rse.services.search.IHostSearchResultSet)
 	 */
 	public void setParentResultSet(IHostSearchResultSet resultSet) {
 		this.parentResultSet = resultSet;
 	}
 	
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getParentResultSet()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getParentResultSet()
 	 */
 	public IHostSearchResultSet getParentResultSet() {
 		return parentResultSet;
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#setSearchTarget(java.lang.Object)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#setSearchTarget(java.lang.Object)
 	 */
 	public void setSearchTarget(Object searchObject) {
 		this.searchTarget = searchObject;
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getSearchTarget()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getSearchTarget()
 	 */
 	public Object getSearchTarget() {
 		return searchTarget;
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#setSearchString(org.eclipse.rse.services.clientserver.SystemSearchString)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#setSearchString(org.eclipse.rse.services.clientserver.SystemSearchString)
 	 */
 	public void setSearchString(SystemSearchString string) {
 		this.searchString = string;
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getSearchString()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getSearchString()
 	 */
 	public SystemSearchString getSearchString() {
 		return searchString;
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#addResult(java.lang.Object)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#addResult(java.lang.Object)
 	 */
 	public void addResult(Object result) {
 		results.add(result);
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#removeResult(java.lang.Object)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#removeResult(java.lang.Object)
 	 */
 	public void removeResult(Object result) {
 		results.remove(result);
 	}
 	
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#removeAndAddResult(java.lang.Object, java.lang.Object)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#removeAndAddResult(java.lang.Object, java.lang.Object)
 	 */
 	public void removeAndAddResult(Object oldResult, Object newResult) {
 		results.remove(oldResult);
@@ -124,7 +124,7 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getResults()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getResults()
 	 */
 	public Object[] getResults() {
 		return results.toArray();
@@ -136,28 +136,28 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu
 	}
 	
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getResultsSize()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getResultsSize()
 	 */
 	public int getResultsSize() {
 		return results.size();
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#removeResults()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#removeResults()
 	 */
 	public void removeResults() {
 		results.removeAllElements();
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#setStatus(int)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#setStatus(int)
 	 */
 	public void setStatus(int status) {
 		this.status = status;
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getStatus()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getStatus()
 	 */
 	public int getStatus() {
 		return status;
@@ -165,7 +165,7 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu
 	
 	/**
 	 * Does nothing.
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#cancel()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#cancel()
 	 */
 	public void cancel() {
 		
@@ -176,7 +176,7 @@ public class RemoteSearchResultConfiguration implements IHostSearchResultConfigu
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#dispose()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#dispose()
 	 */
 	public void dispose() {
 		
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/UniversalSearchResultConfigurationImpl.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/UniversalSearchResultConfigurationImpl.java
index daa881f6c99..0ac839090aa 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/UniversalSearchResultConfigurationImpl.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/UniversalSearchResultConfigurationImpl.java
@@ -46,7 +46,7 @@ public class UniversalSearchResultConfigurationImpl extends RemoteSearchResultCo
 	}
 	
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#cancel()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#cancel()
 	 */
 	public void cancel() {
 		
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java
index 993d1ef598b..f1d77ca0781 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemConfiguration.java
@@ -74,7 +74,7 @@ public class DStoreFileSubSystemConfiguration extends FileServiceSubSystemConfig
 	/**
 	 * Instantiate and return an instance of OUR subystem. 
 	 * Do not populate it yet though!
-	 * @see org.eclipse.rse.core.subsystems.impl.SubSystemFactoryImpl#createSubSystemInternal(Host)
+	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(IHost)
 	 */
 	public ISubSystem createSubSystemInternal(IHost host) 
 	{
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java
index 0699d0af88c..a88f61210fc 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java
@@ -47,7 +47,7 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe
 	}
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#getResultsSize()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#getResultsSize()
 	 */
 	public int getResultsSize() 
 	{
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/FTPFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/FTPFileSubSystemConfiguration.java
index d2525c7a5ec..8c0c1a915df 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/FTPFileSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/FTPFileSubSystemConfiguration.java
@@ -66,7 +66,7 @@ public class FTPFileSubSystemConfiguration extends FileServiceSubSystemConfigura
 	/**
 	 * Instantiate and return an instance of OUR subystem. 
 	 * Do not populate it yet though!
-	 * @see org.eclipse.rse.core.subsystems.impl.SubSystemFactoryImpl#createSubSystemInternal(IHost)
+	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(IHost)
 	 */
 	public ISubSystem createSubSystemInternal(IHost host) 
 	{
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
index 549ceb4fd3b..42f974db580 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
@@ -148,7 +148,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
 	/**
 	 * Instantiate and return an instance of OUR subystem. 
 	 * Do not populate it yet though!
-	 * @see org.eclipse.rse.core.subsystems.impl.SubSystemFactoryImpl#createSubSystemInternal(Host)
+	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(IHost)
 	 */
 	public ISubSystem createSubSystemInternal(IHost host) 
 	{
@@ -209,7 +209,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
 	
 	/**
 	 * Creates a config and adds it to the result set.
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfigurationFactory#createSearchConfiguration(org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultSet, java.lang.Object, org.eclipse.rse.services.clientserver.SystemSearchString)
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfigurationFactory#createSearchConfiguration(org.eclipse.rse.services.search.IHostSearchResultSet, java.lang.Object, org.eclipse.rse.services.clientserver.SystemSearchString)
 	 */
 	public IHostSearchResultConfiguration createSearchConfiguration(IHost host, IHostSearchResultSet resultSet, Object searchTarget, SystemSearchString searchString) 
 	{
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java
index f1a05ba89dd..e38c4a2d71c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java
@@ -42,7 +42,7 @@ public class LocalJavaLanguageUtility extends AbstractJavaLanguageUtility {
 
 	/**
 	 * The given remote file must be an instance of <code>LocalFileImpl</code>.
-	 * @see org.eclipse.rse.internal.subsystems.files.IJavaLanguageUtility#getQualifiedClassName(org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile)
+	 * @see org.eclipse.rse.internal.subsystems.files.core.IJavaLanguageUtility#getQualifiedClassName(org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile)
 	 */
 	public String getQualifiedClassName(IRemoteFile remoteFile) {
 		
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java
index 95ed8532a9b..48c2f87adcc 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalSearchResultConfiguration.java
@@ -85,7 +85,7 @@ public class LocalSearchResultConfiguration extends AbstractSearchResultConfigur
 
 
 	/**
-	 * @see org.eclipse.rse.core.subsystems.files.core.subsystems.IHostSearchResultConfiguration#cancel()
+	 * @see org.eclipse.rse.services.search.IHostSearchResultConfiguration#cancel()
 	 */
 	public void cancel() {
 		
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java
index 6239b48872d..00725a19085 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/DStoreShellSubSystemConfiguration.java
@@ -58,7 +58,7 @@ public class DStoreShellSubSystemConfiguration extends ShellServiceSubSystemConf
 	/**
 	 * Instantiate and return an instance of OUR subystem. 
 	 * Do not populate it yet though!
-	 * @see org.eclipse.rse.core.subsystems.impl.SubSystemFactoryImpl#createSubSystemInternal(Host)
+	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(IHost)
 	 */
 	public ISubSystem createSubSystemInternal(IHost host) 
 	{