From 12933e1b894da89b5c93401705222b1857a7eb54 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Wed, 28 Mar 2007 19:35:23 +0000
Subject: [PATCH] [178599] more refactorings

---
 rse/plugins/org.eclipse.rse.files.ui/plugin.xml            | 2 +-
 .../src/org/eclipse/rse/files/ui/Activator.java            | 2 +-
 .../rse/files/ui/actions/SystemAddToArchiveAction.java     | 2 +-
 .../eclipse/rse/files/ui/actions/SystemCombineAction.java  | 2 +-
 .../eclipse/rse/files/ui/actions/SystemConvertAction.java  | 2 +-
 .../rse/files/ui/actions/SystemCopyRemoteFileAction.java   | 2 +-
 .../rse/files/ui/actions/SystemExtractToAction.java        | 2 +-
 .../rse/files/ui/actions/SystemUploadConflictAction.java   | 4 ++--
 .../ui/{resources => dialogs}/AddToArchiveDialog.java      | 3 ++-
 .../rse/files/ui/{resources => dialogs}/CombineDialog.java | 4 ++--
 .../files/ui/{resources => dialogs}/ExtractToDialog.java   | 4 ++--
 .../ui/{resources => dialogs}/FileSelectionDialog.java     | 4 ++--
 .../rse/files/ui/{resources => dialogs}/ISaveAsDialog.java | 2 +-
 .../rse/files/ui/{resources => dialogs}/SaveAsDialog.java  | 4 ++--
 .../rse/files/ui/resources/SystemEditableRemoteFile.java   | 2 ++
 .../rse/files/ui/resources/SystemTempFileListener.java     | 1 +
 .../ui/resources/SystemUniversalTempFileListener.java      | 1 +
 .../files/ui/resources/UniversalFileTransferUtility.java   | 1 +
 .../rse/files/ui/{resources => widgets}/SaveAsForm.java    | 3 +--
 .../files/ui/propertypages/SystemCachePreferencePage.java  | 2 +-
 .../files/ui/resources/DefaultMountPathMapper.java         | 4 +++-
 .../files/ui/resources/SystemFileNameHelper.java           | 2 +-
 .../files/ui/resources/SystemRemoteEditManager.java        | 4 +++-
 .../files/ui/resources/SystemRemoteMarker.java             | 6 +++++-
 .../files/ui/resources/SystemRemoteMarkerInfo.java         | 4 +++-
 .../files/ui/resources/SystemRemoteMarkerManager.java      | 7 ++++++-
 .../files/ui/resources/SystemRemoteMarkerSet.java          | 4 +++-
 .../ui/resources/SystemRemoteMarkerTypeDefinition.java     | 2 +-
 .../resources/SystemRemoteMarkerTypeDefinitionCache.java   | 3 ++-
 .../files/ui/resources/SystemRemotePath.java               | 4 +++-
 .../files/ui/resources/SystemRemoteResource.java           | 5 ++++-
 .../files/ui/resources/SystemRemoteResourceInfo.java       | 2 +-
 .../files/ui/resources/SystemRemoteResourceManager.java    | 4 +++-
 .../ui/view/RemoteFileSubSystemConfigurationAdapter.java   | 2 +-
 .../files/ui/view/SystemViewRemoteFileAdapter.java         | 2 +-
 .../files/ui/widgets}/AddToArchiveForm.java                | 2 +-
 .../files/ui/widgets}/CombineForm.java                     | 2 +-
 .../files/ui/widgets}/ExtractToForm.java                   | 2 +-
 .../files/ui/widgets}/FileSelectionForm.java               | 3 ++-
 39 files changed, 72 insertions(+), 41 deletions(-)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => dialogs}/AddToArchiveDialog.java (96%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => dialogs}/CombineDialog.java (97%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => dialogs}/ExtractToDialog.java (94%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => dialogs}/FileSelectionDialog.java (94%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => dialogs}/ISaveAsDialog.java (96%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => dialogs}/SaveAsDialog.java (95%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/{resources => widgets}/SaveAsForm.java (98%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/DefaultMountPathMapper.java (91%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemFileNameHelper.java (97%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteEditManager.java (99%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteMarker.java (96%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteMarkerInfo.java (97%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteMarkerManager.java (96%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteMarkerSet.java (98%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteMarkerTypeDefinition.java (98%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java (96%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemotePath.java (95%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteResource.java (95%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteResourceInfo.java (97%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{ => internal}/files/ui/resources/SystemRemoteResourceManager.java (92%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{files/ui/resources => internal/files/ui/widgets}/AddToArchiveForm.java (99%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{files/ui/resources => internal/files/ui/widgets}/CombineForm.java (99%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{files/ui/resources => internal/files/ui/widgets}/ExtractToForm.java (99%)
 rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/{files/ui/resources => internal/files/ui/widgets}/FileSelectionForm.java (94%)

diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
index 6827eb370d7..072f52dfcea 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml
@@ -241,7 +241,7 @@ Contributors:
          point="org.eclipse.rse.ui.mountPathMappers">
       <mountPathMapper
             name="DefaultMountPathMapper"
-            class="org.eclipse.rse.files.ui.resources.DefaultMountPathMapper"
+            class="org.eclipse.rse.internal.files.ui.resources.DefaultMountPathMapper"
             id="org.eclipse.rse.core.resources.defaultmountpathmapper">
       </mountPathMapper>
    </extension>
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java
index 7316a031708..12276f014ba 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java
@@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.internal.files.ui.view.RemoteFileSubSystemConfigurationAdapterFactory;
 import org.eclipse.rse.internal.files.ui.view.SystemViewFileAdapterFactory;
 import org.eclipse.rse.internal.files.ui.view.SystemViewSearchResultAdapterFactory;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
index 763aa9f6501..3c6fd2c0fae 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.FileResources;
-import org.eclipse.rse.files.ui.resources.AddToArchiveDialog;
+import org.eclipse.rse.files.ui.dialogs.AddToArchiveDialog;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemRegistry;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCombineAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCombineAction.java
index 24c4fe66224..2c9338569b3 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCombineAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCombineAction.java
@@ -17,7 +17,7 @@
 package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.rse.files.ui.FileResources;
-import org.eclipse.rse.files.ui.resources.CombineDialog;
+import org.eclipse.rse.files.ui.dialogs.CombineDialog;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemRegistry;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemConvertAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemConvertAction.java
index 482077f6ea8..4c4513daf96 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemConvertAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemConvertAction.java
@@ -17,7 +17,7 @@
 package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.rse.files.ui.FileResources;
-import org.eclipse.rse.files.ui.resources.CombineDialog;
+import org.eclipse.rse.files.ui.dialogs.CombineDialog;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemRegistry;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
index 3979a203301..15bec1b79a1 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
@@ -32,7 +32,7 @@ import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.files.ui.dialogs.SystemRemoteFolderDialog;
-import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.internal.ui.view.SystemView;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
index 123baad95e1..6c8a3efa574 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.FileResources;
-import org.eclipse.rse.files.ui.resources.ExtractToDialog;
+import org.eclipse.rse.files.ui.dialogs.ExtractToDialog;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemRegistry;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
index aa8f27343a3..c67b7c46615 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
@@ -26,8 +26,8 @@ import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.subsystems.SubSystem;
 import org.eclipse.rse.core.subsystems.SubSystem.SystemMessageDialogRunnable;
 import org.eclipse.rse.files.ui.FileResources;
-import org.eclipse.rse.files.ui.resources.ISaveAsDialog;
-import org.eclipse.rse.files.ui.resources.SaveAsDialog;
+import org.eclipse.rse.files.ui.dialogs.ISaveAsDialog;
+import org.eclipse.rse.files.ui.dialogs.SaveAsDialog;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/AddToArchiveDialog.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/AddToArchiveDialog.java
index 68fcccbd921..4e70f62e54a 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/AddToArchiveDialog.java
@@ -14,8 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.files.ui.dialogs;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
+import org.eclipse.rse.internal.files.ui.widgets.AddToArchiveForm;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/CombineDialog.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/CombineDialog.java
index 88cf183d410..47f4e74d0e8 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/CombineDialog.java
@@ -14,9 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
-import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
+package org.eclipse.rse.files.ui.dialogs;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
+import org.eclipse.rse.internal.files.ui.widgets.CombineForm;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/ExtractToDialog.java
similarity index 94%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/ExtractToDialog.java
index fdcc9ad4725..b1ae299628d 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/ExtractToDialog.java
@@ -14,9 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
-import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
+package org.eclipse.rse.files.ui.dialogs;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
+import org.eclipse.rse.internal.files.ui.widgets.ExtractToForm;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java
similarity index 94%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java
index 5ff0d805014..d2f646aa588 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java
@@ -14,9 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
-import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
+package org.eclipse.rse.files.ui.dialogs;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
+import org.eclipse.rse.internal.files.ui.widgets.FileSelectionForm;
 import org.eclipse.swt.widgets.Shell;
 
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ISaveAsDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/ISaveAsDialog.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ISaveAsDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/ISaveAsDialog.java
index 6e2d36d880f..d7936fa947d 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ISaveAsDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/ISaveAsDialog.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.files.ui.dialogs;
 
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java
similarity index 95%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java
index d8738b1dd7a..b9d165293f5 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java
@@ -14,9 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.files.ui.dialogs;
 
-import org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
+import org.eclipse.rse.files.ui.widgets.SaveAsForm;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.swt.widgets.Shell;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
index e6b0797c530..3b1c6128419 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
@@ -43,6 +43,8 @@ import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.actions.SystemDownloadConflictAction;
+import org.eclipse.rse.internal.files.ui.resources.SystemFileNameHelper;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
index 306a0d277af..2add7db402a 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
@@ -37,6 +37,7 @@ import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemRegistry;
 import org.eclipse.rse.model.SystemResourceChangeEvent;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
index 45f200d1656..45e51134c3c 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.actions.SystemUploadConflictAction;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemRegistry;
 import org.eclipse.rse.model.SystemResourceChangeEvent;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
index d892f69a893..c62c1a4a45c 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
@@ -48,6 +48,7 @@ import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.Activator;
 import org.eclipse.rse.files.ui.FileResources;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
 import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java
index 9bb2248aac7..8dd65b702c6 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java
@@ -14,12 +14,11 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.files.ui.widgets;
 
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.rse.core.SystemAdapterHelpers;
 import org.eclipse.rse.files.ui.FileResources;
-import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.ISystemMessages;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java
index 620367147f9..94c58dbac48 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/SystemCachePreferencePage.java
@@ -37,7 +37,7 @@ import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
-import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.internal.ui.view.SystemTableViewProvider;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/DefaultMountPathMapper.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/DefaultMountPathMapper.java
similarity index 91%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/DefaultMountPathMapper.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/DefaultMountPathMapper.java
index c3ded4f2117..6559781d08f 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/DefaultMountPathMapper.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/DefaultMountPathMapper.java
@@ -14,7 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
+
+import org.eclipse.rse.files.ui.resources.ISystemMountPathMapper;
 
 public class DefaultMountPathMapper implements ISystemMountPathMapper
 {
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemFileNameHelper.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemFileNameHelper.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemFileNameHelper.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemFileNameHelper.java
index e0d69356468..cbc6bab5840 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemFileNameHelper.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemFileNameHelper.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.io.File;
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteEditManager.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteEditManager.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java
index c8543511692..a920d99b1b2 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteEditManager.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteEditManager.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -37,6 +37,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.subsystems.ISubSystem;
+import org.eclipse.rse.files.ui.resources.ISystemMountPathMapper;
+import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
 import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
 import org.eclipse.rse.ui.RSEUIPlugin;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarker.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarker.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarker.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarker.java
index d32e84f9b14..728f209aed9 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarker.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarker.java
@@ -14,10 +14,14 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.util.Map;
 
+import org.eclipse.rse.files.ui.resources.ISystemRemoteCoreConstants;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarker;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteResource;
+
 /**
  * This class is an internal implementation of the ISystemRemoteMarker interface.
  * It is not intended to be implemented by clients.
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerInfo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerInfo.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerInfo.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerInfo.java
index d06aba6a0e1..184a0406533 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerInfo.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerInfo.java
@@ -14,11 +14,13 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarkerSetElement;
+
 /**
  * Objects of this type contain marker information.
  */
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerManager.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerManager.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerManager.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerManager.java
index a1c4a3ad552..9bd82bc53ba 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerManager.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerManager.java
@@ -14,12 +14,17 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteCoreConstants;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteManager;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarker;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarkerSetElement;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteResource;
 
 /**
  * This singleton class manages all remote markers.
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerSet.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerSet.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerSet.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerSet.java
index 67e4176910b..c5c10426ead 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerSet.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerSet.java
@@ -14,7 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
+
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarkerSetElement;
 
 /**
  * This class represents a set of markers.
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinition.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerTypeDefinition.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinition.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerTypeDefinition.java
index 4c17ac53316..d5227ef3075 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinition.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerTypeDefinition.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java
index 38cc795a2c7..e7097ef4802 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteMarkerTypeDefinitionCache.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarker;
 import org.eclipse.rse.ui.RSEUIPlugin;
 
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemotePath.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemotePath.java
similarity index 95%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemotePath.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemotePath.java
index 98061ef3e32..39c3966cb3a 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemotePath.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemotePath.java
@@ -14,7 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
+
+import org.eclipse.rse.files.ui.resources.ISystemRemotePath;
 
 /**
  * A default implementation of a remote path.
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResource.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResource.java
similarity index 95%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResource.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResource.java
index 0772c41edb7..c8c03da630e 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResource.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResource.java
@@ -14,11 +14,14 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.io.File;
 
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteMarker;
+import org.eclipse.rse.files.ui.resources.ISystemRemotePath;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteResource;
 
 /**
  * This class is the internal implementation of the ISystemRemoteResource interface.
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceInfo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResourceInfo.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceInfo.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResourceInfo.java
index 72e8023fca6..983f9c4baba 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceInfo.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResourceInfo.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 /**
  * Class that keeps information about a remote resource. Clients should not
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceManager.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResourceManager.java
similarity index 92%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceManager.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResourceManager.java
index c63d2b4c6de..0a4567b5319 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceManager.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/resources/SystemRemoteResourceManager.java
@@ -14,11 +14,13 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.resources;
 
 import java.util.Hashtable;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.rse.files.ui.resources.ISystemRemoteManager;
+import org.eclipse.rse.files.ui.resources.ISystemRemotePath;
 
 /**
  * This class manages remote resources.
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java
index 44d7da3cfd5..04a467a01f5 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java
@@ -34,7 +34,7 @@ import org.eclipse.rse.files.ui.actions.SystemNewFileAction;
 import org.eclipse.rse.files.ui.actions.SystemNewFileFilterAction;
 import org.eclipse.rse.files.ui.actions.SystemNewFolderAction;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
-import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.internal.files.ui.wizards.SystemFileNewConnectionWizardPage;
 import org.eclipse.rse.model.ISystemRegistryUI;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
index 7dff4bc8a57..e1c32d91ed4 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -70,9 +70,9 @@ import org.eclipse.rse.files.ui.actions.SystemReplaceWithEditionAction;
 import org.eclipse.rse.files.ui.actions.SystemSearchAction;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
-import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
 import org.eclipse.rse.filters.SystemFilterReference;
+import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager;
 import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.internal.ui.view.SystemDNDTransferRunnable;
 import org.eclipse.rse.internal.ui.view.SystemViewResources;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/AddToArchiveForm.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveForm.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/AddToArchiveForm.java
index f5894d052f2..6fe88d34c9c 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/AddToArchiveForm.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.widgets;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java
index 98e42677e48..fa89c50a11f 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/CombineForm.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.widgets;
 import java.util.ArrayList;
 
 import org.eclipse.jface.viewers.ISelection;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java
index f16d8ba1a0f..90e75b04d0b 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/ExtractToForm.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.widgets;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.rse.core.SystemAdapterHelpers;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/FileSelectionForm.java
similarity index 94%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionForm.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/FileSelectionForm.java
index f7ba298d720..513f5e7551e 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/FileSelectionForm.java
@@ -14,7 +14,8 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.resources;
+package org.eclipse.rse.internal.files.ui.widgets;
+import org.eclipse.rse.files.ui.widgets.SaveAsForm;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 
 /**