diff --git a/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
index 205e65902b7..d2f8426c1d7 100644
--- a/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.remote.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.internal.remote.core.RemoteCorePlugin
+Bundle-Activator: org.eclipse.remote.internal.core.RemoteCorePlugin
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  org.eclipse.core.variables
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.internal.remote.core;x-friends:="org.eclipse.remote.ui",
- org.eclipse.internal.remote.core.messages;x-internal:=true,
- org.eclipse.internal.remote.core.preferences;x-friends:="org.eclipse.remote.ui",
- org.eclipse.internal.remote.core.services.local;x-internal:=true,
- org.eclipse.remote.core,
- org.eclipse.remote.core.exception
+Export-Package: org.eclipse.remote.core,
+ org.eclipse.remote.core.exception,
+ org.eclipse.remote.internal.core;x-friends:="org.eclipse.remote.ui",
+ org.eclipse.remote.internal.core.messages;x-internal:=true,
+ org.eclipse.remote.internal.core.preferences;x-friends:="org.eclipse.remote.ui",
+ org.eclipse.remote.internal.core.services.local;x-internal:=true
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.equinox.security.storage
diff --git a/bundles/org.eclipse.remote.core/plugin.xml b/bundles/org.eclipse.remote.core/plugin.xml
index ed73df73c25..4434d889a90 100644
--- a/bundles/org.eclipse.remote.core/plugin.xml
+++ b/bundles/org.eclipse.remote.core/plugin.xml
@@ -7,7 +7,7 @@
    <extension
          point="org.eclipse.remote.core.remoteServices">
       <remoteServices
-            class="org.eclipse.internal.remote.core.services.local.LocalServicesFactory"
+            class="org.eclipse.remote.internal.core.services.local.LocalServicesFactory"
             id="org.eclipse.remote.LocalServices"
             name="Local"
             scheme="file">
@@ -17,7 +17,7 @@
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="org.eclipse.core.resources.IResource"
-            class="org.eclipse.internal.remote.core.RemoteResourceAdapterFactory">
+            class="org.eclipse.remote.internal.core.RemoteResourceAdapterFactory">
          <adapter
                type="org.eclipse.remote.core.IRemoteResource">
          </adapter>
@@ -26,7 +26,7 @@
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.eclipse.internal.remote.core.preferences.PreferenceInitializer">
+            class="org.eclipse.remote.internal.core.preferences.PreferenceInitializer">
       </initializer>
    </extension>
 
diff --git a/bundles/org.eclipse.remote.core/schema/remoteServices.exsd b/bundles/org.eclipse.remote.core/schema/remoteServices.exsd
index c474783d1b5..598fca3e0d2 100644
--- a/bundles/org.eclipse.remote.core/schema/remoteServices.exsd
+++ b/bundles/org.eclipse.remote.core/schema/remoteServices.exsd
@@ -110,7 +110,7 @@
    &lt;extension
          point=&quot;org.eclipse.remote.core.remoteServices&quot;&gt;
       &lt;remoteServices
-            class=&quot;org.eclipse.internal.remote.core.services.local.LocalServicesFactory&quot;
+            class=&quot;org.eclipse.remote.internal.core.services.local.LocalServicesFactory&quot;
             id=&quot;org.eclipse.ptp.remote.LocalServices&quot;
             name=&quot;Local&quot;
             scheme=&quot;file&quot;&gt;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java
index 64eea6a17c9..609ced0dd6f 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java
@@ -13,9 +13,9 @@ package org.eclipse.remote.core;
 import java.net.URI;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.internal.remote.core.RemoteServicesDescriptor;
