diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
index 473c8adb8c1..7ca756a5a1b 100644
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
@@ -15,8 +15,10 @@ Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.core.model,
  org.eclipse.rse.core.references,
  org.eclipse.rse.core.subsystems,
+ org.eclipse.rse.filters,
  org.eclipse.rse.internal.core;x-internal:=true,
  org.eclipse.rse.internal.core.subsystems;x-internal:=true,
+ org.eclipse.rse.internal.filters;x-internal:=true,
  org.eclipse.rse.internal.persistence;x-internal:=true,
  org.eclipse.rse.internal.persistence.dom;x-internal:=true,
  org.eclipse.rse.internal.references;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterReference.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterReference.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterSimple.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterSimple.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterSimple.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/filters/SystemFilterSimple.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilter.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilter.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilter.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerCommonMethods.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterContainerReferenceCommonMethods.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPool.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPool.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPool.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolReferenceManager.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapper.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterPoolWrapperInformation.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStartHere.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStartHere.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStartHere.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterString.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterString.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterString.java
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStringReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStringReference.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStringReference.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/filters/SystemFilterStringReference.java
diff --git a/rse/plugins/org.eclipse.rse.ui/.classpath b/rse/plugins/org.eclipse.rse.ui/.classpath
index 12f660ce5a4..d25fe9e1d66 100644
--- a/rse/plugins/org.eclipse.rse.ui/.classpath
+++ b/rse/plugins/org.eclipse.rse.ui/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="filters"/>
 	<classpathentry kind="src" path="model"/>
 	<classpathentry kind="src" path="UI"/>
 	<classpathentry kind="src" path="subsystems"/>
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
index 531a90b5350..d973cdd3b85 100644
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
@@ -23,8 +23,6 @@ Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.core.servicesubsystem,
  org.eclipse.rse.core.subsystems,
  org.eclipse.rse.core.subsystems.util,
- org.eclipse.rse.filters,
- org.eclipse.rse.internal.filters;x-internal:=true,
  org.eclipse.rse.internal.model;x-internal:=true,
  org.eclipse.rse.internal.ui;x-internal:=true,
  org.eclipse.rse.internal.ui.actions;x-internal:=true,