diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
index 2fb6047148b..983e798da1c 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tm.terminal.serial"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.tm.internal.terminal.provisional.api.serial"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java
index 98b4fb23bda..ac56d363989 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.serial;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public interface ISerialSettings {
 
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
index 8466d037e3a..e5883a29d31 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
@@ -20,8 +20,8 @@ import gnu.io.CommPortIdentifier;
 import gnu.io.PortInUseException;
 import gnu.io.SerialPort;
 
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 public class SerialConnectWorker extends Thread {
 	private final ITerminalControl fControl;
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
index 45d3e100200..f7b860a804f 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
@@ -25,12 +25,12 @@ import java.io.OutputStream;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.tm.terminal.ISettingsPage;
-import org.eclipse.tm.terminal.ISettingsStore;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+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.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 public class SerialConnector implements ITerminalConnector {
 	private OutputStream fOutputStream;
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
index bd3dfd519d2..3af07a0dc8d 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
@@ -25,9 +25,9 @@ import gnu.io.SerialPortEventListener;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 /**
  * UNDER CONSTRUCTION
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
index 84c444aba0d..29778acec62 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
@@ -18,7 +18,7 @@ package org.eclipse.tm.internal.terminal.serial;
 
 import gnu.io.SerialPort;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public class SerialSettings implements ISerialSettings {
     protected String fSerialPort;
diff --git a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
index 8405841de9d..0edfc522c05 100644
--- a/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
+++ b/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.terminal.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
 
 public class SerialSettingsPage implements ISettingsPage {
 	private Combo fSerialPortCombo;
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
index 09dbc26c615..57f69b06709 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
@@ -24,7 +24,7 @@ import org.osgi.util.tracker.ServiceTracker;
  */
 public class Activator extends Plugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.tm.terminal.ssh"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.tm.internal.terminal.provisional.api.ssh"; //$NON-NLS-1$
 	private static Activator plugin;
 
 	// ServiceTracker for IJschService
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java
index 7b24129d760..1c7fe58e192 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.ssh;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public interface ISshSettings {
 	String getHost();
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
index ca0ba1434bc..5ea97d2c985 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
@@ -24,9 +24,9 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jsch.core.IJSchService;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelShell;
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java
index 59e72053232..7e648a8675a 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java
@@ -14,12 +14,12 @@ package org.eclipse.tm.internal.terminal.ssh;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.eclipse.tm.terminal.ISettingsPage;
-import org.eclipse.tm.terminal.ISettingsStore;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+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.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 import com.jcraft.jsch.ChannelShell;
 import com.jcraft.jsch.JSch;
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
index 4616e8f4ab5..43fd674c9fe 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.ssh;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public class SshSettings implements ISshSettings {
     protected String fHost;
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
index 1fd6c84fcda..55e2088349e 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
@@ -17,7 +17,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.terminal.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
 
 public class SshSettingsPage implements ISettingsPage {
 	private Text fHostText;
diff --git a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
index addce7dac1b..0d7ccfad4b7 100644
--- a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
+++ b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.view;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public class SettingStorePrefixDecorator implements ISettingsStore {
 	private final String fPrefix;
diff --git a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
index eb2ab88880a..673c6130e74 100644
--- a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
+++ b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 import org.eclipse.ui.IMemento;
 
 /**
diff --git a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
index 99e3d07db06..0a88dcbe94a 100644
--- a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
+++ b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
@@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.terminal.ISettingsPage;
-import org.eclipse.tm.terminal.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
 
 class TerminalSettingsDlg extends Dialog {
 	private Combo fCtlConnTypeCombo;
diff --git a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
index 25d88d6b9b5..58e2362c250 100644
--- a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
+++ b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
@@ -49,11 +49,11 @@ import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
 import org.eclipse.tm.internal.terminal.control.ITerminalListener;
 import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
 import org.eclipse.tm.internal.terminal.control.TerminalViewControlFactory;
-import org.eclipse.tm.terminal.ISettingsStore;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalConnectorExtension;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalConnectorExtension;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IViewSite;
@@ -149,7 +149,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
 			// millisecond.
 
 			getSite().getPage().showView(
-					"org.eclipse.tm.terminal.view.TerminalView",//$NON-NLS-1$
+					"org.eclipse.tm.internal.terminal.provisional.api.view.TerminalView",//$NON-NLS-1$
 					"SecondaryTerminal" + System.currentTimeMillis(), //$NON-NLS-1$
 					IWorkbenchPage.VIEW_ACTIVATE);
 		} catch (PartInitException ex) {
diff --git a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
index 80b9185c8ba..9a0fcb446c4 100644
--- a/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
+++ b/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
@@ -24,12 +24,12 @@ import java.util.Iterator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.tm.terminal.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class TerminalViewPlugin extends AbstractUIPlugin {
 	protected static TerminalViewPlugin fDefault;
-	public static final String  PLUGIN_HOME = "org.eclipse.tm.terminal"; //$NON-NLS-1$
+	public static final String  PLUGIN_HOME = "org.eclipse.tm.internal.terminal.provisional.api"; //$NON-NLS-1$
 	public static final String  HELP_VIEW   = PLUGIN_HOME + ".terminal_view"; //$NON-NLS-1$
 
 	/**
diff --git a/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
index 050e9ffd321..283cf6cf93d 100644
--- a/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ClassPath: .
 Export-Package: org.eclipse.tm.internal.terminal.control;x-friends:="org.eclipse.tm.terminal.view",
  org.eclipse.tm.internal.terminal.control.impl;x-internal:=true,
- org.eclipse.tm.internal.terminal.telnet;x-internal:=true,
- org.eclipse.tm.terminal
+ org.eclipse.tm.internal.terminal.provisional.api,
+ org.eclipse.tm.internal.terminal.telnet;x-internal:=true
diff --git a/org.eclipse.tm.terminal/schema/terminalConnector.exsd b/org.eclipse.tm.terminal/schema/terminalConnector.exsd
index 8d240a11d9e..87ccd84ab05 100644
--- a/org.eclipse.tm.terminal/schema/terminalConnector.exsd
+++ b/org.eclipse.tm.terminal/schema/terminalConnector.exsd
@@ -50,7 +50,7 @@
                   
                </documentation>
                <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.tm.terminal.ITerminalConnector"/>
+                  <meta.attribute kind="java" basedOn="org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector"/>
                </appInfo>
             </annotation>
          </attribute>
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java
index c614041bfd3..23adbff044e 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.control;
 
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 /**
  * Provided by a view implementation.
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
index 4fb3fd44dda..ba6a195dea4 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
@@ -14,8 +14,8 @@ package org.eclipse.tm.internal.terminal.control;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.graphics.Font;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 /**
  * @author Michael Scharf
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
index 61ed2ff8309..97dd54d44e5 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
@@ -13,7 +13,7 @@ package org.eclipse.tm.internal.terminal.control;
 
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tm.internal.terminal.control.impl.TerminalControl;
-import org.eclipse.tm.terminal.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
 
 public class TerminalViewControlFactory {
 	public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent, ITerminalConnector[] connectors) {
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
index 87886a326a8..a74893dc922 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
@@ -13,8 +13,8 @@ package org.eclipse.tm.internal.terminal.control.impl;
 
 import java.io.OutputStream;
 
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 /**
  * need a better name!
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
index 7fa1bd259a5..08cecbc5846 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
@@ -47,10 +47,10 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.tm.internal.terminal.control.ICommandInputField;
 import org.eclipse.tm.internal.terminal.control.ITerminalListener;
 import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.contexts.IContextActivation;
 import org.eclipse.ui.contexts.IContextService;
@@ -107,14 +107,14 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#copy()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#copy()
 	 */
 	public void copy() {
 		getCtlText().copy();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#paste()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#paste()
 	 */
 	public void paste() {
 		TextTransfer textTransfer = TextTransfer.getInstance();
@@ -146,14 +146,14 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#selectAll()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#selectAll()
 	 */
 	public void selectAll() {
 		getCtlText().selectAll();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#sendKey(char)
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#sendKey(char)
 	 */
 	public void sendKey(char character) {
 		Event event;
@@ -171,7 +171,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#clearTerminal()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#clearTerminal()
 	 */
 	public void clearTerminal() {
 		// The TerminalText object does all text manipulation.
@@ -180,7 +180,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#getClipboard()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#getClipboard()
 	 */
 	public Clipboard getClipboard() {
 		return fClipboard;
@@ -197,35 +197,35 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#setFocus()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setFocus()
 	 */
 	public void setFocus() {
 		getCtlText().setFocus();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#isEmpty()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isEmpty()
 	 */
 	public boolean isEmpty() {
 		return (getCtlText().getCharCount() == 0);
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#isDisposed()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isDisposed()
 	 */
 	public boolean isDisposed() {
 		return getCtlText().isDisposed();
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#isConnected()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isConnected()
 	 */
 	public boolean isConnected() {
 		return fState==TerminalState.CONNECTED;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#disposeTerminal()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#disposeTerminal()
 	 */
 	public void disposeTerminal() {
 		Logger.log("entered."); //$NON-NLS-1$
@@ -245,7 +245,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 		waitForConnect();
 	}
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#disconnectTerminal()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#disconnectTerminal()
 	 */
 	public void disconnectTerminal() {
 		Logger.log("entered."); //$NON-NLS-1$
@@ -372,7 +372,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#setupTerminal()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setupTerminal()
 	 */
 	public void setupTerminal(Composite parent) {
 		fState=TerminalState.CLOSED;
@@ -382,7 +382,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#onFontChanged()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#onFontChanged()
 	 */
 	public void setFont(Font font) {
 		getCtlText().setFont(font);
@@ -448,7 +448,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#displayTextInTerminal(java.lang.String)
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#displayTextInTerminal(java.lang.String)
 	 */
 	public void displayTextInTerminal(String text) {
 		writeToTerminal("\r\n"+text+"\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -485,7 +485,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#setMsg(java.lang.String)
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setMsg(java.lang.String)
 	 */
 	public void setMsg(String msg) {
 		fMsg = msg;
@@ -501,7 +501,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#getCtlText()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#getCtlText()
 	 */
 	public StyledText getCtlText() {
 		return fCtlText;
@@ -512,7 +512,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tm.terminal.ITerminalControl#getTerminalText()
+	 * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#getTerminalText()
 	 */
 	public TerminalText getTerminalText() {
 		return fTerminalText;
@@ -559,7 +559,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 			IContextService contextService = (IContextService) PlatformUI
 					.getWorkbench().getAdapter(IContextService.class);
 			contextActivation = contextService
-					.activateContext("org.eclipse.tm.terminal.TerminalContext"); //$NON-NLS-1$
+					.activateContext("org.eclipse.tm.internal.terminal.provisional.api.TerminalContext"); //$NON-NLS-1$
 		}
 
 		public void focusLost(FocusEvent event) {
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
index 2dcd45a4491..ca2e1abe005 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
@@ -17,12 +17,12 @@
 package org.eclipse.tm.internal.terminal.control.impl;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.tm.terminal.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class TerminalPlugin extends AbstractUIPlugin {
 	protected static TerminalPlugin fDefault;
-	public static final String  PLUGIN_ID  = "org.eclipse.tm.terminal"; //$NON-NLS-1$
+	public static final String  PLUGIN_ID  = "org.eclipse.tm.internal.terminal.provisional.api"; //$NON-NLS-1$
 	public static final String  HELP_VIEW  = PLUGIN_ID + ".terminal_view"; //$NON-NLS-1$
 
 	/**
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalText.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalText.java
index f2c27b3f264..2443d091cb0 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalText.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalText.java
@@ -35,10 +35,10 @@ import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 import org.eclipse.tm.internal.terminal.telnet.TelnetConnection;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
 
 /**
  * This class processes character data received from the remote host and
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
similarity index 79%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
index facce2c4bea..51f6db07e2f 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsPage.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
@@ -9,7 +9,7 @@
  * Michael Scharf (Wind River) - initial API and implementation
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 import org.eclipse.swt.widgets.Composite;
 
@@ -19,6 +19,12 @@ import org.eclipse.swt.widgets.Composite;
  * TODO: Michael Scharf: provide a mechanism to set an error string
  * TODO: Michael Scharf: provide a long description of a wizard
  * TODO: Michael Scharf: allow multiple pages to be generated
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public interface ISettingsPage {
 	/**
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
similarity index 75%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
index 4aa0dcbcbd9..1a1e1434d16 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ISettingsStore.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
@@ -9,12 +9,18 @@
  * Michael Scharf (Wind River) - initial API and implementation
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 /**
  * A simple interface to a store to persist the state of a connection. 
  * 
  * @author Michael Scharf
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public interface ISettingsStore {
 	/**
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
similarity index 85%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
index 7cf57c579b0..e3331026c28 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalConnector.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
@@ -9,16 +9,22 @@
  * Michael Scharf (Wind River) - initial API and implementation
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 import java.io.OutputStream;
 
 
 /**
  * Manage a single connection. Implementations of this class are contributed 
- * via <code>org.eclipse.tm.terminal.terminalConnector</code> extension point.
+ * via <code>org.eclipse.tm.internal.terminal.provisional.api.terminalConnector</code> extension point.
  * 
  * @author Michael Scharf
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public interface ITerminalConnector {
 	/**
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
similarity index 82%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
index d9bd70154eb..47acc769119 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/ITerminalControl.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
@@ -9,7 +9,7 @@
  * Michael Scharf (Wind River) - initial API and implementation
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 import java.io.OutputStream;
 
@@ -20,6 +20,12 @@ import org.eclipse.swt.widgets.Shell;
  * 
  * <p> Not to be implemented by clients.
  * @author Michael Scharf
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public interface ITerminalControl {
 	
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
similarity index 87%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
index a9fcd6f0f56..c94aec6ec82 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/Logger.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
@@ -11,7 +11,7 @@
  * Michael Scharf (Wind River) - split into core, view and connector plugins 
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,13 +29,19 @@ import java.io.PrintStream;
  * </pre>
  * 
  * @author Fran Litterio <francis.litterio@windriver.com>
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public final class Logger {
-    public static final String  TRACE_DEBUG_LOG                = "org.eclipse.tm.terminal/debug/log"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_ERROR          = "org.eclipse.tm.terminal/debug/log/error"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_INFO           = "org.eclipse.tm.terminal/debug/log/info"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_CHAR           = "org.eclipse.tm.terminal/debug/log/char"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_BUFFER_SIZE    = "org.eclipse.tm.terminal/debug/log/buffer/size"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG                = "org.eclipse.tm.internal.terminal.provisional.api/debug/log"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_ERROR          = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/error"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_INFO           = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/info"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_CHAR           = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/char"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_BUFFER_SIZE    = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/buffer/size"; //$NON-NLS-1$
 
     private static PrintStream logStream;
 
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
similarity index 79%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
index 480fe12534b..0821cd43133 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalConnectorExtension.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
@@ -9,7 +9,7 @@
  * Michael Scharf (Wind River) - initial API and implementation
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,13 +25,19 @@ import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin;
  * 
  * @author Michael Scharf
  *
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public class TerminalConnectorExtension {
 	/**
 	 * @return a new list of ITerminalConnectors. 
 	 */
 	public static ITerminalConnector[] getTerminalConnectors() {
-		IConfigurationElement[] config=RegistryFactory.getRegistry().getConfigurationElementsFor("org.eclipse.tm.terminal.terminalConnector"); //$NON-NLS-1$
+		IConfigurationElement[] config=RegistryFactory.getRegistry().getConfigurationElementsFor("org.eclipse.tm.internal.terminal.provisional.api.terminalConnector"); //$NON-NLS-1$
 		List result=new ArrayList();
 		for (int i = 0; i < config.length; i++) {
 			try {
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
similarity index 79%
rename from org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java
rename to org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
index effa0ff6cfd..de744502345 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/TerminalState.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
@@ -9,13 +9,19 @@
  * Michael Scharf (Wind River) - initial API and implementation
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
-package org.eclipse.tm.terminal;
+package org.eclipse.tm.internal.terminal.provisional.api;
 
 /**
  * Represent the sate of a terminal connection.
  * In java 1.5 this would be an enum.
  * @author Michael Scharf
  *
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
+ * part of a work in progress. There is no guarantee that this API will
+ * work or that it will remain the same. Please do not use this API without
+ * consulting with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> team.
+ * </p>
  */
 public class TerminalState {
 	/**
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java
index d0937da1109..f7626790b5f 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.telnet;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public interface ITelnetSettings {
 	String getHost();
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java
index 18709d0ebbe..0b07c772c7a 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java
@@ -22,9 +22,9 @@ import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 class TelnetConnectWorker extends Thread {
 	private final ITerminalControl fControl;
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
index d5b725ef012..0d3786695df 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
@@ -20,9 +20,9 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.net.SocketException;
 
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 /**
  * This class encapsulates a TELNET connection to a remote server. It processes
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java
index 65025355fa4..6227ba9e0e1 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java
@@ -21,12 +21,12 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 
-import org.eclipse.tm.terminal.ISettingsPage;
-import org.eclipse.tm.terminal.ISettingsStore;
-import org.eclipse.tm.terminal.ITerminalConnector;
-import org.eclipse.tm.terminal.ITerminalControl;
-import org.eclipse.tm.terminal.Logger;
-import org.eclipse.tm.terminal.TerminalState;
+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.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 
 public class TelnetConnector implements ITerminalConnector {
 	private OutputStream fOutputStream;
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java
index 46da5682fd6..68e26f8ad01 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Date;
 
-import org.eclipse.tm.terminal.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
 
 /**
  * This class represents a single TELNET protocol option at one endpoint of a TELNET
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java
index d71c71339ba..fd90849ed91 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java
@@ -16,7 +16,7 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.telnet;
 
-import org.eclipse.tm.terminal.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
 
 public class TelnetSettings implements ITelnetSettings {
     protected String fHost;
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
index 75b2cc007f9..a3be7a74758 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.terminal.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
 
 public class TelnetSettingsPage implements ISettingsPage {
 	private Text fHostText;