diff --git a/bundles/org.eclipse.remote.terminal/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.terminal/META-INF/MANIFEST.MF
index 15d8661fbc5..8a584d9a4a2 100644
--- a/bundles/org.eclipse.remote.terminal/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.terminal/META-INF/MANIFEST.MF
@@ -16,4 +16,9 @@ Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.remote.internal.terminal.actions;x-internal:=true,
- org.eclipse.remote.internal.terminal.view;x-internal:=true
+ org.eclipse.remote.internal.terminal.connector;x-internal:=true,
+ org.eclipse.remote.internal.terminal.messages;x-internal:=true,
+ org.eclipse.remote.internal.terminal.preferences;x-internal:=true,
+ org.eclipse.remote.internal.terminal.settings;x-internal:=true,
+ org.eclipse.remote.internal.terminal.view;x-internal:=true,
+ org.eclipse.remote.terminal
diff --git a/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/connector/RemoteConnector.java b/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/connector/RemoteConnector.java
index ccbd3424298..64dd98e7fcc 100644
--- a/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/connector/RemoteConnector.java
+++ b/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/connector/RemoteConnector.java
@@ -10,10 +10,10 @@ package org.eclipse.remote.internal.terminal.connector;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.eclipse.remote.internal.terminal.settings.IRemoteSettings;
 import org.eclipse.remote.internal.terminal.settings.RemoteSettings;
 import org.eclipse.remote.internal.terminal.settings.RemoteSettingsPage;
 import org.eclipse.remote.internal.terminal.view.TerminalViewPlugin;
+import org.eclipse.remote.terminal.IRemoteSettings;
 import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
 import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
diff --git a/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/RemoteSettings.java b/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/RemoteSettings.java
index 39bddb1d4b3..b4a471a177b 100644
--- a/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/RemoteSettings.java
+++ b/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/RemoteSettings.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.remote.internal.terminal.settings;
 
+import org.eclipse.remote.terminal.IRemoteSettings;
 import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 @SuppressWarnings("restriction")
diff --git a/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/IRemoteSettings.java b/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/terminal/IRemoteSettings.java
similarity index 94%
rename from bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/IRemoteSettings.java
rename to bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/terminal/IRemoteSettings.java
index f8e10d8553d..791c50e6f77 100644
--- a/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/internal/terminal/settings/IRemoteSettings.java
+++ b/bundles/org.eclipse.remote.terminal/src/org/eclipse/remote/terminal/IRemoteSettings.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at 
  * http://www.eclipse.org/legal/epl-v10.html 
  *******************************************************************************/
-package org.eclipse.remote.internal.terminal.settings;
+package org.eclipse.remote.terminal;
 
 public interface IRemoteSettings {
 	public static final String CONNECTION_NAME = "ConnectionName"; //$NON-NLS-1$