TM and RSE Main Features
diff --git a/rse/plugins/org.eclipse.dstore.core/dstore_core.jar b/rse/plugins/org.eclipse.dstore.core/dstore_core.jar
new file mode 100644
index 00000000000..fb6bc8a801b
Binary files /dev/null and b/rse/plugins/org.eclipse.dstore.core/dstore_core.jar differ
diff --git a/rse/plugins/org.eclipse.dstore.extra/dstore_extra_server.jar b/rse/plugins/org.eclipse.dstore.extra/dstore_extra_server.jar
new file mode 100644
index 00000000000..cfa0996dedb
Binary files /dev/null and b/rse/plugins/org.eclipse.dstore.extra/dstore_extra_server.jar differ
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/dstore_miners.jar b/rse/plugins/org.eclipse.rse.services.dstore/dstore_miners.jar
new file mode 100644
index 00000000000..49feb71a6f8
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.services.dstore/dstore_miners.jar differ
diff --git a/rse/plugins/org.eclipse.rse.services/clientserver.jar b/rse/plugins/org.eclipse.rse.services/clientserver.jar
new file mode 100644
index 00000000000..bee3d139ff0
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.services/clientserver.jar differ
diff --git a/terminal/org.eclipse.tm.terminal-feature/.project b/terminal/features/org.eclipse.tm.terminal-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/.project
rename to terminal/features/org.eclipse.tm.terminal-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal-feature/build.properties b/terminal/features/org.eclipse.tm.terminal-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal-feature/license.html b/terminal/features/org.eclipse.tm.terminal-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal-feature/pom.xml
index ac52029dfef..e8513b33281 100644
--- a/terminal/org.eclipse.tm.terminal-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.html b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.html
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.mappings b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.mappings
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/tm32.png b/terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/tm32.png
rename to terminal/features/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/tm32.png
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/.project b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/.project
new file mode 100644
index 00000000000..636aa511c46
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.eclipse.tm.terminal.core.sdk-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties
new file mode 100644
index 00000000000..a7c02cfcc49
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties
@@ -0,0 +1,19 @@
+################################################################################
+# Copyright (c) 2012 Wind River Systems, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Wind River Systems - initial API and implementation
+################################################################################
+bin.includes = feature.xml,\
+ epl-v10.html,\
+ feature.properties,\
+ license.html,\
+ eclipse_update_120.jpg
+generate.plugin@org.eclipse.tm.terminal.source=org.eclipse.tm.terminal
+generate.plugin@org.eclipse.tm.terminal.serial.source=org.eclipse.tm.terminal.serial
+generate.plugin@org.eclipse.tm.terminal.ssh.source=org.eclipse.tm.terminal.ssh
+generate.plugin@org.eclipse.tm.terminal.telnet.source=org.eclipse.tm.terminal.telnet
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/eclipse_update_120.jpg
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg
rename to terminal/features/org.eclipse.tm.terminal.core.sdk-feature/eclipse_update_120.jpg
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.core.sdk-feature/epl-v10.html
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties
new file mode 100644
index 00000000000..896edaf57c6
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties
@@ -0,0 +1,169 @@
+###############################################################################
+# Copyright (c) 2012 Wind River Systems, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Wind River Systems - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Target Management Terminal
+
+# "description" property - description of the feature
+description=An ANSI (vt102) compatible Terminal control including \
+plug-ins for Serial, SSH and Telnet connections. Includes Source Code.
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse TM Project
+
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 3.4 Updates
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2012 Wind River Systems, Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
new file mode 100644
index 00000000000..47e25b716f7
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+ %description
+
+
+
+ %copyright
+
+
+
+ %license
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/license.html b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.core.sdk-feature/license.html
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
new file mode 100644
index 00000000000..0f34322b5f9
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.core.sdk
+ 3.3.1-SNAPSHOT
+ eclipse-feature
+
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/.project b/terminal/features/org.eclipse.tm.terminal.local-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.local-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.local-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.local-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/eclipse_update_120.jpg b/terminal/features/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/eclipse_update_120.jpg
rename to terminal/features/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.local-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.local-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/license.html b/terminal/features/org.eclipse.tm.terminal.local-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.local-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.local-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.local-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
index f4be0a4567f..408e1e81853 100644
--- a/terminal/org.eclipse.tm.terminal.local-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.local
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/.project b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/eclipse_update_120.jpg b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/eclipse_update_120.jpg
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/eclipse_update_120.jpg
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/eclipse_update_120.jpg
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/license.html b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.local.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
index 6409da4f6a2..ddaef09acf5 100644
--- a/terminal/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.local.sdk
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/.project b/terminal/features/org.eclipse.tm.terminal.sdk-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.sdk-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/eclipse_update_120.jpg b/terminal/features/org.eclipse.tm.terminal.sdk-feature/eclipse_update_120.jpg
new file mode 100644
index 00000000000..bfdf708ad61
Binary files /dev/null and b/terminal/features/org.eclipse.tm.terminal.sdk-feature/eclipse_update_120.jpg differ
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.sdk-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/license.html b/terminal/features/org.eclipse.tm.terminal.sdk-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.sdk-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
index 8a468c6a29f..b220faf3a9e 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.sdk
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/.project b/terminal/features/org.eclipse.tm.terminal.serial-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.serial-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html b/terminal/features/org.eclipse.tm.terminal.serial-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.serial-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
index 41a83159c06..dc188b098c6 100644
--- a/terminal/org.eclipse.tm.terminal.serial-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.serial
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/license.html b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.html b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.html
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/org.eclipse.tm.terminal.local/about.ini b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/about.ini
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.mappings b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.mappings
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.local/tm32.png b/terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/tm32.png
rename to terminal/features/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/.project b/terminal/features/org.eclipse.tm.terminal.ssh-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.ssh-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html b/terminal/features/org.eclipse.tm.terminal.ssh-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
index 3cbb95d29b7..060daf41ca1 100644
--- a/terminal/org.eclipse.tm.terminal.ssh-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.ssh
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/license.html b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.html b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.html
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.serial/about.mappings b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/about.mappings
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/tm32.png b/terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/tm32.png
rename to terminal/features/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/.project b/terminal/features/org.eclipse.tm.terminal.telnet-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.telnet-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html b/terminal/features/org.eclipse.tm.terminal.telnet-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
index 8cd70af9132..b751874b545 100644
--- a/terminal/org.eclipse.tm.terminal.telnet-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.telnet
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/license.html b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.html b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.html
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/org.eclipse.tm.terminal.serial/about.ini b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/about.ini
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.mappings b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.mappings
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial/tm32.png b/terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/tm32.png
rename to terminal/features/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/.project b/terminal/features/org.eclipse.tm.terminal.test-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.test-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.test-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.test-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/rootfiles/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.test-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/rootfiles/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.test-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/license.html b/terminal/features/org.eclipse.tm.terminal.test-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/license.html
rename to terminal/features/org.eclipse.tm.terminal.test-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.test-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
index 1ae7ba33d2c..07ad2d1ba4c 100644
--- a/terminal/org.eclipse.tm.terminal.test-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.test
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.test-feature/rootfiles/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.test-feature/rootfiles/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html b/terminal/features/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
rename to terminal/features/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html b/terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html
rename to terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties b/terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties
rename to terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties b/terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/.project b/terminal/features/org.eclipse.tm.terminal.view-feature/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/.project
rename to terminal/features/org.eclipse.tm.terminal.view-feature/.project
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/build.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/build.properties
rename to terminal/features/org.eclipse.tm.terminal.view-feature/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.view-feature/epl-v10.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/epl-v10.html
rename to terminal/features/org.eclipse.tm.terminal.view-feature/epl-v10.html
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/feature.xml
rename to terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/license.html b/terminal/features/org.eclipse.tm.terminal.view-feature/license.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/license.html
rename to terminal/features/org.eclipse.tm.terminal.view-feature/license.html
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.view-feature/pom.xml
rename to terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
index 10c4e305487..991518ca355 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm.features
org.eclipse.tm.terminal.view
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/epl-v10.html b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/epl-v10.html
new file mode 100644
index 00000000000..9321f4082e7
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/epl-v10.html
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+Eclipse Public License - Version 1.0
+
+
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.
+
+b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this
+Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and
+
+iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each
+copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.
+
+
\ No newline at end of file
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/license.html b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/license.html
new file mode 100644
index 00000000000..f19c483b9c8
--- /dev/null
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/license.html
@@ -0,0 +1,108 @@
+
+
+
+
+
+Eclipse Foundation Software User Agreement
+
+
+
+Eclipse Foundation Software User Agreement
+February 1, 2011
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+ For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
+
+ - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.
+ - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+
+
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.ssh/about.mappings b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/about.mappings
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/tm32.png b/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/tm32.png
rename to terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.local/.classpath b/terminal/plugins/org.eclipse.tm.terminal.local/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal.local/.classpath
diff --git a/terminal/org.eclipse.tm.terminal.local/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal.local/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal.local/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal.local/.project b/terminal/plugins/org.eclipse.tm.terminal.local/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/.project
rename to terminal/plugins/org.eclipse.tm.terminal.local/.project
diff --git a/terminal/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal.local/about.html b/terminal/plugins/org.eclipse.tm.terminal.local/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/about.html
rename to terminal/plugins/org.eclipse.tm.terminal.local/about.html
diff --git a/terminal/org.eclipse.tm.terminal.ssh/about.ini b/terminal/plugins/org.eclipse.tm.terminal.local/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal.local/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.local/about.mappings b/terminal/plugins/org.eclipse.tm.terminal.local/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal.local/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.local/about.properties b/terminal/plugins/org.eclipse.tm.terminal.local/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal.local/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.local/build.properties b/terminal/plugins/org.eclipse.tm.terminal.local/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal.local/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.local/icons/terminal-launch.gif b/terminal/plugins/org.eclipse.tm.terminal.local/icons/terminal-launch.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/icons/terminal-launch.gif
rename to terminal/plugins/org.eclipse.tm.terminal.local/icons/terminal-launch.gif
diff --git a/terminal/org.eclipse.tm.terminal.local/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.local/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal.local/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.local/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.local/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal.local/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal.local/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.local/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.local/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal.local/pom.xml
index bfb28b40c30..f9d419c81cc 100644
--- a/terminal/org.eclipse.tm.terminal.local/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.local/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal.local
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
diff --git a/terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java b/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
rename to terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/tm32.png b/terminal/plugins/org.eclipse.tm.terminal.local/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal.local/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.serial/.classpath b/terminal/plugins/org.eclipse.tm.terminal.serial/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal.serial/.classpath
diff --git a/terminal/org.eclipse.tm.terminal.serial/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal.serial/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal.serial/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal.serial/.project b/terminal/plugins/org.eclipse.tm.terminal.serial/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/.project
rename to terminal/plugins/org.eclipse.tm.terminal.serial/.project
diff --git a/terminal/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.serial/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal.serial/README.txt b/terminal/plugins/org.eclipse.tm.terminal.serial/README.txt
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/README.txt
rename to terminal/plugins/org.eclipse.tm.terminal.serial/README.txt
diff --git a/terminal/org.eclipse.tm.terminal.serial/about.html b/terminal/plugins/org.eclipse.tm.terminal.serial/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/about.html
rename to terminal/plugins/org.eclipse.tm.terminal.serial/about.html
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini b/terminal/plugins/org.eclipse.tm.terminal.serial/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal.serial/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.mappings b/terminal/plugins/org.eclipse.tm.terminal.serial/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal.serial/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.serial/about.properties b/terminal/plugins/org.eclipse.tm.terminal.serial/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal.serial/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial/build.properties b/terminal/plugins/org.eclipse.tm.terminal.serial/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal.serial/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.serial/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal.serial/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.serial/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal.serial/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal.serial/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.serial/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.serial/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal.serial/pom.xml
index 16a15e3355c..3f7e89130bf 100644
--- a/terminal/org.eclipse.tm.terminal.serial/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.serial/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal.serial
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/ISerialSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnectWorker.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialConnector.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialPortHandler.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialProperties.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
rename to terminal/plugins/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/tm32.png b/terminal/plugins/org.eclipse.tm.terminal.serial/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal.serial/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.ssh/.classpath b/terminal/plugins/org.eclipse.tm.terminal.ssh/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/.classpath
diff --git a/terminal/org.eclipse.tm.terminal.ssh/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal.ssh/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal.ssh/.project b/terminal/plugins/org.eclipse.tm.terminal.ssh/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/.project
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/.project
diff --git a/terminal/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs b/terminal/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/.settings/org.eclipse.jdt.ui.prefs
diff --git a/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal.ssh/about.html b/terminal/plugins/org.eclipse.tm.terminal.ssh/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/about.html
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/about.html
diff --git a/terminal/org.eclipse.tm.terminal.telnet/about.ini b/terminal/plugins/org.eclipse.tm.terminal.ssh/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.telnet/about.mappings b/terminal/plugins/org.eclipse.tm.terminal.ssh/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.ssh/about.properties b/terminal/plugins/org.eclipse.tm.terminal.ssh/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh/build.properties b/terminal/plugins/org.eclipse.tm.terminal.ssh/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.ssh/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.ssh/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal.ssh/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.ssh/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.ssh/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/pom.xml
index 77394878d08..a694be99b97 100644
--- a/terminal/org.eclipse.tm.terminal.ssh/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.ssh/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal.ssh
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshConstants.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/ISshSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnector.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java b/terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/tm32.png b/terminal/plugins/org.eclipse.tm.terminal.ssh/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal.ssh/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.telnet/.classpath b/terminal/plugins/org.eclipse.tm.terminal.telnet/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/.classpath
diff --git a/terminal/org.eclipse.tm.terminal.telnet/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal.telnet/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal.telnet/.project b/terminal/plugins/org.eclipse.tm.terminal.telnet/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/.project
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/.project
diff --git a/terminal/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs b/terminal/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.ui.prefs
diff --git a/terminal/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal.telnet/about.html b/terminal/plugins/org.eclipse.tm.terminal.telnet/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/about.html
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/about.html
diff --git a/terminal/org.eclipse.tm.terminal.test/about.ini b/terminal/plugins/org.eclipse.tm.terminal.telnet/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.test/about.mappings b/terminal/plugins/org.eclipse.tm.terminal.telnet/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.telnet/about.properties b/terminal/plugins/org.eclipse.tm.terminal.telnet/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet/build.properties b/terminal/plugins/org.eclipse.tm.terminal.telnet/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.telnet/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.telnet/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal.telnet/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.telnet/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.telnet/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/pom.xml
index ece9bfab0a3..1f651203e6a 100644
--- a/terminal/org.eclipse.tm.terminal.telnet/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.telnet/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal.telnet
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/ITelnetSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/NetworkPortMap.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetCodes.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnectWorker.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnector.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetProperties.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
diff --git a/terminal/org.eclipse.tm.terminal.test/tm32.png b/terminal/plugins/org.eclipse.tm.terminal.telnet/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal.telnet/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.test/.classpath b/terminal/plugins/org.eclipse.tm.terminal.test/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal.test/.classpath
diff --git a/terminal/org.eclipse.tm.terminal.test/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal.test/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal.test/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal.test/.project b/terminal/plugins/org.eclipse.tm.terminal.test/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/.project
rename to terminal/plugins/org.eclipse.tm.terminal.test/.project
diff --git a/terminal/org.eclipse.tm.terminal.test/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal.test/about.html b/terminal/plugins/org.eclipse.tm.terminal.test/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/about.html
rename to terminal/plugins/org.eclipse.tm.terminal.test/about.html
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini b/terminal/plugins/org.eclipse.tm.terminal.test/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal.test/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings b/terminal/plugins/org.eclipse.tm.terminal.test/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal.test/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.test/about.properties b/terminal/plugins/org.eclipse.tm.terminal.test/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal.test/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.test/build.properties b/terminal/plugins/org.eclipse.tm.terminal.test/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal.test/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.test/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.test/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal.test/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.test/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.test/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal.test/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal.test/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml
similarity index 96%
rename from terminal/org.eclipse.tm.terminal.test/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal.test/pom.xml
index 99bbefc7ef3..b69711c747d 100644
--- a/terminal/org.eclipse.tm.terminal.test/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal.test
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStreamTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTests.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTests.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTests.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/AllTests.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackendTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AbstractITerminalTextDataTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTests.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTests.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTests.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/AllTests.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SnapshotChangesTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextDataTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTestMaxHeigth.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTestMaxHeigth.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTestMaxHeigth.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScrollTestMaxHeigth.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataPerformanceTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshotWindowTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStoreTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindowTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/model/TerminalTextTestHelper.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnection.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestConnector.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettingsPage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettingsPage.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/speedtest/SpeedTestSettingsPage.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Main.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/Snippet48.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/TerminalTextCanvas.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/AbstractLineOrientedDataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/DataReader.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FastDataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/FileDataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IDataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/IStatus.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/LineCountingDataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/RandomDataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/TerminalTextUITest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/ui/VT100DataSource.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStreamPerformanceTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/textcanvas/PipedStreamTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTests.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTests.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTests.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/AllTests.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleColorTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleColorTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleColorTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleColorTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/model/StyleTest.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java
diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java
rename to terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java
diff --git a/terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch b/terminal/plugins/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch
rename to terminal/plugins/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch
diff --git a/terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch b/terminal/plugins/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch
rename to terminal/plugins/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch
diff --git a/terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch b/terminal/plugins/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch
rename to terminal/plugins/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch
diff --git a/terminal/org.eclipse.tm.terminal.test/test.xml b/terminal/plugins/org.eclipse.tm.terminal.test/test.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.test/test.xml
rename to terminal/plugins/org.eclipse.tm.terminal.test/test.xml
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png b/terminal/plugins/org.eclipse.tm.terminal.test/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal.test/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.view/.classpath b/terminal/plugins/org.eclipse.tm.terminal.view/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal.view/.classpath
diff --git a/terminal/org.eclipse.tm.terminal.view/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal.view/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal.view/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal.view/.project b/terminal/plugins/org.eclipse.tm.terminal.view/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/.project
rename to terminal/plugins/org.eclipse.tm.terminal.view/.project
diff --git a/terminal/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs b/terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs
rename to terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs
diff --git a/terminal/org.eclipse.tm.terminal.view/HelpContexts.xml b/terminal/plugins/org.eclipse.tm.terminal.view/HelpContexts.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/HelpContexts.xml
rename to terminal/plugins/org.eclipse.tm.terminal.view/HelpContexts.xml
diff --git a/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal.view/TerminalContexts.xml b/terminal/plugins/org.eclipse.tm.terminal.view/TerminalContexts.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/TerminalContexts.xml
rename to terminal/plugins/org.eclipse.tm.terminal.view/TerminalContexts.xml
diff --git a/terminal/org.eclipse.tm.terminal.view/about.html b/terminal/plugins/org.eclipse.tm.terminal.view/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/about.html
rename to terminal/plugins/org.eclipse.tm.terminal.view/about.html
diff --git a/terminal/org.eclipse.tm.terminal.view/about.ini b/terminal/plugins/org.eclipse.tm.terminal.view/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal.view/about.ini
diff --git a/terminal/org.eclipse.tm.terminal.view/about.mappings b/terminal/plugins/org.eclipse.tm.terminal.view/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal.view/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal.view/about.properties b/terminal/plugins/org.eclipse.tm.terminal.view/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal.view/about.properties
diff --git a/terminal/org.eclipse.tm.terminal.view/build.properties b/terminal/plugins/org.eclipse.tm.terminal.view/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal.view/build.properties
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/book.css b/terminal/plugins/org.eclipse.tm.terminal.view/doc/book.css
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/doc/book.css
rename to terminal/plugins/org.eclipse.tm.terminal.view/doc/book.css
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html b/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html
rename to terminal/plugins/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html b/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
rename to terminal/plugins/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html b/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html
rename to terminal/plugins/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html b/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html
rename to terminal/plugins/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/html/notice.html b/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/notice.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/doc/html/notice.html
rename to terminal/plugins/org.eclipse.tm.terminal.view/doc/html/notice.html
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif b/terminal/plugins/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif
rename to terminal/plugins/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif
diff --git a/terminal/org.eclipse.tm.terminal.view/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal.view/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.view/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal.view/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal.view/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.view/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal.view/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal.view/pom.xml
index 3661cf2b2f9..90b77df3697 100644
--- a/terminal/org.eclipse.tm.terminal.view/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.view/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal.view
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties b/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal.view/tm32.png b/terminal/plugins/org.eclipse.tm.terminal.view/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal.view/tm32.png
diff --git a/terminal/org.eclipse.tm.terminal.view/toc.xml b/terminal/plugins/org.eclipse.tm.terminal.view/toc.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal.view/toc.xml
rename to terminal/plugins/org.eclipse.tm.terminal.view/toc.xml
diff --git a/terminal/org.eclipse.tm.terminal/.classpath b/terminal/plugins/org.eclipse.tm.terminal/.classpath
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/.classpath
rename to terminal/plugins/org.eclipse.tm.terminal/.classpath
diff --git a/terminal/org.eclipse.tm.terminal/.cvsignore b/terminal/plugins/org.eclipse.tm.terminal/.cvsignore
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/.cvsignore
rename to terminal/plugins/org.eclipse.tm.terminal/.cvsignore
diff --git a/terminal/org.eclipse.tm.terminal/.options b/terminal/plugins/org.eclipse.tm.terminal/.options
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/.options
rename to terminal/plugins/org.eclipse.tm.terminal/.options
diff --git a/terminal/org.eclipse.tm.terminal/.project b/terminal/plugins/org.eclipse.tm.terminal/.project
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/.project
rename to terminal/plugins/org.eclipse.tm.terminal/.project
diff --git a/terminal/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs b/terminal/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
rename to terminal/plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/org.eclipse.tm.terminal/HelpContexts.xml b/terminal/plugins/org.eclipse.tm.terminal/HelpContexts.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/HelpContexts.xml
rename to terminal/plugins/org.eclipse.tm.terminal/HelpContexts.xml
diff --git a/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
rename to terminal/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
diff --git a/terminal/org.eclipse.tm.terminal/README.txt b/terminal/plugins/org.eclipse.tm.terminal/README.txt
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/README.txt
rename to terminal/plugins/org.eclipse.tm.terminal/README.txt
diff --git a/terminal/org.eclipse.tm.terminal/about.html b/terminal/plugins/org.eclipse.tm.terminal/about.html
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/about.html
rename to terminal/plugins/org.eclipse.tm.terminal/about.html
diff --git a/terminal/org.eclipse.tm.terminal/about.ini b/terminal/plugins/org.eclipse.tm.terminal/about.ini
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/about.ini
rename to terminal/plugins/org.eclipse.tm.terminal/about.ini
diff --git a/terminal/org.eclipse.tm.terminal/about.mappings b/terminal/plugins/org.eclipse.tm.terminal/about.mappings
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/about.mappings
rename to terminal/plugins/org.eclipse.tm.terminal/about.mappings
diff --git a/terminal/org.eclipse.tm.terminal/about.properties b/terminal/plugins/org.eclipse.tm.terminal/about.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/about.properties
rename to terminal/plugins/org.eclipse.tm.terminal/about.properties
diff --git a/terminal/org.eclipse.tm.terminal/build.properties b/terminal/plugins/org.eclipse.tm.terminal/build.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/build.properties
rename to terminal/plugins/org.eclipse.tm.terminal/build.properties
diff --git a/terminal/org.eclipse.tm.terminal/icons/clcl16/clear_co.gif b/terminal/plugins/org.eclipse.tm.terminal/icons/clcl16/clear_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/icons/clcl16/clear_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal/icons/clcl16/clear_co.gif
diff --git a/terminal/org.eclipse.tm.terminal/icons/dlcl16/clear_co.gif b/terminal/plugins/org.eclipse.tm.terminal/icons/dlcl16/clear_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/icons/dlcl16/clear_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal/icons/dlcl16/clear_co.gif
diff --git a/terminal/org.eclipse.tm.terminal/icons/elcl16/clear_co.gif b/terminal/plugins/org.eclipse.tm.terminal/icons/elcl16/clear_co.gif
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/icons/elcl16/clear_co.gif
rename to terminal/plugins/org.eclipse.tm.terminal/icons/elcl16/clear_co.gif
diff --git a/terminal/org.eclipse.tm.terminal/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/plugin.properties
rename to terminal/plugins/org.eclipse.tm.terminal/plugin.properties
diff --git a/terminal/org.eclipse.tm.terminal/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/plugin.xml
rename to terminal/plugins/org.eclipse.tm.terminal/plugin.xml
diff --git a/terminal/org.eclipse.tm.terminal/pom.xml b/terminal/plugins/org.eclipse.tm.terminal/pom.xml
similarity index 93%
rename from terminal/org.eclipse.tm.terminal/pom.xml
rename to terminal/plugins/org.eclipse.tm.terminal/pom.xml
index cbf88deb181..ee4a456fd00 100644
--- a/terminal/org.eclipse.tm.terminal/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal/pom.xml
@@ -6,7 +6,7 @@
tm-parent
org.eclipse.tm
3.8.0-SNAPSHOT
- ../../
+ ../../../
org.eclipse.tm
org.eclipse.tm.terminal
diff --git a/terminal/org.eclipse.tm.terminal/schema/terminalConnectors.exsd b/terminal/plugins/org.eclipse.tm.terminal/schema/terminalConnectors.exsd
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/schema/terminalConnectors.exsd
rename to terminal/plugins/org.eclipse.tm.terminal/schema/terminalConnectors.exsd
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/connector/TerminalToRemoteInjectionOutputStream.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ICommandInputField.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalListener.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/AbstractTerminalAction.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ActionMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/ImageConsts.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionClearAll.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCut.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionSelectAll.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/ITerminalControlForText.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalInputStream.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/IVT100EmulatorBackend.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/LoggingOutputStream.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100BackendTraceDecorator.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/ISnapshotChanges.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SynchronizedTerminalTextData.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModel.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ITextCanvasModelListener.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PollingTextCanvasModel.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextData.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextData.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextData.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextData.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataReadOnly.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/ITerminalTextDataSnapshot.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/LineSegment.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/LineSegment.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/LineSegment.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/LineSegment.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/Style.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/Style.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/Style.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/Style.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/StyleColor.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/StyleColor.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/StyleColor.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/StyleColor.java
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java
rename to terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/model/TerminalTextDataFactory.java
diff --git a/terminal/org.eclipse.tm.terminal/tm32.png b/terminal/plugins/org.eclipse.tm.terminal/tm32.png
similarity index 100%
rename from terminal/org.eclipse.tm.terminal/tm32.png
rename to terminal/plugins/org.eclipse.tm.terminal/tm32.png
diff --git a/terminal/readme.txt b/terminal/readme.txt
index 3a5490cd702..3f318523fc8 100644
--- a/terminal/readme.txt
+++ b/terminal/readme.txt
@@ -1,4 +1,4 @@
-The "terminal" folder holds the DSDP-TM Terminal Component.
+The "terminal" folder holds the TM Terminal Component.
Its core depends on Eclipse RCP only and can be adapted to eRCP.
-All these CVS modules should be named "org.eclipse.tm.terminal.*".
-See http://www.eclipse.org/dsdp/tm
+All these Git modules should be named "org.eclipse.tm.terminal.*".
+See http://www.eclipse.org/tm/