diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java
index d2f646aa588..b830853496c 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/FileSelectionDialog.java
@@ -15,8 +15,8 @@
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.dialogs;
+import org.eclipse.rse.files.ui.widgets.FileSelectionForm;
 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/internal/files/ui/widgets/FileSelectionForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/FileSelectionForm.java
similarity index 94%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/FileSelectionForm.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/FileSelectionForm.java
index 513f5e7551e..4114a8ce7c9 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/FileSelectionForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/FileSelectionForm.java
@@ -14,8 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.internal.files.ui.widgets;
-import org.eclipse.rse.files.ui.widgets.SaveAsForm;
+package org.eclipse.rse.files.ui.widgets;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 
 /**
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/SystemFileFilterStringEditPane.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/SystemFileFilterStringEditPane.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java
index 3a8ec8c126d..e5d58b8365b 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/SystemFileFilterStringEditPane.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.internal.files.ui.widgets;
+package org.eclipse.rse.files.ui.widgets;
 
 import java.util.Vector;
 
@@ -25,8 +25,6 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.files.ui.widgets.SystemFileWidgetHelpers;
-import org.eclipse.rse.files.ui.widgets.SystemRemoteFolderCombo;
 import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.SystemFileResources;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/SystemFileTreeAndListGroup.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileTreeAndListGroup.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/SystemFileTreeAndListGroup.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileTreeAndListGroup.java
index ead33ab71af..cbf915f4766 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/widgets/SystemFileTreeAndListGroup.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileTreeAndListGroup.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.internal.files.ui.widgets;
+package org.eclipse.rse.files.ui.widgets;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java
index 427a3ab9e78..766318aa18f 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction;
-import org.eclipse.rse.internal.files.ui.widgets.SystemFileTreeAndListGroup;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.internal.ui.view.SystemViewLabelAndContentProvider;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java
index e736a7e78c3..ae7011e2987 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemFileUpdateFilterAction.java
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.actions;
-import org.eclipse.rse.internal.files.ui.widgets.SystemFileFilterStringEditPane;
+import org.eclipse.rse.files.ui.widgets.SystemFileFilterStringEditPane;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction;
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java
index 8fa52f093a2..c6fad3c3853 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemNewFileFilterAction.java
@@ -16,7 +16,7 @@
 
 package org.eclipse.rse.internal.files.ui.actions;
 import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.internal.files.ui.widgets.SystemFileFilterStringEditPane;
+import org.eclipse.rse.files.ui.widgets.SystemFileFilterStringEditPane;
 import org.eclipse.rse.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
 import org.eclipse.rse.ui.ISystemIconConstants;