TM Web: Get rid of broken references to legacy downloads
diff --git a/about.php b/about.php
index 6cf2079..611f371 100644
--- a/about.php
+++ b/about.php
@@ -64,7 +64,7 @@
     as a standalone offering.</p>
     <p>
     Current releases can be downloaded for evaluation
-    <a href="http://download.eclipse.org/tm/downloads/">here</a>.
+    <a href="/tm/downloads.php">here</a>.
 	  <div class="homeitem3col">
 		<h3>For more information, see the</h3>
     	<ul>
diff --git a/tm-new/_projectCommon.php b/tm-new/_projectCommon.php
deleted file mode 100644
index 2c1aa0e..0000000
--- a/tm-new/_projectCommon.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-	# Set the theme for your project's web pages.
-	# See the Committer Tools "How Do I" for list of themes
-	# https://dev.eclipse.org/committers/
-	# Optional: defaults to system theme 
-	$theme = "Nova";
-
-	# Define your project-wide Nav bars here.
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# these are optional
-	#$Nav->addNavSeparator("Target Management", 	"/tm/index.php");
-	#$Nav->addCustomNav("About", 		"/tm/about.php", 	 "_self", 2);
-	#$Nav->addCustomNav("Downloads", 	"/tm/downloads.php", "_self", 2);
-	#$Nav->addCustomNav("Getting Started", "/tm/tutorial/index.php",  "_self", 2);
-	#$Nav->addCustomNav("Development", 	"/tm/development/index.php", "_self", 2);
-
-	$Nav->setLinkList(array());
-	$branding = <<<EOBRANDING
-<div id="branding">
-<h1><a href="http://eclipse.org/tm/">Target Management (Remote System Explorer)</a></h1>
-</div>
-EOBRANDING;
-
-	$Menu->setProjectBranding($branding);
-
-	$Nav->addCustomNav("About This Project", "http://www.eclipse.org/projects/project_summary.php?projectid=tools.tm", "_self", 1);
-	
-	$Nav->addNavSeparator("Target Management", "/tm/tm-new/index.php", "_self", 1);
-	$Nav->addCustomNav("About", "/tm/tm-new/about/index.php", "_self", 1);
-	$Nav->addCustomNav("Team", "/tm/tm-new/team/index.php", "_self", 1);
-	$Nav->addCustomNav("Plan", "/tm/development/plan.php", "_self", 1);
-	$Nav->addCustomNav("Presentations", "/tm/tm-new/presentations/index.php", "_self", 1);
-	$Nav->addCustomNav("Demos", "/tm/tm-new/demos/index.php", "_self", 1);
-	$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/TM", "_self", 1); 
-	$Nav->addCustomNav("IP Log", "http://www.eclipse.org/projects/ip_log.php?projectid=tools.tm", "_self", 1);
-
-	$Nav->addNavSeparator("Users", "/tm/tm-new/tutorial/index.php", "_self", 1);
-	$Nav->addCustomNav("Getting Started", "/tm/tm-new/tutorial/index.php", "_self", 1);
-	$Nav->addCustomNav("Downloads", "/tm/tm-new/downloads/index.php", "_self", 1);
-	$Nav->addCustomNav("Bugs", "/tm/tm-new/bugs/index.php", "_self", 1);
-	$Nav->addCustomNav("FAQ (wiki)", "http://wiki.eclipse.org/TM_and_RSE_FAQ", "_self", 1);
-	$Nav->addCustomNav("Newsgroup", "http://dev.eclipse.org/newslists/news.eclipse.tm/maillist.html", "_self", 1);
-
-	$Nav->addNavSeparator("Contributors (wiki)", "http://wiki.eclipse.org/TM_and_RSE_FAQ#Working_on_TM_.2F_RSE", "_self", 1);
-	$Nav->addCustomNav("Contributing (wiki)", "http://wiki.eclipse.org/TM_and_RSE_FAQ#Working_on_TM_.2F_RSE", "_self", 1);
-	$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/tm-dev", "_self", 1);
-	$Nav->addCustomNav("CVS", "/tm/development/cvs-setup.php", "_self", 1);
-	$Nav->addCustomNav("Development Tools", "/tm/development/index.php", "_self", 1);
-	$Nav->addCustomNav("Search CVS", "/tm/searchcvs.php?q=file%3A+org.eclipse.tm%25%2F" . "+days%3A+7", "_self", 2);
-
-
-?>
diff --git a/tm-new/about/index.php b/tm-new/about/index.php
deleted file mode 100644
index ccaa547..0000000
--- a/tm-new/about/index.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Martin Oberhuber
-	# Date:			2006-02-01
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "About Target Management";
-	$pageKeywords	= "device, target";
-	$pageAuthor		= "Martin Oberhuber";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-
-	<h2>Mission</h2>
-    The Target Management project creates data models and frameworks
-    to configure and manage remote systems, their connections, and their services.
-    </P>
-    <UL>
-      <LI><I>Remote systems</I> (aka targets) can range from large-scale host computers, multi-board 
-      or multi-core parallel systems to target boards without even a CPU or FPGA (connected
-      by a hardware debugging box).</LI>
-      <LI><I>Configuration</I> means dealing with board description files from a variety of sources,
-      displaying remote system components and manipulating board and connection properties.</LI>
-      <LI><I>Management</I> means maintaining a list of remote systems which is team
-      shareable and available to other subsystems, creating groups of systems when appropriate,
-      and handling access control to targets that are shared in a team (board lab).</LI>
-      <LI><I>Connections</I> can range from TCP/IP standard protocols like FTP or telnet,
-	  secure encryption, authentication and firewall tunnelling (ssh), to serial line terminal and 
-	  vendor-specific protocols for remote agent and on-chip debugging (JTAG) solutions.
-	  We want connection schemes and protocols to be pluggable in our framework.</LI>
-	  <LI><I>Services</I> on remote systems include downloading software and data,
-      launching single or multiple configurations, starting and stopping cores,
-      resetting and querying target information.</LI>
-    </UL>
-    <P>
-    Since there are many different vendors and solutions around in the device software
-    space, the main charter of target management is to provide data models and frameworks
-    that are flexible and open enough for vendor-specific extensions. Sample implementations 
-    are provided for TCP/IP Secure Shell (ssh) connections, FTP data transfer, Telnet and
-    Windows CE connections. In addition to that, a lightweight Terminal View is also 
-    provided as a stand-alone offering.</p>
-    <p>
-    Current releases can be downloaded for evaluation
-    <a href="http://download.eclipse.org/tm/downloads/">here</a>.
-	  <div class="homeitem3col">
-		<h3>For more information, see the</h3>
-    	<ul>
-    	<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
-      		Target Management Overview Slides</a>
-    	  	which include a diagram of the envisioned components and architecture for our project
-    	  	(<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</a>).
-    	  	</li>
-		<li><a href="http://live.eclipse.org/node/229">TM Webinar</a>:
-		  goals, architecture, future plans and online demo
-		  (<a href="http://live.eclipse.org/node/229">50 minute full recording</a> |
-		  <a href="http://www.eclipse.org/projects/slides/TM_Webinar_Slides_070412.ppt">PPT slides</a>)
-		  </li> 
-    	<li><a href="/tm/doc/TM_Use_Cases_v1.1c.pdf">
-      		Target Management Use-Case Document</a> 
-      		to understand what scenarios we want to cover with our project.</li>
-		<li><a href="/tm/development/plan.php">
-			Target Management Project Planning</a> 
-			to understand what features and releases are coming next.</li>
-		</ul>
-	  </div>
-	</div>
-
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Related Links</h6>
-			<ul>				
-				<li><a href="/tm/tutorial/index.php"
-					target="_self">TM Getting Started</a></li>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
-					target="_self">TM Overview Slides</a></li>
-				<li><a href="http://live.eclipse.org/node/229">TM Webinar</a>
-				    </li>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
-				    TM 2.0 Release Review Slides</a></li>
-				<li><a href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
-					target="_self">TM Use Cases Document</a></li>
-				<li><a href="/tm/development/plan.php"
-					target="_self">TM Project Plan</a></li>
-			</ul>
-		</div>
-
-</div>
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/bugs/index.php b/tm-new/bugs/index.php
deleted file mode 100644
index 8499bb3..0000000
--- a/tm-new/bugs/index.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# index.php
-	#
-	# Author: 		Kevin Doyle
-	# Date:			2008-01-25			
-	#
-	# Description:	Display a list of bug queries and how to open a new bug
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Target Management Bugs";
-	$pageKeywords	= "target management, remote system explorer, tm, rse, Eclipse, device, target";
-	$pageAuthor		= "Kevin Doyle";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-	<div id="maincontent">
-	<div id="midcolumn">
-		<div class="homeitem3col">
-			<h3>Found a Bug?  Have an enhancement idea?</h3>
-			<ul>
-				<li>You can submit bugs/enhancement requests though <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Target%20Management&version=unspecified&component=RSE">Bugzilla</a>.</li>
-				<li>See the <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ#How_do_I_report_a_bug_or_request_a_feature.3F">FAQ</a> for what to include in your bug reports</li>
-			</ul>
-		</div>
-		 
-		<div class="homeitem3col">
-			<h3>Queries</h3>
-			<ul>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				All open bugs with severity blocker, critical, major, or normal</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				All open bugs with severity minor or trivial</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=enhancement&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				All open enhancement requests</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&component=RSE&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				Remote System Explorer bugs</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&component=Terminal&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				Terminal bugs</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=bugday&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				BugDay Bugs</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=helpwanted&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				Helpwanted Bugs</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Target+Management&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">
-				All Resolved Bugs</a></li>
-			</ul>
-		</div>
-		
-	</div>
-</div>
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/demos/index.php b/tm-new/demos/index.php
deleted file mode 100644
index 3b585f3..0000000
--- a/tm-new/demos/index.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		David Dykstal
-	# Date:			2009-04-01
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Demos";
-	$pageKeywords	= "device, target";
-	$pageAuthor		= "David Dykstal";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<p>
-		Under Construction!
-		</p>
-		<p>
-		Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean aliquam. Nunc pretium. Suspendisse potenti. Nullam et lorem. Mauris dui. Nulla nisi. Duis at erat. In consectetur. Ut vel quam. Nam tristique, dui vitae iaculis suscipit, urna risus iaculis purus, quis facilisis odio augue sed dui. Sed varius semper tortor. Nam rhoncus, nibh non convallis scelerisque, nulla quam egestas dui, vel tincidunt augue lectus eget nulla. Aenean condimentum pede vitae velit. Duis vulputate.
-		</p>
-		<p>
-		Etiam condimentum, lacus vel scelerisque ultrices, justo urna dictum arcu, sed luctus justo risus eget nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean convallis pharetra ante. Integer sit amet nisi sit amet mi hendrerit ornare. Praesent porttitor magna at ante. Ut tempor diam sit amet purus. Curabitur varius. Etiam mollis placerat quam. Maecenas ac massa in turpis vehicula sollicitudin. Mauris bibendum. Nulla metus orci, aliquet ut, tincidunt nec, euismod sit amet, urna.
-		</p>
-		<p>
-		Duis enim. Praesent lobortis, tellus id bibendum venenatis, odio enim posuere quam, sed blandit enim urna sit amet magna. Sed sed magna vel tellus aliquet eleifend. Integer rhoncus, ligula non porta volutpat, ipsum est commodo est, vitae vulputate risus libero ac nulla. Ut interdum urna et metus. Fusce ultricies ullamcorper dui. Maecenas arcu urna, molestie ut, semper sed, pharetra eget, dolor. Quisque sed mi ut tortor aliquam vestibulum. Mauris tristique. Morbi sit amet metus. Integer tempus purus rutrum massa. Nullam scelerisque ligula in risus. Duis egestas justo vel mi. In felis leo, tincidunt sed, tincidunt et, cursus in, nulla.
-		</p>
-	</div>
-
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Related Links</h6>
-			<ul>
-			</ul>
-		</div>
-	</div>
-
-</div>
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/downloads/index.php b/tm-new/downloads/index.php
deleted file mode 100755
index 6faf456..0000000
--- a/tm-new/downloads/index.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# downloads.php
-	#
-	# Author: 		Martin Oberhuber
-	# Date:			2006-02-01
-	#
-	# Description: TM downloads page
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "TM Downloads";
-	$pageKeywords	= "device, remote, target";
-	$pageAuthor		= "Martin Oberhuber";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-
-		The Target Management Downloads are now available on
-		<ul>
-		<li><a href="http://download.eclipse.org/tm/downloads/">The TM Download Site</a>
-		<li><a href="http://download.eclipse.org/tm/updates/3.0/">The TM 3.0 Update Site</a>
-		(or legacy: <a href="http://download.eclipse.org/tm/updates/2.0">TM 2.x update site</a>)
-		</ul>
-
-		<p>Older downloads have been submitted to eclipse.org via bugzilla:
-		<p/>
-		<ul>
-		<li>Bugzilla <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=65471">65471</a>:
-			Remote System Framework (RSF) 2.0.0 code and 
-			<a href="https://bugs.eclipse.org/bugs/attachment.cgi?id=18820">presentation</a>
-			</li>
-		</ul>
-		<p/>
-		In addition to that, <a href="/tm/doc/index.php">Developer Documents</a> are available for download.
-		<p/>
-	</div>
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Getting started</h6>
-			<ul>				
-				<li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Overview.ppt"
-					target="_self">TM Overview Presentation</a></li>
-				<li><a href="http://www.eclipse.org/project-slides/TM_3.0_Release_Review.pdf" target="_self">
-				    TM 3.0 Release Review Slides</a></li>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
-				    TM 2.0 Release Review Slides</a></li>
-				<li><a
-					href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
-					target="_self">TM Use Cases Document</a></li>
-				<!-- <li><a href="/tm/development/index.php">Developer Resources</a></li> -->
-				<li><a href="/tm/doc/index.php">Developer Documents</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/images/tm-logo.gif b/tm-new/images/tm-logo.gif
deleted file mode 100644
index d2f65eb..0000000
--- a/tm-new/images/tm-logo.gif
+++ /dev/null
Binary files differ
diff --git a/tm-new/index.php b/tm-new/index.php
deleted file mode 100644
index 0cb4176..0000000
--- a/tm-new/index.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# index.php
-	#
-	# Author: 		Martin Oberhuber, Kevin Doyle, David Dykstal
-	# Date:			2006-02-01
-	# Updated: 		2008-01-25
-	# Updated:      2009-01-25 dwd
-	#
-	# Description: TM main page
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse Target Management Project - Remote System Explorer";
-	$pageKeywords	= "target management, remote system explorer, tm, rse, Eclipse, device, target";
-	$pageAuthor		= "Martin Oberhuber";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-
-	<div id="midcolumn">
-		<h1 style="font-size:40px">Target Management</h1>
-		<br/>
-		<img src="images/tm-logo.gif" alt="tm-logo" width="412" height="297"/>
-	</div>
-
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Related Links</h6>
-			<ul>
-				<li>
-					<a href="/tools/eclipsetools-charter.php"><b>Tools Project Charter</b></a>
-				</li>
-				<li>
-					<a href="/tm/development/bug_process.php" target="_blank"><b>Bugs</b></a> 
-					| View <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit">all open</a> issues
-					| <a target="_top" href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Target%20Management&version=unspecified&component=RSE">Submit new</a> bugs
-					| Request an <a target="_top" href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Target%20Management&version=unspecified&component=RSE&rep_platform=All&op_sys=All&priority=P3&bug_severity=enhancement&form_name=enter_bug">enhancement</a>
-				</li>
-				<li>
-					<a href="/tm/doc/TM_Use_Cases_v1.1c.pdf"><b>Use cases</b></a> and requirements for Target Management
-				</li>
-			    <li>
-			    	<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"><b>Architectural Overview</b></a>
-    	  			(<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  			| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</a>).
-    	  		</li>
-			</ul>
-		</div>
-	</div>
-
-	<div id="midcolumn" style="width:740px">
-		<p>
-			The Target Management project provides data models and frameworks to configure and manage
-			remote systems, their connections, and their services. Our main offering is the Remote System
-			Explorer (RSE), which integrates any sort of heterogeneous
-			remote resources under a single, consistent UI and allows transparent working on remote computers
-			just like the local one. Other offerings include lightweight terminal support.
-		</p>
-		<p>
-			<b>Latest Release:</b>
-			<a href="http://download.eclipse.org/tm/downloads/drops/R-3.0.3-200902181300/">TM 3.0.3</a>
-			[ <a href="http://download.eclipse.org/tm/downloads/drops/R-3.0.3-200902181300/">Downloads</a> 
-			| <a href="http://download.eclipse.org/tm/updates/3.0/">Update Site</a>
-			| <a href="http://download.eclipse.org/tm/downloads/drops/R-3.0.3-200902181300/buildNotes.php">Build Notes</a>
-			| <a href="/tm/development/relnotes/3.0/tm-news-3.0.html">New &amp; Noteworthy</a>
-			]
-			<br/>
-			Compatible with TM 3.0. Runs on Eclipse 3.4 (Ganymede) and Eclipse 3.3 (Europa).
-		</p>
-		<p>
-			<b>Latest Milestone:</b> 
-			<a href="http://download.eclipse.org/tm/downloads/drops/S-3.1M6-200903192015/">TM 3.1M6</a>
-			[ <a href="http://download.eclipse.org/tm/downloads/drops/S-3.1M6-200903192015/">Downloads</a> 
-			| <a href="http://download.eclipse.org/tm/updates/3.1milestones/">Update Site</a>
-			| <a href="http://download.eclipse.org/tm/downloads/drops/S-3.1M6-200903192015/buildNotes.php">Build Notes</a>
-			]
-			<br/>
-			Part of the <a href="http://wiki.eclipse.org/Galileo">Galileo</a> release train.
-		</p>
-		<p>
-			Developer phone conferences are the first Wednesday of every month, 9am PST. See the 
-			<a href="http://wiki.eclipse.org/TM/Meeting_Notes">Meeting Notes</a> on the Wiki for actual agenda and details.
-			We also maintain a 
-			<a href="http://www.google.com/calendar/embed?src=vn70im36r00qeusu8nme50cils@group.calendar.google.com&ctz=Canada/Toronto">Google Calendar</a>
-			for our meetings.
-		</p>
-
-		<h2 style="padding-top:20px">News</h2>
-		<ul>
-			<li>March 14, 2008</b>: <a href="http://tmober.blogspot.com/2008/03/target-communication-framework-tcf.html"> TCF </a> publicly announced</li>
-			<li>February 25, 2008: <a href="http://download.eclipse.org/tm/downloads/drops/R-2.0.3-200802251530/"> TM 2.0.3 </a> Service Release</li>
-			<li>February 18, 2008: <a href="http://download.eclipse.org/tm/downloads/drops/S-3.0M5-200802181400/"> TM 3.0M5 </a> released</li>
-			<li>January 7, 2008: <a href="http://download.eclipse.org/tm/downloads/drops/S-3.0M4-200801071150/"> TM 3.0M4 </a> released</li>
-		</ul>
-
-		<h2 style="padding-top:20px">Presentations</h2>
-		<p>
-			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank">Remote access with the Target Management Project</a>
-			<br/>Tutorial by Martin Oberhuber (Wind River), TM project lead
-			<br/>Given at EclipseCon 2008
-			<br/>slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt">PPT</a> 757 KB
-			| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf">PDF</a> 639 KB
-			<br/>code: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt">tcf-0.2.0.zip</a> 3.7 MB
-			| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip">tmtutorial.zip</a> 465 KB
-		</p>
-		<p>
-			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=39" target="_blank"><b>Target Management New and Noteworthy</b></a>
-			<br/>Short Talk by Martin Oberhuber (Wind River), TM project lead
-			<br/>Given at EclipseCon 2008
-			<br/>slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.ppt">PPT</a> 707 KB
-			| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.pdf">PDF</a> 581 KB
-		</p>
-		<p>
-			<a href="presentations/index.php">More...</a>
-		</p>
-
-	</div>
-	
-</div>
-
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
-
diff --git a/tm-new/presentations/index.php b/tm-new/presentations/index.php
deleted file mode 100644
index 37ee9d5..0000000
--- a/tm-new/presentations/index.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		David Dykstal
-	# Date:			2009-04-01
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Presentations";
-	$pageKeywords	= "device, target";
-	$pageAuthor		= "David Dykstal";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<h2>March 17-20, 2008: <a href="http://www.eclipsecon.org/2008"> EclipseCon 2008</a></h2> 
-		<p>
-			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank"> <b> Remote access with the Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River) (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt"> PPT </a> 757 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf"> PDF </a> 639 KB) | (code: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt"> tcf-0.2.0.zip </a> 3.7 MB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip"> tmtutorial.zip </a> 465 KB) 
-		</p>
-		<p>
-			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=39" target="_blank"> <b> Target Management New and Noteworthy</b></a>, Short Talk by Martin Oberhuber (Wind River), TM project lead (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.ppt"> PPT </a> 707 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.pdf"> PDF </a> 581 KB) 
-		</p>
-		<h2>October 9-11, 2007: Eclipse Summit Europe 2007</h2> 
-		<p>
-			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b>The Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt">PPT</a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf">PDF</a>) 
-		</p>
-		<h2>April 12, 2007: Webinar</h2> 
-		<p>
-			TM goals, architecture, future plans and online demo
-			<br />
-			<a href="http://live.eclipse.org/node/229">50 minute full recording </a>
-			<br />
-			<a href="http://www.eclipse.org/projects/slides/TM_Webinar_Slides_070412.ppt"> PPT slides</a> 
-		</p>
-		<h2>October 9-11, 2007</b>: Eclipse Summit Europe 2007</h2> 
-		<p>
-			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b> The Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt"> PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf"> PDF</a>) 
-		</p>
-		<h2>March 5-8, 2007</b>: EclipseCon 2007</h2> 
-		<p>
-			<a href="http://www.eclipsecon.org/2007/index.php?page=sub/&amp;id=3651" target="_blank"> <b> TM Tutorial </b> </a> (includes <a href="http://eclipsezilla.eclipsecon.org/php/attachment.php?bugid=3651"> slides and sample code</a>)
-			<br />
-			<a href="http://www.eclipsecon.org/2007/index.php?not_accepted=0&amp;page=sub/&amp;id=3781" target="_blank"> <b> Short Talk </b> </a> (includes <a href="http://eclipsezilla.eclipsecon.org/php/attachment.php?bugid=3781"> slides</a>) <a href="http://www.eclipsecon.org/2007/index.php?page=sub/&amp;id=4135" target="_blank"> <b> Short Demo </b> </a> (includes <a href="http://eclipsezilla.eclipsecon.org/php/attachment.php?bugid=4135"> slides</a>) 
-		</p>
-		<h2>October 11, 2006: Eclipse Summit Europe - <a href="http://www.eclipsecon.org/summiteurope2006/index.php?page=detail/&amp;id=26"> Talk by Michael Scharf on RSE</a></h2> 
-		<p>
-			TM Overview slides (<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"> PDF</a>)
-			<br />
-			DSDP Overview slides (<a href="http://www.eclipsecon.org/summiteurope2006/presentations/ESE2006_DSDP_Project_Update.pdf">PDF</a>) 
-		</p>
-		<h2>September 27, 2006: TM passed its 1.0 Release Review.</h2> 
-		<p>
-			The Slides are an interesting read for everyone (Slides as <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_1.0_Release_Review_v3.ppt"> PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_1.0_Release_Review_v3a.pdf"> PDF</a>). 
-		</p>
-	</div>
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Related Links</h6> 
-		</div>
-	</div>
-</div>
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/team/index.php b/tm-new/team/index.php
deleted file mode 100644
index 1669883..0000000
--- a/tm-new/team/index.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Martin Oberhuber
-	# Date:			2006-02-01
-	#
-	# Description: Contributors, Committers and Lead of Target Management Project
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "TM Project Contributors";
-	$pageKeywords	= "device, remote, target, contributor, committer, lead, author, developer";
-	$pageAuthor		= "Martin Oberhuber";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<div class="homeitem3col">
-		<h3>Target Management Lead</h3>
-		<li><b>Martin Oberhuber, Wind River Systems</b> (martin.oberhuber at windriver.com)<br/>
-			Martin is the overall project lead for the Target Management Project.
-			As a software developer and architect, Martin is responsible for the
-			current Target Manager component in Wind River Workbench.<br/>
-			Martin holds an MS degree in Telematics from the University
-			of Technology Graz/Austria, and has been working on source code analysis
-			and tools development since 1999.<br/>
-			<a href="http://wiki.eclipse.org/User:Moberhuber">more about Martin Oberhuber &raquo;</a>
-			</li>
-		<li><b>David Dykstal, IBM</b> (david_dykstal at us.ibm.com)<br/>
-		 	David is the Project Lead for the IBM Remote System Explorer,
-		 	and thus plays a key role in all activities around RSE.<br/>
-		 	David has worked either for or with IBM for over 28 years,
-		 	including a significant stint with Object Technology International.
-		 	Dave has worked on compilers, user interfaces, database tools, and IDE&#39;s.		
-		</div>
-
-		<div class="homeitem3col">
-		<h3>Committers (in alphabetical order)</h3>
-		<ul class="midlist">
-			<li><b>Xuan Chen</b>, IBM</li>
-			<li><b>Kevin Doyle</b>, IBM</li>
-			<li><b>David Dykstal</b>, IBM</li>
-			<li><b>David McKnight</b>, IBM</li>
-			<li><b>Javier Montalvo-Orús</b>, Symbian</li>
-			<li><b>Kushal Munir</b>, IBM</li>
-			<li><b>Martin Oberhuber</b>, Wind River</li>
-			<li><b>Michael Scharf</b>, Wind River</li>
-			<li><b>Uwe Stieber</b>, Wind River</li>
-			<li><b>Ted Williams</b>, Wind River</li>
-		</ul>
-		</div>
-
-		<div class="homeitem3col">
-		<h3>Contributors (in alphabetical order)</h3>
-		This is the list of people who have made code contributions to the 
-		TM Project on Bugzilla so far, with their code actually being 
-		merged into the TM codebase in CVS. The list is sorted alphabetically
-		by last name:
-		<ul class="midlist">
-			<li><b>Michael Berger</b>, IBM</li>
-			<li><b>Felix Burton</b>, Wind River</li>
-			<li><b>Sheldon D&acute;Souza</b>, Celunite</li>
-			<li><b>Øyvind Harboe</b>, Zylin</li>
-			<li><b>Rob Hasselbaum</b>, BEZ Systems, Inc</li>
-			<li><b>Mikhail Kalugin</b>, Xored Software</li>
-			<li><b>Yu-Fen Kuo</b>, Montavista</li>
-			<li><b>Rupen Mardirossian</b>, IBM</li>
-			<li><b>Ewa Matejska</b>, ACCESS Systems (formerly PalmSource)</li>
-			<li><b>Willian Mitsuda</b>, (private)</li>
-			<li><b>Benjamin Muskalla</b>, Innoopract</li>
-			<li><b>Tobias Schwarz</b>, Wind River</li>
-			<li><b>Remy Chi Jian Suen</b>, IBM</li>
-			<li><b>Eugene Tarassov</b>, Wind River</li>
-			<li><b>Olivier Thomann</b>, IBM</li>
-			<li><b>Lothar Werzinger</b>, Tradescape Inc.</li>
-  		</ul>
-		</div>
-
-		<div class="homeitem3col">
-		<h3>Other interested parties</h3>
-		This is the list of companies and people who have been active
-		in the TM face-to-face meetings and phone conferences so far.
-		The list is sorted alphabetically by company first, then by last name:
-		<ul class="midlist">
-			<li><b>Accelerated Technology</b>:
-			  Mark Bozeman, George Clark, Aaron Spear</li>
-			<li><b>Curtiss-Wright Controls</b>: Mark Littlefield, Darian Wong</li>
-			<li><b>Digi</b>: John Leier</li>
-			<li><b>FreeScale</b>: Kirk Beitz, John Cortell, Daymon Rogers</li>
-			<li><b>IBM Distributed Debugger</b>: Alan Boxall</li>
-			<li><b>Intel</b>: Peter Lachner</li>
-			<li><b>LANL</b>: Greg Watson</li>
-			<li><b>Montavista</b>: Joe Green, Pierre-Alexandre Masse</li>
-			<li><b>QNX</b>: David Inglis, Doug Schaefer</li>
-			<li><b>Star Bridge Systems</b>: Matthew Scarpino</li> 
-			<li><b>Symbian</b>: Victor Palau, Neil Taylor</li>
-			<li><b>TI</b>: Paul Gingrich</li> 
-			<li><b>TU Munich</b>: Tianchao Li</li> 
-			<li><b>Wind River</b>: Martin Gutschelhofer, Brian Nettleton</li>
-			<li><b>Zend Technologies</b>: Yossi Leon, Yaron Mazor</li> 
-  		</ul>
-		</div>
-	</div>
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Getting started</h6>
-			<ul>				
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
-					target="_self">TM Overview Slides</a></li>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
-				    TM 2.0 Release Review Slides</a></li>
-				<li><a
-					href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
-					target="_self">TM Use Cases Document</a></li>
-				<!-- <li><a href="/tm/development/index.php">Developer Resources</a></li> -->
-				<li><a href="/tm/doc/index.php">Developer Documents</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/templates/new_page_template.php b/tm-new/templates/new_page_template.php
deleted file mode 100644
index 93a2c7c..0000000
--- a/tm-new/templates/new_page_template.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		David Dykstal
-	# Date:			2009-04-01
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "New Page Template";
-	$pageKeywords	= "device, target";
-	$pageAuthor		= "David Dykstal";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<p>
-		Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean aliquam. Nunc pretium. Suspendisse potenti. Nullam et lorem. Mauris dui. Nulla nisi. Duis at erat. In consectetur. Ut vel quam. Nam tristique, dui vitae iaculis suscipit, urna risus iaculis purus, quis facilisis odio augue sed dui. Sed varius semper tortor. Nam rhoncus, nibh non convallis scelerisque, nulla quam egestas dui, vel tincidunt augue lectus eget nulla. Aenean condimentum pede vitae velit. Duis vulputate.
-		</p>
-		<p>
-		Etiam condimentum, lacus vel scelerisque ultrices, justo urna dictum arcu, sed luctus justo risus eget nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean convallis pharetra ante. Integer sit amet nisi sit amet mi hendrerit ornare. Praesent porttitor magna at ante. Ut tempor diam sit amet purus. Curabitur varius. Etiam mollis placerat quam. Maecenas ac massa in turpis vehicula sollicitudin. Mauris bibendum. Nulla metus orci, aliquet ut, tincidunt nec, euismod sit amet, urna.
-		</p>
-		<p>
-		Duis enim. Praesent lobortis, tellus id bibendum venenatis, odio enim posuere quam, sed blandit enim urna sit amet magna. Sed sed magna vel tellus aliquet eleifend. Integer rhoncus, ligula non porta volutpat, ipsum est commodo est, vitae vulputate risus libero ac nulla. Ut interdum urna et metus. Fusce ultricies ullamcorper dui. Maecenas arcu urna, molestie ut, semper sed, pharetra eget, dolor. Quisque sed mi ut tortor aliquam vestibulum. Mauris tristique. Morbi sit amet metus. Integer tempus purus rutrum massa. Nullam scelerisque ligula in risus. Duis egestas justo vel mi. In felis leo, tincidunt sed, tincidunt et, cursus in, nulla.
-		</p>
-	</div>
-
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Related Links</h6>
-			<ul>
-				<li><a href="">fake link</a> with an explanation of said link.</li>
-				<li><a href="">fake link</a> with an explanation of said link.</li>
-				<li><a href="">fake link</a> with an explanation of said link.</li>
-				<li><a href="">fake link</a> with an explanation of said link.</li>
-			</ul>
-		</div>
-	</div>
-
-</div>
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tm-new/tutorial/index.php b/tm-new/tutorial/index.php
deleted file mode 100644
index a02ad39..0000000
--- a/tm-new/tutorial/index.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Martin Oberhuber
-	# Date:			2006-02-01
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-	
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Getting Started with Target Management";
-	$pageKeywords	= "device, target";
-	$pageAuthor		= "Martin Oberhuber";
-	
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-	# End: page-specific settings
-	#
-		
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-<div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-
-	<p>The Target Management project creates data models and frameworks
-    to configure and manage remote systems, their connections, and their services.</p>
-    <p>
-	Our first deliverable is the <i>Remote System Explorer (RSE)</i>,
-	a framework and toolkit in Eclipse Workbench, that allows you to
-	connect and work with a variety of remote systems, including
-	<ul>
-	  <li><b>remote file systems</b> through SSH, FTP or dstore agents (seamless editing of
-	remote files including remote search and compare),</li>
-	  <li><b>remote shell access</b> (compiling with error navigation),</li>
-	  <li><b>remote process</b> handling through dstore agents,</li>
-	  <li>and <b>remote debugging</b> through CDT / gdb / gdbserver.</li>
-	</ul>
-	
-	<p>Besides that, we are working on <b>flexible, re-usable components</b>
-	 for Networking and Target Management that run integrated or without RSE.
-	The following are available from the TM 2.0 download pages 
-	already:
-	<ul>
-	  <li>Fast and Flexible DNS-SD / Zeroconf based <b>Service Discovery</b> (requires EMF)</li>
-	  <li>An ANSI / vt102 compatible <b>Terminal</b> widget with pluggable Serial, ssh and Telnet connectors 
-	    (requires Platform now but can be ported to RCP / J2ME)</li>
-	  <li>Apache <b>Commons Net</b> re-bundled for Eclipse to support FTP, rlogin, telnet
-	    and other standard protocols (requires J2SE-1.2 only)</li>
-	</ul> 
-	
-	<p>TM 2.0 as well as upcoming service releases and milestones are available
-    from our 
-	<a href="http://download.eclipse.org/tm/downloads/">
-	download site</a> as well as our 
-	<a href="http://download.eclipse.org/tm/updates/2.0/">
-	update site</a>. The best resource for programmers to get started
-	with the framework is the 
-	<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf">EclipseCon 2008 Tutorial</a>
-	(includes <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>),
-	which is based on TM 3.0M5. Another
-	<a href="http://help.eclipse.org/indigo/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html">
-	Tutorial</a> is available as part of the ISV documentation,
-	and an <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">
-	FAQ</a> is available on the project Wiki.</p>
-	<p>
-	Our plans beyond TM 2.0 are available from the
-    Target Management <a href="/tm/development/plan.php">Project Plan
-    </a> and our <a href="/tm/doc/TM_Use_Cases_v1.1c.pdf">
-    Use Cases Document</a>, which covers all areas of interest to us.</p>
-    
-	  <div class="homeitem3col">
-		<h3>For more information, see the</h3>
-    	<ul>
-    	<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
-      		Target Management Overview Slides</a>
-    	  	which include a diagram of the envisioned components and architecture for our project
-    	  	(<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</a>).
-    	  	</li>
-	    <li><a href="http://www.eclipsecon.org/2008/?page=sub/&id=39" target="_blank">
-	         <b>Target Management 3.0 New & Noteworthy</b></a>, EclipseCon 2008
-			(<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.ppt">PPT</a> 707 KB |
-			<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.pdf">PDF</a> 581 KB)
-		<li><a href="http://live.eclipse.org/node/229">TM 2.0 Webinar</a>:
-		  goals, architecture, future plans and online demo
-		  (<a href="http://live.eclipse.org/node/229">50 minute full recording</a> |
-		  <a href="http://www.eclipse.org/projects/slides/TM_Webinar_Slides_070412.ppt">PPT slides</a>)
-		  </li> 
-    	<li><a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">
-    		TM and RSE FAQ</a></li>
-		<li>EclipseCon 2008 
-		  <a href="http://www.eclipsecon.org/2008/?page=sub/&id=38" target="_blank">
-		  <b>TM 3.0 Tutorial</b></a> (includes 
-		  <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf">slides</a> and
-		  <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>)
-		</li>
-    	<li><a href="http://help.eclipse.org/indigo/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html">
-    		TM Online Docs Tutorial</a></li>
-    	<li><a href="http://wiki.eclipse.org/TM_2.0_Known_Issues_and_Workarounds">
-    		TM 2.0 Known Issues and Workarounds</a></li>
-    	<li><a href="/tm/doc/TM_Use_Cases_v1.1c.pdf">
-      		Target Management Use-Case Document</a> 
-      		to understand what scenarios we want to cover with our project.</li>
-		<li><a href="/tm/development/plan.php">
-			Target Management Project Plan</a> 
-			to understand what features and releases are coming next.</li>
-		</ul>
-	  </div>
-	</div>
-
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Getting started</h6>
-			<ul>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
-					target="_self">TM Overview Slides</a></li>
-				<li><a href="http://live.eclipse.org/node/229">TM Webinar</a>
-				    </li>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
-				    TM 2.0 Release Review Slides</a></li>
-				<li><a href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
-					target="_self">TM Use Cases Document</a></li>
-				<li><a href="http://help.eclipse.org/indigo/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html"
-					target="_self">TM 2.0 Tutorial</a></li>
-				<li><a href="/tm/development/plan.php"
-					target="_self">TM Project Plan</a></li>
-			</ul>
-		</div>
-
-</div>
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
diff --git a/tutorial/index.php b/tutorial/index.php
index 16fcd43..9ee54fd 100644
--- a/tutorial/index.php
+++ b/tutorial/index.php
@@ -59,12 +59,10 @@
 	    and other standard protocols (requires J2SE-1.2 only)</li>
 	</ul>
 	
-	<p>TM 3.0 as well as upcoming service releases and milestones are available
+	<p>TM downloads are available
     from our 
-	<a href="http://download.eclipse.org/tm/downloads/">
-	download site</a> as well as our 
-	<a href="http://download.eclipse.org/tm/updates/3.0/">
-	update site</a>. The best resource for programmers to get started
+	<a href="/tm/downloads.php">
+	download site</a>. The best resource for programmers to get started
 	with the framework is the 
 	<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf">EclipseCon 2008 Tutorial</a>
 	(includes <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>),