-import org.eclipse.internal.remote.core.RemoteServicesImpl;
-import org.eclipse.internal.remote.core.services.local.LocalServices;
+import org.eclipse.remote.internal.core.RemoteServicesDescriptor;
+import org.eclipse.remote.internal.core.RemoteServicesImpl;
+import org.eclipse.remote.internal.core.services.local.LocalServices;
 
 /**
  * Main entry point for accessing remote services.
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java
index 299575e3143..9ce78756b0f 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java
@@ -17,9 +17,9 @@ import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.core.RemoteServicesDescriptor;
-import org.eclipse.internal.remote.core.RemoteServicesImpl;
-import org.eclipse.internal.remote.core.preferences.Preferences;
+import org.eclipse.remote.internal.core.RemoteServicesDescriptor;
+import org.eclipse.remote.internal.core.RemoteServicesImpl;
+import org.eclipse.remote.internal.core.preferences.Preferences;
 
 /**
  * Remote services utility methods.
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java
index 3b0491bab6f..f4b30cb9663 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java
@@ -14,7 +14,7 @@ package org.eclipse.remote.core.exception;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.internal.remote.core.RemoteCorePlugin;
+import org.eclipse.remote.internal.core.RemoteCorePlugin;
 
 /**
  * Exception thrown when a remote connection error occurs.
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteCorePlugin.java
similarity index 96%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteCorePlugin.java
index 295b5f6d193..0bfe0e3c316 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteCorePlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core;
+package org.eclipse.remote.internal.core;
 
 import org.eclipse.core.resources.ISaveContext;
 import org.eclipse.core.resources.ISaveParticipant;
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.internal.remote.core.preferences.Preferences;
+import org.eclipse.remote.internal.core.preferences.Preferences;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java
similarity index 96%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java
index db381957a3e..0008d38a9a7 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core;
+package org.eclipse.remote.internal.core;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,8 +21,8 @@ import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.internal.remote.core.services.local.LocalResource;
 import org.eclipse.remote.core.IRemoteResource;
+import org.eclipse.remote.internal.core.services.local.LocalResource;
 
 public class RemoteResourceAdapterFactory implements IAdapterFactory {
 	public static final String EXTENSION_POINT_ID = "remoteResources"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceFactory.java
similarity index 97%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceFactory.java
index a648357aa08..668bd7a7547 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core;
+package org.eclipse.remote.internal.core;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesDescriptor.java
similarity index 97%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesDescriptor.java
index 683b5efd034..d5c72f84a32 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesDescriptor.java
@@ -8,14 +8,14 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core;
+package org.eclipse.remote.internal.core;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.internal.remote.core.messages.Messages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.IRemoteServicesDescriptor;
 import org.eclipse.remote.core.IRemoteServicesFactory;
+import org.eclipse.remote.internal.core.messages.Messages;
 
 public class RemoteServicesDescriptor implements IRemoteServicesDescriptor {
 	private static final String ATTR_ID = "id"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesImpl.java
similarity index 97%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesImpl.java
index 0ea07834c92..4fb7616033a 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core;
+package org.eclipse.remote.internal.core;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.internal.remote.core.services.local.LocalServices;
 import org.eclipse.remote.core.RemoteServices;
+import org.eclipse.remote.internal.core.services.local.LocalServices;
 
 /**
  * Main entry point for remote services
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/messages/Messages.java
similarity index 72%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/messages/Messages.java
index b36c29dbfd6..306928d81c6 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/messages/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.internal.remote.core.messages;
+package org.eclipse.remote.internal.core.messages;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.internal.remote.core.messages.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.remote.internal.core.messages.messages"; //$NON-NLS-1$
 	public static String LocalConnection_1;
 	public static String LocalConnection_2;
 	public static String RemoteServicesProxy_0;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/messages.properties b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/messages/messages.properties
similarity index 100%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/messages.properties
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/messages/messages.properties
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/preferences/PreferenceInitializer.java
similarity index 92%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/preferences/PreferenceInitializer.java
index bd8572de647..52ac3ac0dfe 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/preferences/PreferenceInitializer.java
@@ -9,7 +9,7 @@
  * IBM - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.internal.remote.core.preferences;
+package org.eclipse.remote.internal.core.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.remote.core.IRemotePreferenceConstants;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/preferences/Preferences.java
similarity index 96%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/preferences/Preferences.java
index ff45e927c9a..d06c6b01e1e 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/preferences/Preferences.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.preferences;
+package org.eclipse.remote.internal.core.preferences;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.DefaultScope;
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.internal.remote.core.RemoteCorePlugin;
+import org.eclipse.remote.internal.core.RemoteCorePlugin;
 import org.osgi.service.prefs.BackingStoreException;
 
 /**
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java
similarity index 98%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java
index 503e1c34e39..eed090ca796 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnection.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -19,7 +19,6 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.internal.remote.core.messages.Messages;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionChangeEvent;
 import org.eclipse.remote.core.IRemoteConnectionChangeListener;
@@ -32,6 +31,7 @@ import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.IUserAuthenticator;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
 import org.eclipse.remote.core.exception.UnableToForwardPortException;
+import org.eclipse.remote.internal.core.messages.Messages;
 
 public class LocalConnection implements IRemoteConnection {
 	private final String fName = IRemoteConnectionManager.LOCAL_CONNECTION_NAME;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnectionManager.java
similarity index 95%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnectionManager.java
index f0f889896ef..76461dd528d 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnectionManager.java
@@ -8,19 +8,19 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.filesystem.EFS;
-import org.eclipse.internal.remote.core.messages.Messages;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionManager;
 import org.eclipse.remote.core.IRemoteConnectionWorkingCopy;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.core.messages.Messages;
 
 public class LocalConnectionManager implements IRemoteConnectionManager {
 	private final IRemoteConnection fLocalConnection;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnectionWorkingCopy.java
similarity index 97%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnectionWorkingCopy.java
index 64063b92c8b..a9c0073104d 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalConnectionWorkingCopy.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionWorkingCopy;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalFileManager.java
similarity index 97%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalFileManager.java
index 705e59e8f77..c619b7084bf 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalFileManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import java.net.URI;
 
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcess.java
similarity index 98%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcess.java
index 37df6bb9d0f..4440420d3cc 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcess.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java
similarity index 97%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java
index 4d7f9d13cba..f26b3a57beb 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,10 +28,10 @@ import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.internal.remote.core.RemoteCorePlugin;
 import org.eclipse.remote.core.AbstractRemoteProcessBuilder;
 import org.eclipse.remote.core.IProcessFactory;
 import org.eclipse.remote.core.IRemoteProcess;
+import org.eclipse.remote.internal.core.RemoteCorePlugin;
 
 public class LocalProcessBuilder extends AbstractRemoteProcessBuilder {
 	private static final String EXTENSION_POINT_ID = "processFactory"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalResource.java
similarity index 96%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalResource.java
index c19647589d7..a66f9a3fecb 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalResource.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import java.net.URI;
 
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalServices.java
similarity index 96%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalServices.java
index 8a1ddb4b4bb..06024a5a78c 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalServices.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.remote.core.AbstractRemoteServices;
diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalServicesFactory.java
similarity index 95%
rename from bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalServicesFactory.java
index 828f59d548d..ae24bd94140 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalServicesFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.core.services.local;
+package org.eclipse.remote.internal.core.services.local;
 
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.IRemoteServicesDescriptor;
diff --git a/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
index 7113028a02a..371d01c8ccc 100644
--- a/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.remote.jsch.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.internal.remote.jsch.core.Activator
+Bundle-Activator: org.eclipse.remote.internal.jsch.core.Activator
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.jcraft.jsch,
  org.eclipse.equinox.security
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.internal.remote.jsch.core;x-friends:="org.eclipse.remote.jsch.ui",
- org.eclipse.internal.remote.jsch.core.messages;x-internal:=true
+Export-Package: org.eclipse.remote.internal.jsch.core;x-friends:="org.eclipse.remote.jsch.ui",
+ org.eclipse.remote.internal.jsch.core.messages;x-internal:=true
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.remote.jsch.core/plugin.xml b/bundles/org.eclipse.remote.jsch.core/plugin.xml
index f898778794d..e6bc8c9474b 100644
--- a/bundles/org.eclipse.remote.jsch.core/plugin.xml
+++ b/bundles/org.eclipse.remote.jsch.core/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.remote.core.remoteServices">
       <remoteServices
-            class="org.eclipse.internal.remote.jsch.core.JSchServicesFactory"
+            class="org.eclipse.remote.internal.jsch.core.JSchServicesFactory"
             id="org.eclipse.remote.JSch"
             name="Built-in SSH"
             scheme="ssh">
@@ -16,7 +16,7 @@
       <filesystem
             scheme="ssh">
          <run
-               class="org.eclipse.internal.remote.jsch.core.JSchFileSystem">
+               class="org.eclipse.remote.internal.jsch.core.JSchFileSystem">
          </run>
       </filesystem>
    </extension>
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/Activator.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/Activator.java
index ed84c5d75ea..ac13f76d706 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
similarity index 99%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
index 01eef1de679..58cb7a1f7af 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.io.IOException;
 import java.net.PasswordAuthentication;
@@ -22,8 +22,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.commands.ExecCommand;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.jsch.core.IJSchService;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionChangeEvent;
@@ -37,6 +35,8 @@ import org.eclipse.remote.core.IUserAuthenticator;
 import org.eclipse.remote.core.exception.AddressInUseException;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
 import org.eclipse.remote.core.exception.UnableToForwardPortException;
+import org.eclipse.remote.internal.jsch.core.commands.ExecCommand;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.ChannelSftp;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionAttributes.java
similarity index 99%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionAttributes.java
index d7eb03c4ae1..cc93a7b6273 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionAttributes.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionManager.java
similarity index 97%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionManager.java
index 49b5d246fc6..2371454b3d4 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -19,13 +19,13 @@ import java.util.Map;
 
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionManager;
 import org.eclipse.remote.core.IRemoteConnectionWorkingCopy;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 import org.osgi.service.prefs.BackingStoreException;
 import org.osgi.service.prefs.Preferences;
 
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionWorkingCopy.java
similarity index 95%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionWorkingCopy.java
index bcf1d98cd5a..4e3d49f5a49 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionWorkingCopy.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.util.Collections;
 import java.util.Map;
@@ -79,7 +79,7 @@ public class JSchConnectionWorkingCopy extends JSchConnection implements IRemote
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.internal.remote.jsch.core.JSchConnection#getPassphrase()
+	 * @see org.eclipse.remote.internal.jsch.core.JSchConnection#getPassphrase()
 	 */
 	@Override
 	public String getPassphrase() {
@@ -89,7 +89,7 @@ public class JSchConnectionWorkingCopy extends JSchConnection implements IRemote
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.internal.remote.jsch.core.JSchConnection#getPassword()
+	 * @see org.eclipse.remote.internal.jsch.core.JSchConnection#getPassword()
 	 */
 	@Override
 	public String getPassword() {
@@ -109,7 +109,7 @@ public class JSchConnectionWorkingCopy extends JSchConnection implements IRemote
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.internal.remote.jsch.core.JSchConnection#getTimeout()
+	 * @see org.eclipse.remote.internal.jsch.core.JSchConnection#getTimeout()
 	 */
 	@Override
 	public int getTimeout() {
@@ -148,7 +148,7 @@ public class JSchConnectionWorkingCopy extends JSchConnection implements IRemote
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.internal.remote.jsch.core.JSchConnection#isPasswordAuth()
+	 * @see org.eclipse.remote.internal.jsch.core.JSchConnection#isPasswordAuth()
 	 */
 	@Override
 	public boolean isPasswordAuth() {
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchFileManager.java
similarity index 97%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchFileManager.java
index d537e3ca416..f633b13f951 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchFileManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.net.URI;
 
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchFileSystem.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchFileSystem.java
index f48626d1ffc..98a388fe608 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchFileSystem.java
@@ -21,7 +21,7 @@
  * Martin Oberhuber (Wind River) - [199587] return attributes of RemoteToolsFileSystem
  ********************************************************************************/
 
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcess.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcess.java
index e55b8dc6b2d..5c99c8c9132 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcess.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java
index 6299eeb1a22..4ae3cbef4f5 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.io.IOException;
 import java.text.CharacterIterator;
@@ -23,11 +23,11 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.AbstractRemoteProcessBuilder;
 import org.eclipse.remote.core.IRemoteFileManager;
 import org.eclipse.remote.core.IRemoteProcess;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.JSchException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchServices.java
similarity index 97%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchServices.java
index e98ea486878..6117a9ed902 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchServices.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.remote.core.AbstractRemoteServices;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchServicesFactory.java
similarity index 95%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchServicesFactory.java
index de62a04093f..52320843b0d 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchServicesFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.IRemoteServicesDescriptor;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java
similarity index 94%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java
index 3c8479e192f..e779ca2b72d 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java
@@ -9,7 +9,7 @@
  *   IBM Corporation - Initial API and implementation
  *   Roland Schulz, University of Tennessee
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.core;
+package org.eclipse.remote.internal.jsch.core;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -28,20 +28,20 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.commands.ChildInfosCommand;
-import org.eclipse.internal.remote.jsch.core.commands.DeleteCommand;
-import org.eclipse.internal.remote.jsch.core.commands.FetchInfoCommand;
-import org.eclipse.internal.remote.jsch.core.commands.GetInputStreamCommand;
-import org.eclipse.internal.remote.jsch.core.commands.GetOutputStreamCommand;
-import org.eclipse.internal.remote.jsch.core.commands.MkdirCommand;
-import org.eclipse.internal.remote.jsch.core.commands.PutInfoCommand;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionManager;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.RemoteServices;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.commands.ChildInfosCommand;
+import org.eclipse.remote.internal.jsch.core.commands.DeleteCommand;
+import org.eclipse.remote.internal.jsch.core.commands.FetchInfoCommand;
+import org.eclipse.remote.internal.jsch.core.commands.GetInputStreamCommand;
+import org.eclipse.remote.internal.jsch.core.commands.GetOutputStreamCommand;
+import org.eclipse.remote.internal.jsch.core.commands.MkdirCommand;
+import org.eclipse.remote.internal.jsch.core.commands.PutInfoCommand;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 public class JschFileStore extends FileStore {
 	private static Map<String, JschFileStore> instanceMap = new HashMap<String, JschFileStore>();
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java
index 0d024fa401e..1233774ad32 100755
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - Initial Implementation
  *
  *****************************************************************************/
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
@@ -27,9 +27,9 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.ChannelSftp;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java
similarity index 92%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java
index b2809fdfb68..6e42d7c2d75 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -9,9 +9,9 @@ import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 import com.jcraft.jsch.JSchException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/DeleteCommand.java
similarity index 93%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/DeleteCommand.java
index d9f05787c3d..b788d921bd8 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/DeleteCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
@@ -6,8 +6,8 @@ import java.text.StringCharacterIterator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
 
 public class DeleteCommand extends AbstractRemoteCommand<Void> {
 
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java
similarity index 88%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java
index 440e057c187..4f14aaa2f53 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java
@@ -1,12 +1,12 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import java.io.ByteArrayOutputStream;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.JSchException;
 
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java
similarity index 89%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java
index 48c20236aab..2110075ce6b 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java
@@ -1,13 +1,13 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.filesystem.provider.FileInfo;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSchException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java
similarity index 88%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java
index 6f4da0ae1eb..99b00e60076 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -8,9 +8,9 @@ import java.io.InputStream;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java
similarity index 94%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java
index ef31321d91e..2d8f56fc706 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -11,8 +11,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
 
 import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSchException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java
similarity index 89%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java
index 3ac4fb7c5e4..02b8fbebd35 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java
@@ -1,12 +1,12 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java
similarity index 95%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java
index 3ce7fbfa7b7..8b7d6365d8d 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java
@@ -1,13 +1,13 @@
-package org.eclipse.internal.remote.jsch.core.commands;
+package org.eclipse.remote.internal.jsch.core.commands;
 
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.messages.Messages;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.messages.Messages;
 
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
similarity index 94%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
index 8bcaa516f8a..46971bfbc4d 100755
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
@@ -9,12 +9,12 @@
  *     IBM Corporation - Initial Implementation
  *
  */
-package org.eclipse.internal.remote.jsch.core.messages;
+package org.eclipse.remote.internal.jsch.core.messages;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_ID = "org.eclipse.internal.remote.jsch.core.messages.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_ID = "org.eclipse.remote.internal.jsch.core.messages.messages"; //$NON-NLS-1$
 
 	public static String AbstractRemoteCommand_Execution_exception;
 	public static String AbstractRemoteCommand_Get_symlink_target;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/messages.properties b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties
similarity index 100%
rename from bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/messages.properties
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties
diff --git a/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
index 20ee771b8e8..92b18f4d993 100644
--- a/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.remote.jsch.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.internal.remote.jsch.ui.Activator
+Bundle-Activator: org.eclipse.remote.internal.jsch.ui.Activator
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.jface
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.internal.remote.jsch.ui;x-internal:=true,
- org.eclipse.internal.remote.jsch.ui.messages;x-internal:=true
+Export-Package: org.eclipse.remote.internal.jsch.ui;x-internal:=true,
+ org.eclipse.remote.internal.jsch.ui.messages;x-internal:=true
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.remote.jsch.ui/plugin.xml b/bundles/org.eclipse.remote.jsch.ui/plugin.xml
index 9ed74901ac7..79ce742cbf9 100644
--- a/bundles/org.eclipse.remote.jsch.ui/plugin.xml
+++ b/bundles/org.eclipse.remote.jsch.ui/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.remote.ui.remoteUIServices">
       <remoteUIServices
-            class="org.eclipse.internal.remote.jsch.ui.JSchUIServicesFactory"
+            class="org.eclipse.remote.internal.jsch.ui.JSchUIServicesFactory"
             id="org.eclipse.remote.JSch"
             name="JSch">
       </remoteUIServices>
@@ -12,7 +12,7 @@
    <extension
          point="org.eclipse.ui.ide.filesystemSupport">
       <filesystemContributor
-            class="org.eclipse.internal.remote.jsch.ui.JSchFileSystemContributor"
+            class="org.eclipse.remote.internal.jsch.ui.JSchFileSystemContributor"
             label="JSch"
             scheme="ssh">
       </filesystemContributor>
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/Activator.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/Activator.java
index 8f070085e27..be51be3f318 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.remote.jsch.ui;
+package org.eclipse.remote.internal.jsch.ui;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchFileSystemContributor.java
similarity index 93%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchFileSystemContributor.java
index 54944014409..85d5d25260d 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchFileSystemContributor.java
@@ -21,17 +21,17 @@
  * David Dykstal (IBM) - [235840] externalizing dialog title
  ********************************************************************************/
 
-package org.eclipse.internal.remote.jsch.ui;
+package org.eclipse.remote.internal.jsch.ui;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.eclipse.internal.remote.jsch.core.JSchFileSystem;
-import org.eclipse.internal.remote.jsch.core.JSchServices;
-import org.eclipse.internal.remote.jsch.ui.messages.Messages;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.RemoteServices;
+import org.eclipse.remote.internal.jsch.core.JSchFileSystem;
+import org.eclipse.remote.internal.jsch.core.JSchServices;
+import org.eclipse.remote.internal.jsch.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIFileManager;
 import org.eclipse.remote.ui.IRemoteUIServices;
 import org.eclipse.remote.ui.RemoteUIServices;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIConnectionManager.java
similarity index 95%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIConnectionManager.java
index 8c797e2bc45..94d1c4e1eda 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIConnectionManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.ui;
+package org.eclipse.remote.internal.jsch.ui;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.PasswordAuthentication;
@@ -16,9 +16,6 @@ import java.net.PasswordAuthentication;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.internal.remote.jsch.core.JSchConnectionManager;
-import org.eclipse.internal.remote.jsch.ui.messages.Messages;
-import org.eclipse.internal.remote.jsch.ui.wizards.JSchConnectionWizard;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -30,6 +27,9 @@ import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.IUserAuthenticator;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.JSchConnectionManager;
+import org.eclipse.remote.internal.jsch.ui.messages.Messages;
+import org.eclipse.remote.internal.jsch.ui.wizards.JSchConnectionWizard;
 import org.eclipse.remote.ui.AbstractRemoteUIConnectionManager;
 import org.eclipse.remote.ui.IRemoteUIConnectionWizard;
 import org.eclipse.swt.widgets.Display;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIFileManager.java
similarity index 98%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIFileManager.java
index 7ab2fbf2b1e..e537dbd798e 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIFileManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.ui;
+package org.eclipse.remote.internal.jsch.ui;
 
 import org.eclipse.jface.window.Window;
 import org.eclipse.remote.core.IRemoteConnection;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIServices.java
similarity index 97%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIServices.java
index 0ac7097942a..f189c8a92a2 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIServices.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.ui;
+package org.eclipse.remote.internal.jsch.ui;
 
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIServicesFactory.java
similarity index 95%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIServicesFactory.java
index 7ec75dc82a7..bacc32f74d5 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIServicesFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.jsch.ui;
+package org.eclipse.remote.internal.jsch.ui;
 
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.ui.IRemoteUIServices;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java
similarity index 93%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java
index 2f4526ca276..948ccc75b85 100755
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java
@@ -9,12 +9,12 @@
  *     IBM Corporation - Initial Implementation
  *
  */
-package org.eclipse.internal.remote.jsch.ui.messages;
+package org.eclipse.remote.internal.jsch.ui.messages;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_ID = "org.eclipse.internal.remote.jsch.ui.messages.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_ID = "org.eclipse.remote.internal.jsch.ui.messages.messages"; //$NON-NLS-1$
 
 	static {
 		// load message values from bundle file
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/messages.properties b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/messages.properties
similarity index 100%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/messages.properties
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/messages.properties
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
similarity index 97%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
index aabc39912ca..f0b0b07184b 100755
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
@@ -9,22 +9,22 @@
  *     IBM Corporation - Initial Implementation
  *
  */
-package org.eclipse.internal.remote.jsch.ui.wizards;
+package org.eclipse.remote.internal.jsch.ui.wizards;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.internal.remote.jsch.core.Activator;
-import org.eclipse.internal.remote.jsch.core.JSchConnection;
-import org.eclipse.internal.remote.jsch.core.JSchConnectionAttributes;
-import org.eclipse.internal.remote.jsch.core.JSchConnectionWorkingCopy;
-import org.eclipse.internal.remote.jsch.ui.messages.Messages;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.remote.core.IRemoteConnectionManager;
 import org.eclipse.remote.core.RemoteServices;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.jsch.core.Activator;
+import org.eclipse.remote.internal.jsch.core.JSchConnection;
+import org.eclipse.remote.internal.jsch.core.JSchConnectionAttributes;
+import org.eclipse.remote.internal.jsch.core.JSchConnectionWorkingCopy;
+import org.eclipse.remote.internal.jsch.ui.messages.Messages;
 import org.eclipse.remote.ui.widgets.RemoteFileWidget;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java
similarity index 95%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java
index ee95dbc1309..b768e9213dc 100755
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java
+++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java
@@ -9,15 +9,15 @@
  *     IBM Corporation - Initial Implementation
  *
  */
-package org.eclipse.internal.remote.jsch.ui.wizards;
+package org.eclipse.remote.internal.jsch.ui.wizards;
 
 import java.util.Set;
 
-import org.eclipse.internal.remote.jsch.core.JSchConnectionWorkingCopy;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.remote.core.IRemoteConnectionManager;
 import org.eclipse.remote.core.IRemoteConnectionWorkingCopy;
+import org.eclipse.remote.internal.jsch.core.JSchConnectionWorkingCopy;
 import org.eclipse.remote.ui.IRemoteUIConnectionWizard;
 import org.eclipse.swt.widgets.Shell;
 
diff --git a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
index 52c193acd1e..8d924be8277 100644
--- a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.internal.remote.ui.RemoteUIPlugin
+Bundle-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
@@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.internal.remote.ui;x-internal:=true,
- org.eclipse.internal.remote.ui.messages;x-internal:=true,
- org.eclipse.internal.remote.ui.preferences;x-internal:=true,
- org.eclipse.internal.remote.ui.services.local;x-internal:=true,
+Export-Package: org.eclipse.remote.internal.ui;x-internal:=true,
+ org.eclipse.remote.internal.ui.messages;x-internal:=true,
+ org.eclipse.remote.internal.ui.preferences;x-internal:=true,
+ org.eclipse.remote.internal.ui.services.local;x-internal:=true,
  org.eclipse.remote.ui,
  org.eclipse.remote.ui.dialogs,
  org.eclipse.remote.ui.widgets
diff --git a/bundles/org.eclipse.remote.ui/plugin.xml b/bundles/org.eclipse.remote.ui/plugin.xml
index f3c965aa9e5..cff76c03644 100644
--- a/bundles/org.eclipse.remote.ui/plugin.xml
+++ b/bundles/org.eclipse.remote.ui/plugin.xml
@@ -5,7 +5,7 @@
    <extension
          point="org.eclipse.remote.ui.remoteUIServices">
       <remoteUIServices
-            class="org.eclipse.internal.remote.ui.services.local.LocalUIServicesFactory"
+            class="org.eclipse.remote.internal.ui.services.local.LocalUIServicesFactory"
             id="org.eclipse.remote.LocalServices"
             name="Local">
       </remoteUIServices>
@@ -13,7 +13,7 @@
    <extension
            point="org.eclipse.ui.preferencePages">
         <page
-              class="org.eclipse.internal.remote.ui.preferences.RemoteDevelopmentPreferencePage"
+              class="org.eclipse.remote.internal.ui.preferences.RemoteDevelopmentPreferencePage"
               id="org.eclipse.remote.ui.RemoteDevelopmentPreferencePage"
               name="%RemoteDevPrefPage.name">
         </page>
@@ -22,7 +22,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.remote.ui.RemoteDevelopmentPreferencePage"
-            class="org.eclipse.internal.remote.ui.preferences.ConnectionsPreferencePage"
+            class="org.eclipse.remote.internal.ui.preferences.ConnectionsPreferencePage"
             id="org.eclipse.remote.connections"
             name="%ConnectionsPreferencePage.name">
       </page>
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java
similarity index 99%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java
index 276e4bf61dc..ce129e63e8e 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/OverlayImageDescriptor.java
similarity index 98%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/OverlayImageDescriptor.java
index 8208ed872a6..2c6560d1a5d 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/OverlayImageDescriptor.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 import org.eclipse.jface.resource.CompositeImageDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteContentProvider.java
similarity index 98%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteContentProvider.java
index e63bea0c3c8..a97b8dd5481 100755
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteResourceComparator.java
similarity index 97%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteResourceComparator.java
index 869ea1d4020..70849fdac45 100755
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteResourceComparator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 
 import org.eclipse.core.filesystem.IFileInfo;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIImages.java
similarity index 99%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIImages.java
index ca60f9efefe..2c1385e902f 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIImages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 import java.net.URL;
 
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIPlugin.java
similarity index 95%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIPlugin.java
index 077b520cba6..3df651febba 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIPlugin.java
@@ -1,8 +1,8 @@
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.internal.remote.ui.messages.Messages;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIServicesDescriptor.java
similarity index 97%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIServicesDescriptor.java
index 8a6a70f9d85..1117dac743a 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteUIServicesDescriptor.java
@@ -8,12 +8,12 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui;
+package org.eclipse.remote.internal.ui;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.remote.core.IRemoteServices;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIServices;
 import org.eclipse.remote.ui.IRemoteUIServicesDescriptor;
 import org.eclipse.remote.ui.IRemoteUIServicesFactory;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/Messages.java
similarity index 95%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/Messages.java
index 7c8af58ce68..13577fb9588 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/Messages.java
@@ -9,12 +9,12 @@
  *    IBM - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.internal.remote.ui.messages;
+package org.eclipse.remote.internal.ui.messages;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.internal.remote.ui.messages.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.remote.internal.ui.messages.messages"; //$NON-NLS-1$
 
 	public static String AbstractRemoteUIConnectionManager_Connection_Error;
 
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/messages.properties b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/messages.properties
similarity index 100%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/messages.properties
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages/messages.properties
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java
similarity index 98%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java
index 74f5200435b..e9a6f3c4e2d 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java
@@ -8,17 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui.preferences;
+package org.eclipse.remote.internal.ui.preferences;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.internal.remote.core.RemoteServicesDescriptor;
-import org.eclipse.internal.remote.core.RemoteServicesImpl;
-import org.eclipse.internal.remote.core.preferences.Preferences;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.PreferencePage;
@@ -38,6 +34,10 @@ import org.eclipse.remote.core.IRemotePreferenceConstants;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.RemoteServices;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.core.RemoteServicesDescriptor;
+import org.eclipse.remote.internal.core.RemoteServicesImpl;
+import org.eclipse.remote.internal.core.preferences.Preferences;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
 import org.eclipse.remote.ui.IRemoteUIConnectionWizard;
 import org.eclipse.remote.ui.RemoteUIServices;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java
similarity index 98%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java
index 3777515b5c3..15f448d8503 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java
@@ -9,15 +9,15 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.internal.remote.ui.preferences;
+package org.eclipse.remote.internal.ui.preferences;
 
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.internal.remote.core.preferences.Preferences;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.remote.internal.core.preferences.Preferences;
 
 /**
  * Adapts {@link org.eclipse.core.runtime.IEclipsePreferences} to {@link org.eclipse.jface.preference.IPreferenceStore}
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java
similarity index 86%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java
index 0e837874e9a..6877fba0c74 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java
@@ -9,17 +9,17 @@
  * IBM - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.internal.remote.ui.preferences;
+package org.eclipse.remote.internal.ui.preferences;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.internal.remote.core.RemoteServicesDescriptor;
-import org.eclipse.internal.remote.core.RemoteServicesImpl;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.remote.core.IRemotePreferenceConstants;
+import org.eclipse.remote.internal.core.RemoteServicesDescriptor;
+import org.eclipse.remote.internal.core.RemoteServicesImpl;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIFileManager.java
similarity index 98%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIFileManager.java
index c3827d5376c..b991e5761e1 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIFileManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui.services.local;
+package org.eclipse.remote.internal.ui.services.local;
 
 import java.io.File;
 
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIServices.java
similarity index 97%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIServices.java
index c41db4f79e5..6977175a162 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIServices.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui.services.local;
+package org.eclipse.remote.internal.ui.services.local;
 
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIServicesFactory.java
similarity index 94%
rename from bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIServicesFactory.java
index c209ea508ff..55ed14c8d07 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/services/local/LocalUIServicesFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  * IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.internal.remote.ui.services.local;
+package org.eclipse.remote.internal.ui.services.local;
 
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.ui.IRemoteUIServices;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java
index 463b0a55ee1..bf62dfcd6ca 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java
@@ -15,14 +15,14 @@ import java.lang.reflect.InvocationTargetException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.internal.remote.ui.RemoteUIPlugin;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.exception.RemoteConnectionException;
+import org.eclipse.remote.internal.ui.RemoteUIPlugin;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.swt.widgets.Shell;
 
 /**
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java
index db58b008441..3b4de2a0599 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java
@@ -20,13 +20,13 @@ import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.internal.remote.ui.RemoteUIPlugin;
-import org.eclipse.internal.remote.ui.RemoteUIServicesDescriptor;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.RemoteServices;
+import org.eclipse.remote.internal.ui.RemoteUIPlugin;
+import org.eclipse.remote.internal.ui.RemoteUIServicesDescriptor;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.ui.PlatformUI;
 
 /**
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
index a8ad8c86ef2..f65710b7d97 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
@@ -15,11 +15,6 @@ import java.util.Vector;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.internal.remote.ui.DeferredFileStore;
-import org.eclipse.internal.remote.ui.RemoteContentProvider;
-import org.eclipse.internal.remote.ui.RemoteResourceComparator;
-import org.eclipse.internal.remote.ui.RemoteUIImages;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -34,6 +29,11 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteFileManager;
 import org.eclipse.remote.core.IRemoteServices;
+import org.eclipse.remote.internal.ui.DeferredFileStore;
+import org.eclipse.remote.internal.ui.RemoteContentProvider;
+import org.eclipse.remote.internal.ui.RemoteResourceComparator;
+import org.eclipse.remote.internal.ui.RemoteUIImages;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
 import org.eclipse.remote.ui.RemoteUIServices;
 import org.eclipse.remote.ui.widgets.RemoteConnectionWidget;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
index a50c772ded9..b7ddb410938 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
@@ -15,10 +15,6 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.internal.remote.core.RemoteServicesDescriptor;
-import org.eclipse.internal.remote.core.RemoteServicesImpl;
-import org.eclipse.internal.remote.core.preferences.Preferences;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionManager;
@@ -26,6 +22,10 @@ import org.eclipse.remote.core.IRemoteConnectionWorkingCopy;
 import org.eclipse.remote.core.IRemotePreferenceConstants;
 import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.RemoteServices;
+import org.eclipse.remote.internal.core.RemoteServicesDescriptor;
+import org.eclipse.remote.internal.core.RemoteServicesImpl;
+import org.eclipse.remote.internal.core.preferences.Preferences;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
 import org.eclipse.remote.ui.IRemoteUIConnectionWizard;
 import org.eclipse.remote.ui.RemoteUIServices;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
index bafa54597b2..71b045ca356 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
@@ -14,8 +14,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.remote.core.IRemoteConnection;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
 import org.eclipse.remote.ui.IRemoteUIFileManager;
 import org.eclipse.remote.ui.RemoteUIServices;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
index 3d2ee2b3d94..c04df8d2807 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
@@ -14,8 +14,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.internal.remote.ui.messages.Messages;
 import org.eclipse.remote.core.IRemoteConnection;
+import org.eclipse.remote.internal.ui.messages.Messages;
 import org.eclipse.remote.ui.IRemoteUIConnectionManager;
 import org.eclipse.remote.ui.IRemoteUIFileManager;
 import org.eclipse.remote.ui.RemoteUIServices;