diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
index 85712c13614..437f98ef9b0 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
@@ -17,6 +17,71 @@ Contributors:
 <?eclipse version="3.0"?>
 <plugin>
 
+<!-- ============================================ -->
+<!-- Register Adapter Factories                   -->
+<!-- ============================================ -->
+ 
+	<extension point="org.eclipse.core.runtime.adapters">
+		<!-- Remote Error --> 
+		<factory 
+			class="org.eclipse.rse.internal.shells.ui.view.SystemViewOutputAdapterFactory" 
+			adaptableType="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError">
+            <adapter type="org.eclipse.rse.ui.view.ISystemViewElementAdapter"/>
+			<adapter type="org.eclipse.rse.ui.view.ISystemDragDropAdapter"/>
+			<adapter type="org.eclipse.rse.ui.view.ISystemRemoteElementAdapter"/>
+			<adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
+			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
+			<adapter type="org.eclipse.ui.IActionFilter"/>
+			<!-- TODO Check: These are not in the adapter factories 
+			     getAdapterList() Although the adapter implements them
+			<adapter type="org.eclipse.ui.progress.IDeferredWorkbenchAdapter"/>
+			<adapter type="org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier"/>
+			-->
+		</factory> 
+		<!-- Remote Output --> 
+		<factory 
+			class="org.eclipse.rse.internal.shells.ui.view.SystemViewOutputAdapterFactory" 
+			adaptableType="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput">
+            <adapter type="org.eclipse.rse.ui.view.ISystemViewElementAdapter"/>
+			<adapter type="org.eclipse.rse.ui.view.ISystemDragDropAdapter"/>
+			<adapter type="org.eclipse.rse.ui.view.ISystemRemoteElementAdapter"/>
+			<adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
+			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
+			<adapter type="org.eclipse.ui.IActionFilter"/>
+			<!-- TODO Check: These are not in the adapter factories 
+			     getAdapterList() Although the adapter implements them
+			<adapter type="org.eclipse.ui.progress.IDeferredWorkbenchAdapter"/>
+			<adapter type="org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier"/>
+			-->
+		</factory> 
+		<!-- Remote Command Shell --> 
+		<factory 
+			class="org.eclipse.rse.internal.shells.ui.view.SystemViewOutputAdapterFactory" 
+			adaptableType="org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell">
+            <adapter type="org.eclipse.rse.ui.view.ISystemViewElementAdapter"/>
+			<adapter type="org.eclipse.rse.ui.view.ISystemDragDropAdapter"/>
+			<adapter type="org.eclipse.rse.ui.view.ISystemRemoteElementAdapter"/>
+			<adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
+			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
+			<adapter type="org.eclipse.ui.IActionFilter"/>
+			<!-- TODO Check: These are not in the adapter factories 
+			     getAdapterList() Although the adapter implements them
+			<adapter type="org.eclipse.ui.progress.IDeferredWorkbenchAdapter"/>
+			<adapter type="org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier"/>
+			-->
+		</factory> 
+		<!-- IShellServiceSubSystemConfiguration --> 
+		<factory 
+				class="org.eclipse.rse.internal.shells.ui.view.ShellServiceSubSystemConfigurationAdapterFactory" 
+				adaptableType="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration">
+            <adapter type="org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter"/>
+		</factory> 
+	</extension>
+
+
+<!-- ============================================ -->
+<!-- Register Views                               -->
+<!-- ============================================ -->
    <extension
          point="org.eclipse.ui.views">
       <view
@@ -58,7 +123,7 @@ Contributors:
 
       <page
             name="%PropertyPage.ServerLauncherSettings" 
