diff --git a/pom.xml b/pom.xml
index ec359105e2b..d38514993dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
     <name>Target Management Parent</name>
 
     <modules>
+        <!-- RSE features and plug-ins -->
         <module>rse/doc/org.eclipse.dstore.doc.isv</module>
         <module>rse/doc/org.eclipse.rse.doc.isv</module>
         <module>rse/doc/org.eclipse.rse.doc.user</module>
@@ -92,29 +93,33 @@
         <module>rse/plugins/org.eclipse.rse.useractions</module>
         <!-- <module>rse/plugins/org.eclipse.rse.useractions.sdk</module> -->
         <!-- <module>rse/features/org.eclipse.rse.useractions.sdk-feature</module> -->
+
+        <!-- Windows CE subsystem and support for RSE -->
+        <module>wince/org.eclipse.rse.wince-feature</module>
+        <module>wince/org.eclipse.rse.subsystems.wince</module>
+        <module>wince/org.eclipse.tm.rapi</module>
         
+        <!-- Terminal Widget features and plug-ins -->
         <module>terminal/plugins/org.eclipse.tm.terminal</module>
         <module>terminal/plugins/org.eclipse.tm.terminal.serial</module>
         <module>terminal/plugins/org.eclipse.tm.terminal.ssh</module>
         <module>terminal/plugins/org.eclipse.tm.terminal.telnet</module>
-        <module>terminal/plugins/org.eclipse.tm.terminal.view</module>
-        <module>terminal/plugins/org.eclipse.tm.terminal.local</module>
         <module>terminal/plugins/org.eclipse.tm.terminal.remote</module>
         <module>terminal/features/org.eclipse.tm.terminal-feature</module>
         <module>terminal/features/org.eclipse.tm.terminal.serial-feature</module>
         <module>terminal/features/org.eclipse.tm.terminal.ssh-feature</module>
         <module>terminal/features/org.eclipse.tm.terminal.telnet-feature</module>
-        <module>terminal/features/org.eclipse.tm.terminal.view-feature</module>
-        <module>terminal/features/org.eclipse.tm.terminal.core.sdk-feature</module>
-        <module>terminal/features/org.eclipse.tm.terminal.sdk-feature</module>
-        <module>terminal/features/org.eclipse.tm.terminal.local-feature</module>
-        <module>terminal/features/org.eclipse.tm.terminal.local.sdk-feature</module>
         <module>terminal/features/org.eclipse.tm.terminal.remote-feature</module>
         <module>terminal/features/org.eclipse.tm.terminal.remote.sdk-feature</module>
         
-        <module>wince/org.eclipse.rse.wince-feature</module>
-        <module>wince/org.eclipse.rse.subsystems.wince</module>
-        <module>wince/org.eclipse.tm.rapi</module>
+        <!-- Deprecated features and plug-ins. Keep them building until removed -->
+        <module>terminal/deprecated/plugins/org.eclipse.tm.terminal.view</module>
+        <module>terminal/deprecated/plugins/org.eclipse.tm.terminal.local</module>
+        <module>terminal/deprecated/features/org.eclipse.tm.terminal.view-feature</module>
+        <module>terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature</module>
+        <module>terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature</module>
+        <module>terminal/deprecated/features/org.eclipse.tm.terminal.local-feature</module>
+        <module>terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature</module>
         
         <module>releng/org.eclipse.tm.repo</module>
     </modules>
@@ -129,7 +134,9 @@
             <module>rse/tests/org.eclipse.rse.tests.framework.examples</module>
 
             <module>terminal/plugins/org.eclipse.tm.terminal.test</module>
