diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
index 02f8d49eb24..b2e2a035d59 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
@@ -33,7 +33,8 @@ Export-Package: org.eclipse.rse.files.ui,
  org.eclipse.rse.internal.files.ui.resources;x-internal:=true,
  org.eclipse.rse.internal.files.ui.search;x-internal:=true,
  org.eclipse.rse.internal.files.ui.view;x-internal:=true,
- org.eclipse.rse.internal.files.ui.wizards;x-internal:=true
+ org.eclipse.rse.internal.files.ui.wizards;x-internal:=true,
+ org.eclipse.rse.internal.files.ui.dialogs;x-internal:=true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: com.ibm.icu.text
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java
index 7614f6ceb7f..492c030b370 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SaveAsDialog.java
@@ -13,6 +13,8 @@
  * 
  * Contributors:
  * {Name} (company) - description of contribution.
+ * Xuan Chen        (IBM)        - [220999] [api] Need to change class SystemSelectRemoteFileAction to use SystemRemoteFileDialog
+ *                                          Move SystemSelectRemoteFileOrFolderDialog to internal package first.
  *******************************************************************************/
 
 package org.eclipse.rse.files.ui.dialogs;
@@ -20,6 +22,7 @@ package org.eclipse.rse.files.ui.dialogs;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.rse.files.ui.widgets.SaveAsForm;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
+import org.eclipse.rse.internal.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog;
 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/dialogs/SystemSelectRemoteFileOrFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java
rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java
index 99f0bc250fc..0f65c5ca010 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java
@@ -14,9 +14,11 @@
  * Kevin Doyle (IBM) - Added a double click listener that closes the dialog if appropriate
  * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
  * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
+ * Xuan Chen        (IBM)        - [220999] [api] Need to change class SystemSelectRemoteFileAction to use SystemRemoteFileDialog
+ *                                          Move SystemSelectRemoteFileOrFolderDialog to internal package first.
  ********************************************************************************/
 
-package org.eclipse.rse.files.ui.dialogs;
+package org.eclipse.rse.internal.files.ui.dialogs;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;