-            class="org.eclipse.rse.ui.propertypages.ServerLauncherPropertyPage"
+            class="org.eclipse.rse.internal.ui.propertypages.ServerLauncherPropertyPage"
             id="org.eclipse.rse.ui.propertypages.serverLauncherPropertyPage">
             <filter name="serverLaunchPP" value="true"/>
          <enabledWhen>
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java
index b5ef91efcc1..47632343a2c 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,16 +11,12 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories
  ********************************************************************************/
 
 package org.eclipse.rse.shells.ui;
 
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.internal.shells.ui.view.ShellServiceSubSystemConfigurationAdapterFactory;
-import org.eclipse.rse.internal.shells.ui.view.SystemViewOutputAdapterFactory;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -32,7 +28,6 @@ public class Activator extends AbstractUIPlugin {
 
 	//The shared instance.
 	private static Activator plugin;
-	SystemViewOutputAdapterFactory  _svoaf;
 	
 	/**
 	 * The constructor.
@@ -47,24 +42,8 @@ public class Activator extends AbstractUIPlugin {
 	public void start(BundleContext context) throws Exception 
 	{
 		super.start(context);
-		
-		 IAdapterManager manager = Platform.getAdapterManager();
-		
-		 _svoaf = new SystemViewOutputAdapterFactory();	
-		 _svoaf.registerWithManager(manager);	
-		 
-		 ShellServiceSubSystemConfigurationAdapterFactory fac = new ShellServiceSubSystemConfigurationAdapterFactory();
-		 fac.registerWithManager(manager);		
 	}
 
-    /**
-     * For pathpath access to our adapters for viewable remote output objects. Exploits the knowledge we use singleton adapters.
-     */
-    public SystemViewOutputAdapterFactory getSystemViewOutputAdapterFactory()
-    {
-    	return _svoaf;
-    }
-    
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java
index 62f924ff742..14f243358e6 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,12 +11,14 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories
  ********************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.shells.core;
 
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.rse.subsystems.shells.core.model.RemoteOutput;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -40,6 +42,13 @@ public class Activator extends AbstractUIPlugin {
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+
+		// make sure that required adapters factories are loaded 
+		//(will typically activate org.eclipse.rse.shells.ui)
+		//TODO Check that this does not fire up the UI if we want to be headless
+		Platform.getAdapterManager().loadAdapter(new RemoteOutput(null,""), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$ //$NON-NLS-2$
+		// Others (IRemoteError, ShellServiceSubSystemConfigurationAdapter 
+		// will be available automatically once the shells.ui plugin is loaded
 	}
 
 	/**
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
index cbda900eafe..c6d81b7d90f 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.dstore.core,
  org.eclipse.dstore.extra,
  org.eclipse.rse.connectorservice.dstore,
- org.eclipse.rse.shells.ui,
  org.eclipse.rse.subsystems.shells.core,
  org.eclipse.rse.core,
  org.eclipse.rse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/Activator.java
index e91671b16c9..d2eb567e7ac 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/Activator.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/internal/subsystems/shells/dstore/Activator.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,7 +11,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories
  ********************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.shells.dstore;
@@ -41,9 +41,6 @@ public class Activator extends AbstractUIPlugin {
 	public void start(BundleContext context) throws Exception 
 	{
 		super.start(context);
-		
-		// shells ui needs to be started for proper UI init
-		org.eclipse.rse.shells.ui.Activator.getDefault();
 	}
 
 	/**
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
index 5ec4e9eeffc..c1949df2bf8 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services,
  org.eclipse.rse.services.local,
  org.eclipse.rse.connectorservice.local,
- org.eclipse.rse.shells.ui,
  org.eclipse.rse.subsystems.shells.core,
  org.eclipse.rse.core,
  org.eclipse.rse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java
index 94e89a0b075..1b62d73436b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/Activator.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,7 +11,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories
  ********************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.shells.local;
@@ -41,9 +41,6 @@ public class Activator extends AbstractUIPlugin {
 	public void start(BundleContext context) throws Exception 
 	{
 		super.start(context);
-		
-		// shells ui needs to be started for proper UI init
-		org.eclipse.rse.shells.ui.Activator.getDefault();
 	}
 
 	/**
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
index 94429263a73..ecae9462a9d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services.ssh,
  org.eclipse.rse.subsystems.shells.core,
  org.eclipse.rse.subsystems.files.core,
- org.eclipse.rse.shells.ui,
  org.eclipse.rse.core,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/Activator.java
index de2063b2850..48504fb07a6 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/Activator.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/Activator.java
@@ -38,9 +38,6 @@ public class Activator extends AbstractUIPlugin {
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-
-		// shells ui needs to be started for proper UI init
-		org.eclipse.rse.shells.ui.Activator.getDefault();
 	}
 
 	/*