-            <module>terminal/features/org.eclipse.tm.terminal.test-feature</module>
+            
+            <!-- Deprecated features and plug-ins. Keep them building until removed -->
+            <module>terminal/deprecated/features/org.eclipse.tm.terminal.test-feature</module>
         </modules>
     </profile>
     </profiles>
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/.project b/terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/.project
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.core.sdk-feature/.project
rename to terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/.project
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
similarity index 93%
rename from terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
index a08009edc55..4609c075ad9 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.core.sdk</artifactId>
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/.project b/terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/.project
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local-feature/.project
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/.project
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local-feature/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local-feature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/feature.xml
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/feature.xml
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/pom.xml
similarity index 93%
rename from terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/pom.xml
index be91b64974a..e8192c4c55a 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.local-feature/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local</artifactId>
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/.project b/terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/.project
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local.sdk-feature/.project
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/.project
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local.sdk-feature/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
similarity index 93%
rename from terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
index 2b013a9d578..ee1ccbea2d0 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local.sdk</artifactId>
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/.project b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/.project
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.sdk-feature/.project
rename to terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/.project
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.sdk-feature/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
similarity index 93%
rename from terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
index 81a7bfaacd8..eb957301c59 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.sdk</artifactId>
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/.project b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/.project
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/.project
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/.project
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/feature.xml
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/feature.xml
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/pom.xml
similarity index 93%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/pom.xml
index 625bb965588..57c325814c9 100644
--- a/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.test</artifactId>
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/.project b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/.project
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/.project
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/.project
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/feature.xml
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/feature.xml
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/pom.xml
similarity index 93%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/pom.xml
index cdf0e8fbd9e..27352ba805b 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.view</artifactId>
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.html
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.ini
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.mappings
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/build.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/plugin.properties
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png b/terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png
similarity index 100%
rename from terminal/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png
rename to terminal/deprecated/features/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/tm32.png
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/.classpath b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.classpath
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/.classpath
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.classpath
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/.cvsignore b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.cvsignore
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/.cvsignore
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.cvsignore
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/.project b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.project
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/.project
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.project
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/about.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/about.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/about.ini b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.ini
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/about.ini
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.ini
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/about.mappings b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.mappings
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/about.mappings
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.mappings
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/about.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/about.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/about.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/build.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/build.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/build.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/build.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/icons/terminal-launch.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/icons/terminal-launch.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/icons/terminal-launch.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/icons/terminal-launch.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/plugin.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/plugin.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/plugin.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/plugin.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/plugin.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/plugin.xml
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/plugin.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/plugin.xml
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/pom.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/pom.xml
similarity index 90%
rename from terminal/plugins/org.eclipse.tm.terminal.local/pom.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/pom.xml
index a61ae8bb06c..fdc1b866b80 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.local/pom.xml
+++ b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.tm.terminal.local</artifactId>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.local/tm32.png b/terminal/deprecated/plugins/org.eclipse.tm.terminal.local/tm32.png
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.local/tm32.png
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.local/tm32.png
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/.classpath b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.classpath
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/.classpath
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.classpath
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/.cvsignore b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.cvsignore
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/.cvsignore
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.cvsignore
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/.project b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.project
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/.project
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.project
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.core.prefs
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/.settings/org.eclipse.jdt.ui.prefs
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/HelpContexts.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/HelpContexts.xml
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/HelpContexts.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/HelpContexts.xml
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/TerminalContexts.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/TerminalContexts.xml
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/TerminalContexts.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/TerminalContexts.xml
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/about.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/about.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/about.ini b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.ini
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/about.ini
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.ini
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/about.mappings b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.mappings
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/about.mappings
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.mappings
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/about.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/about.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/about.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/build.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/build.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/build.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/build.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/doc/book.css b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/book.css
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/doc/book.css
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/book.css
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/01_terminalview.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/03_terminal_settings.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/04_terminal_emulation.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/doc/html/notice.html b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/notice.html
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/doc/html/notice.html
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/doc/html/notice.html
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/command_input_field.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/connect_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/disconnect_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/lock_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/newterminal.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/clcl16/properties_tsk.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/command_input_field.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/connect_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/disconnect_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/lock_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/newterminal.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/properties_tsk.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/dlcl16/rem_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/command_input_field.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/connect_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/disconnect_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/lock_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/newterminal.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/properties_tsk.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/elcl16/rem_co.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/icons/eview16/terminal_view.gif
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/plugin.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/plugin.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/plugin.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/plugin.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/plugin.xml
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/plugin.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/plugin.xml
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/pom.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/pom.xml
similarity index 90%
rename from terminal/plugins/org.eclipse.tm.terminal.view/pom.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/pom.xml
index aee546ea209..4ae0aaa1199 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view/pom.xml
+++ b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>org.eclipse.tm.maven-build</artifactId>
     <groupId>org.eclipse.tm</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <relativePath>../../../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.tm.terminal.view</artifactId>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ActionMessages.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/ShowTerminalConnectionAction.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalAction.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionConnect.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionDisconnect.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionNewTerminal.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionRemove.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionScrollLock.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSelectionDropDown.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionSettings.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/actions/TerminalActionToggleCommandInputField.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnectionManager.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ImageConsts.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/PageBook.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingStorePrefixDecorator.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/SettingsStore.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnectionManager.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/tm32.png b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/tm32.png
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/tm32.png
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/tm32.png
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view/toc.xml b/terminal/deprecated/plugins/org.eclipse.tm.terminal.view/toc.xml
similarity index 100%
rename from terminal/plugins/org.eclipse.tm.terminal.view/toc.xml
rename to terminal/deprecated/plugins/org.eclipse.tm.terminal.view/toc.xml