diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
index b3e419e10ee..7bf6917ce70 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
@@ -18,7 +18,6 @@ package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.internal.extra.IElement;
 
 public interface IDataElement extends IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IElement.java
index b3c241da74f..9edc168536b 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.internal.extra;
+package org.eclipse.dstore.extra;
  
 public interface IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
index 836fbaeeb4f..b7e22a0dc26 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
@@ -18,7 +18,6 @@ package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.internal.extra.IElement;
 
 public interface IDataElement extends IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IElement.java
index 06c458e664c..928abdb08a5 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.internal.extra;
+package org.eclipse.dstore.extra;
 
 import org.eclipse.core.runtime.IAdaptable;
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtility.java
index c04a1939c37..979f098beda 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtility.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtility.java
@@ -17,6 +17,7 @@
 
 package org.eclipse.rse.internal.subsystems.files.core;
 
+import org.eclipse.rse.subsystems.files.core.ILanguageUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 
 /**
@@ -57,14 +58,14 @@ public abstract class AbstractLanguageUtility implements ILanguageUtility {
 	}
 
 	/**
-	 * @see org.eclipse.rse.internal.subsystems.files.core.ILanguageUtility#getSubSystem()
+	 * @see org.eclipse.rse.subsystems.files.core.ILanguageUtility#getSubSystem()
 	 */
 	public IRemoteFileSubSystem getSubSystem() {
 		return subsystem;
 	}
 
 	/**
-	 * @see org.eclipse.rse.internal.subsystems.files.core.ILanguageUtility#getLanguage()
+	 * @see org.eclipse.rse.subsystems.files.core.ILanguageUtility#getLanguage()
 	 */
 	public String getLanguage() {
 		return language;
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtilityFactory.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtilityFactory.java
index 7f7f3ec60fd..c6780354f49 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtilityFactory.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/AbstractLanguageUtilityFactory.java
@@ -17,6 +17,7 @@
 
 package org.eclipse.rse.internal.subsystems.files.core;
 
+import org.eclipse.rse.subsystems.files.core.ILanguageUtility;
 import org.eclipse.rse.subsystems.files.core.ILanguageUtilityFactory;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/IJavaLanguageUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/IJavaLanguageUtility.java
index ce75bd02cf7..24fc69b19ed 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/IJavaLanguageUtility.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/IJavaLanguageUtility.java
@@ -16,6 +16,7 @@
 
 package org.eclipse.rse.internal.subsystems.files.core;
 
+import org.eclipse.rse.subsystems.files.core.ILanguageUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 
 /**
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/ILanguageUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtility.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/ILanguageUtility.java
rename to rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtility.java
index d5a4e84b83f..da538dbadea 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/ILanguageUtility.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtility.java
@@ -15,7 +15,7 @@
  * {Name} (company) - description of contribution.
  *******************************************************************************/
 
-package org.eclipse.rse.internal.subsystems.files.core;
+package org.eclipse.rse.subsystems.files.core;
 
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtilityFactory.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtilityFactory.java
index 776b6b81485..686d87a426e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtilityFactory.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/ILanguageUtilityFactory.java
@@ -17,7 +17,6 @@
 
 package org.eclipse.rse.subsystems.files.core;
 
-import org.eclipse.rse.internal.subsystems.files.core.ILanguageUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 
 /**
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreLanguageUtilityFactory.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreLanguageUtilityFactory.java
index 88d54ea5d20..fa145af9495 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreLanguageUtilityFactory.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreLanguageUtilityFactory.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.rse.internal.subsystems.files.core.AbstractLanguageUtilityFactory;
-import org.eclipse.rse.internal.subsystems.files.core.ILanguageUtility;
+import org.eclipse.rse.subsystems.files.core.ILanguageUtility;
 import org.eclipse.rse.subsystems.files.core.ILanguageUtilityFactory;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java
index 2bcdf7b737d..5b5b7f3532e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/LocalLanguageUtilityFactory.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.rse.internal.subsystems.files.core.AbstractLanguageUtilityFactory;
-import org.eclipse.rse.internal.subsystems.files.core.ILanguageUtility;
+import org.eclipse.rse.subsystems.files.core.ILanguageUtility;
 import org.eclipse.rse.subsystems.files.core.ILanguageUtilityFactory;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;