[releng] Move TM to tools - remove references to DSDP from general website
diff --git a/TM_press_text_2006_06.php b/TM_press_text_2006_06.php
index 198e9b6..ad7c9e2 100644
--- a/TM_press_text_2006_06.php
+++ b/TM_press_text_2006_06.php
@@ -48,7 +48,7 @@
 <p>For the 2.0 release planning and the longer term future, the TM project
 participants are dealing with advanced extensions to the framework in
 various technology sub-groups (see 
-<a href="http://wiki.eclipse.org/DSDP/TM">http://wiki.eclipse.org/DSDP/TM</a>).
+<a href="http://wiki.eclipse.org/TM">http://wiki.eclipse.org/TM</a>).
 Active discussions are also going on for collaboration with other Eclipse
 Projects, especially the 
  <a href="http://www.eclipse.org/cdt">CDT project</a>, the 
diff --git a/_projectCommon.php b/_projectCommon.php
index df6aec9..d9c6b21 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -91,7 +91,7 @@
 	# these are optional
 	#$Nav->addNavSeparator("Target Management", 	"/tm/index.php");
 	#$Nav->addCustomNav("About", 		"/tm/about.php", 	 "_self", 2);
-	#$Nav->addCustomNav("Downloads", 	"/dsdp/tm/downloads.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);
 
@@ -114,7 +114,7 @@
 
 	$Nav->addNavSeparator("Users", "", "_self", 2);
 	$Nav->addCustomNav("Getting Started", "/tm/tutorial/index.php", "_self", 2);
-	$Nav->addCustomNav("Downloads", "http://download.eclipse.org/dsdp/tm/downloads/index.php", "_self", 2);
+	$Nav->addCustomNav("Downloads", "http://download.eclipse.org/tm/downloads/index.php", "_self", 2);
 	$Nav->addCustomNav("FAQ (wiki)", "http://wiki.eclipse.org/TM_and_RSE_FAQ", "_self", 2);
 	$Nav->addCustomNav("Newsgroup", "http://www.eclipse.org/newsportal/thread.php?group=eclipse.dsdp.tm", "_self", 2);
 	$Nav->addCustomNav("Bugs", "/tm/bugs", "_self", 2);
@@ -127,7 +127,7 @@
 
 	$Nav->addNavSeparator("Contributors", "/tm/development/contributors.php", "_self", 2);
 	$Nav->addCustomNav("Contributing (wiki)", "http://wiki.eclipse.org/TM_and_RSE_FAQ#Working_on_TM_.2F_RSE", "_self", 2);
-	$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev", "_self", 2);
+	$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/tm-dev", "_self", 2);
 	$Nav->addCustomNav("CVS", "/tm/development/cvs_setup.php", "_self", 2);
 	$Nav->addCustomNav("Development Tools", "/tm/development/", "_self", 2);
 	$Nav->addCustomNav("Search CVS", "/$PR/searchcvs.php?q=file%3A+org.eclipse.tm%25%2F" . "+days%3A+7", "_self", 2);
diff --git a/about.php b/about.php
index fcc669a..7d98517 100644
--- a/about.php
+++ b/about.php
@@ -65,24 +65,21 @@
     is also part of our offering.</p>
     <p>
     Current releases can be downloaded for evaluation
-    <a href="http://download.eclipse.org/dsdp/tm/downloads/">here</a>.
+    <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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
+    	<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</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>
 		<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="http://wiki.eclipse.org/DSDP">
-      		DSDP Top-Level Overview Diagrams</a> to understand how the Target Management
-      		Project fits into DSDP, and what its basic building blocks are.</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>
@@ -99,16 +96,14 @@
 			<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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/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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
-			    	target="_self">DSDP Overview Diagrams</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"
diff --git a/bugs/index.php b/bugs/index.php
index 9b489c5..5e370c5 100644
--- a/bugs/index.php
+++ b/bugs/index.php
@@ -43,23 +43,23 @@
 		<div class="homeitem3col">
 			<h3>Queries</h3>
 			<ul>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit&field0-0-0=priority&type0-0-0=regexp&value0-0-0=P%5B12%5D&field0-0-1=bug_severity&type0-0-1=regexp&value0-0-1=blocker%7Ccritical%7Cmajor">
+				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit&field0-0-0=priority&type0-0-0=regexp&value0-0-0=P%5B12%5D&field0-0-1=bug_severity&type0-0-1=regexp&value0-0-1=blocker%7Ccritical%7Cmajor">
 				Open severe bugs (blocker, critical, major, P1, P2)</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=normal&cmdtype=doit">
+				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=normal&cmdtype=doit">
 				All open bugs with severity normal</a></li>
-				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=minor&bug_severity=trivial&cmdtype=doit">
+				<li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=minor&bug_severity=trivial&cmdtype=doit">
 				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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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>
 			<p>
diff --git a/development/tm_plan_3_3.xml b/development/tm_plan_3_3.xml
index 444d8fc..90f2f82 100644
--- a/development/tm_plan_3_3.xml
+++ b/development/tm_plan_3_3.xml
Binary files differ
diff --git a/development/tm_project_plan_1_0.html b/development/tm_project_plan_1_0.html
index e98aa6d..69fdc87 100644
--- a/development/tm_project_plan_1_0.html
+++ b/development/tm_project_plan_1_0.html
@@ -21,7 +21,7 @@
 </p>
 		
 <p><i>Please send comments about this draft plan to
-the </i><a href="mailto:dsdp-tm-dev@eclipse.org">dsdp-tm-dev@eclipse.org</a> <i>developer
+the </i><a href="mailto:tm-dev@eclipse.org">tm-dev@eclipse.org</a> <i>developer
 mailing list.</i></p>
 <p>This document lays out the feature and API set for the initial
 release of the Eclipse Target Management Project, 
@@ -378,8 +378,8 @@
 Eclipse Quality</a></i>: Get rid of accessing Platform <i>internal</i> packages</li>
 <li>Prepare for <a href="http://www.eclipse.org/projects/dev_process/release-review.php">
 Release Review</a> (<img src="new.gif" alt="(new)" border="0" height="12" width="12">
-Sept. 27, 2006) - slides (<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3.ppt">PPT</a> | 
-	<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3a.pdf">PDF</a>)</li>
+Sept. 27, 2006) - slides (<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>)</li>
 <li>Bugfixing</li>
 </ul>
 
diff --git a/development/tm_project_plan_2_0.html b/development/tm_project_plan_2_0.html
index 0ded2c5..9a40a8d 100644
--- a/development/tm_project_plan_2_0.html
+++ b/development/tm_project_plan_2_0.html
@@ -20,7 +20,7 @@
 previous draft of May 21, 2007</a>)
 </p>
 <p><i>Please send comments about this plan to
-the </i><a href="mailto:dsdp-tm-dev@eclipse.org">dsdp-tm-dev@eclipse.org</a> <i>developer
+the </i><a href="mailto:tm-dev@eclipse.org">tm-dev@eclipse.org</a> <i>developer
 mailing list.</i></p>
 <p>This document lays out the feature and API set for the
 next feature release of the Target Management Project
@@ -99,8 +99,8 @@
     </ul></li>
     <li><img src="new.gif" alt="(new)" border="0" height="12" width="12"/>
        TM 2.0 <a href="http://www.eclipse.org/projects/dev_process/release-review.php">Release Review</a> Slide Deck (Jun 6, 2007)
-        (<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt">PPT</a> | 
-	     <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_2.0_Release_Review.pdf">PDF</a>)</li>
+        (<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt">PPT</a> | 
+	     <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.pdf">PDF</a>)</li>
 </ul>
 Notes:
 The former experimental RSE EFS integration is scheduled to be moved
diff --git a/development/tm_project_plan_3_0.html b/development/tm_project_plan_3_0.html
index 48747c3..5920487 100644
--- a/development/tm_project_plan_3_0.html
+++ b/development/tm_project_plan_3_0.html
@@ -22,7 +22,7 @@
 -->
 </p>
 <p><i>Please send comments about this plan to
-the </i><a href="mailto:dsdp-tm-dev@eclipse.org">dsdp-tm-dev@eclipse.org</a> <i>developer
+the </i><a href="mailto:tm-dev@eclipse.org">tm-dev@eclipse.org</a> <i>developer
 mailing list.</i></p>
 <p>This document lays out the feature and API set for the
 next feature release of the Target Management Project
@@ -102,8 +102,8 @@
     <!--
     <li><img src="new.gif" alt="(new)" border="0" height="12" width="12"/>
        TM 2.0 <a href="http://www.eclipse.org/projects/dev_process/release-review.php">Release Review</a> Slide Deck (Jun 6, 2007)
-        (<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt">PPT</a> | 
-	     <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_2.0_Release_Review.pdf">PDF</a>)</li>
+        (<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt">PPT</a> | 
+	     <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.pdf">PDF</a>)</li>
 	 -->
 </ul>
 Notes:
diff --git a/doc/index.php b/doc/index.php
index f675e15..248efaf 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -7,7 +7,7 @@
 	# Author: 		Martin Oberhuber
 	# Date:			2006-02-01
 	#
-	# Description: DSDP-TM developer documents index page
+	# Description: TM developer documents index page
 	#
 	#
 	#****************************************************************************
@@ -36,7 +36,7 @@
 
     	<h2>Use Cases (your best bet to get started!)</h2>
     	<ul>
-    	<li><a href="/tm/doc/TM_Use_Cases_v1.1c.pdf">DSDP-TM Use Cases v1.1c.pdf</a></li>
+    	<li><a href="/tm/doc/TM_Use_Cases_v1.1c.pdf">TM Use Cases v1.1c.pdf</a></li>
     	<li><a href="/tm/doc/nucleus_edge_target_usecase.pdf">nucleus edge target usecase.pdf</a></li>
     	</ul>
 
@@ -51,9 +51,9 @@
 
 		<h2>Design Documents</h2>
 		<ul>
-	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Overview.ppt">DSDP-TM Overview (ppt)</a></li>
-		<li><a href="/tm/doc/DSDPTM_Design_Proposal_v0.3.pdf">DSDP-TM Design Proposal v0.3.pdf</a></li>
-		<li><a href="/tm/doc/DSDPTM_Target_Connection_Adapter_Proposal.pdf">DSDP-TM Target Connection Adapter Proposal.pdf</a></li>
+	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Overview.ppt">TM Overview (ppt)</a></li>
+		<li><a href="/tm/doc/DSDPTM_Design_Proposal_v0.3.pdf">TM Design Proposal v0.3.pdf</a></li>
+		<li><a href="/tm/doc/DSDPTM_Target_Connection_Adapter_Proposal.pdf">TM Target Connection Adapter Proposal.pdf</a></li>
 	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Brainstorming_2005-10-14.htm">Brainstorming Notes from Chicago Meeting</a></li>
 		</ul>
 
@@ -61,21 +61,21 @@
 		<ul>
 		<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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt">TM 2.0 Release Review Slides (PPT: 237k)</a>
-		   | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_2.0_Release_Review.pdf">(PDF: 300K)</a></li>
+		<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.ppt">TM 2.0 Release Review Slides (PPT: 237k)</a>
+		   | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_2.0_Release_Review.pdf">(PDF: 300K)</a></li>
     	<li>Eclipse Summit Europe 2006-9-29 
-    		<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">
+    		<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">
       		TM Overview Slides (PPT: 314k)</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">(PDF: 298k)</a></li>
-		<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3.ppt">TM 1.0 Release Review Slides (PPT: 248k)</a>
-		   | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3a.pdf">(PDF: 195K)</a></li>
+    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">(PDF: 298k)</a></li>
+		<li><a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_1.0_Release_Review_v3.ppt">TM 1.0 Release Review Slides (PPT: 248k)</a>
+		   | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_1.0_Release_Review_v3a.pdf">(PDF: 195K)</a></li>
 		<li>EclipseCon 2006: 
-		   <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-3-22_EclipseCon_Target_Management.ppt">
+		   <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2006-3-22_EclipseCon_Target_Management.ppt">
 		   Using and Extending the DSDP Target Management Framework (PPT: 850k)</a>
 		   | <a href="http://eclipsezilla.eclipsecon.org/php/attachment.php?bugid=287">(Zipped PPT: 559k)</a></li>
 		</ul>
 
-		<h2>Older Meeting Notes (Newer notes are on the <a href="http://wiki.eclipse.org/DSDP/TM">Wiki</a>)</h2>
+		<h2>Older Meeting Notes (Newer notes are on the <a href="http://wiki.eclipse.org/TM">Wiki</a>)</h2>
 		<ul>
 		<h4>CDT Conference Ottawa, 2005 October 25-26</h4>
 		<ul>
@@ -87,7 +87,7 @@
 		<li><a href="/tm/meetingnotes/ff01_chicago/2005-10-12_Chicago_TM_MeetingNotes.htm">Meeting Notes</a></li>
 	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Brainstorming_2005-10-14.htm">Brainstorming Notes</a></li>
 	    <li><a href="/tm/meetingnotes/ff01_chicago/Eclipse_IP_Due_Diligence.ppt">Eclipse IP Due Diligence (ppt)</a></li>
-	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Overview.ppt">DSDP-TM Overview (ppt)</a></li>
+	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_Overview.ppt">TM Overview (ppt)</a></li>
 	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_DD_Borderline.ppt">On the Borderline between Target Management and Debugging (ppt)</a></li>
 	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_DebuggerBackend.ppt">WR Debugger Backend Interface Proposal (ppt)</a></li>
 	    <li><a href="/tm/meetingnotes/ff01_chicago/DSDPTM_TCA.ppt">Target Connection Adapter Proposal (ppt)</a></li>
@@ -109,11 +109,11 @@
 		<div class="sideitem">
 			<h6>Getting started</h6>
 			<ul>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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/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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
 			    	target="_self">DSDP Overview Diagrams</a></li>				
diff --git a/downloads.php b/downloads.php
index aad1f9a..79a586c 100644
--- a/downloads.php
+++ b/downloads.php
@@ -7,14 +7,14 @@
 	# Author: 		Martin Oberhuber
 	# Date:			2006-02-01
 	#
-	# Description: DSDP-TM downloads page
+	# Description: TM downloads page
 	#
 	#
 	#****************************************************************************
 	
 	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "DSDP-TM Downloads";
+	$pageTitle 		= "TM Downloads";
 	$pageKeywords	= "device, target";
 	$pageAuthor		= "Martin Oberhuber";
 	
@@ -36,9 +36,9 @@
 
 		The Target Management Downloads are now available on
 		<ul>
-		<li><a href="http://download.eclipse.org/dsdp/tm/downloads/">The TM Download Site</a>
-		<li><a href="http://download.eclipse.org/dsdp/tm/updates/3.0/">The TM 3.0 Update Site</a>
-		(or legacy: <a href="http://download.eclipse.org/dsdp/tm/updates/2.0">TM 2.x update site</a>)
+		<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:
@@ -50,7 +50,7 @@
 			</li>
 		</ul>
 		<p/>
-		In addition to that, <a href="/dsdp/tm/doc/index.php">Developer Documents</a> are available for download.
+		In addition to that, <a href="/tm/doc/index.php">Developer Documents</a> are available for download.
 		<p/>
 	</div>
 	<div id="rightcolumn">
@@ -61,10 +61,8 @@
 					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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
-			    	target="_self">DSDP Overview Diagrams</a></li>				
 				<li><a
 					href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
 					target="_self">TM Use Cases Document</a></li>
diff --git a/feeds/builds-rse.xml b/feeds/builds-rse.xml
index bed48dd..b6ce5f9 100644
--- a/feeds/builds-rse.xml
+++ b/feeds/builds-rse.xml
@@ -12,21 +12,21 @@
 
   <entry>
     <title>[announce] RSE 3.0.0RC2 (S200805271940) is available</title>
-    <link href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC2-200805271940/index.php"/>
-    <id>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC2-200805271940/index.php</id>
+    <link href="http://download.eclipse.org/tm/downloads/drops/S-3.0RC2-200805271940/index.php"/>
+    <id>http://download.eclipse.org/tm/downloads/drops/S-3.0RC2-200805271940/index.php</id>
     <updated>2008-05-27T21:00:00Z</updated>
     <summary>
-      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200805271940" href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC2-200805271940/index.php" type="S" version="3.0.0">
-        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0RC2-200805271940/" log="buildlog.txt" map="directory.txt"/>
+      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200805271940" href="http://download.eclipse.org/tm/downloads/drops/S-3.0RC2-200805271940/index.php" type="S" version="3.0.0">
+        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0RC2-200805271940/" log="buildlog.txt" map="directory.txt"/>
         <update>http://download.eclipse.org/dsdp/tm/updates/3.0</update>
-        <downloads>http://download.eclipse.org/dsdp/tm/downloads/</downloads>
-        <releasenotes>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC2-200805271940/buildNotes.php
+        <downloads>http://download.eclipse.org/tm/downloads/</downloads>
+        <releasenotes>http://download.eclipse.org/tm/downloads/drops/S-3.0RC2-200805271940/buildNotes.php
           </releasenotes>
         <releases>
           <release arch="ALL" os="ALL" type="SDK" ws="ALL">RSE-SDK-3.0RC2.zip</release>
         </releases>
         <tests>
-          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0RC2-200805271940/testResults.php" type="junit">
+          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0RC2-200805271940/testResults.php" type="junit">
             <result arch="ALL" os="ALL" ws="ALL">PASS</result>
           </test>
         </tests>
@@ -44,21 +44,21 @@
 
   <entry>
     <title>[announce] RSE 3.0.0RC1 (S200805211446) is available</title>
-    <link href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC1-200805211446/index.php"/>
-    <id>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC1-200805211446/index.php</id>
+    <link href="http://download.eclipse.org/tm/downloads/drops/S-3.0RC1-200805211446/index.php"/>
+    <id>http://download.eclipse.org/tm/downloads/drops/S-3.0RC1-200805211446/index.php</id>
     <updated>2008-05-21T16:00:00Z</updated>
     <summary>
-      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200805211446" href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC1-200805211446/index.php" type="S" version="3.0.0">
-        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0RC1-200805211446/" log="buildlog.txt" map="directory.txt"/>
+      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200805211446" href="http://download.eclipse.org/tm/downloads/drops/S-3.0RC1-200805211446/index.php" type="S" version="3.0.0">
+        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0RC1-200805211446/" log="buildlog.txt" map="directory.txt"/>
         <update>http://download.eclipse.org/dsdp/tm/updates/3.0</update>
-        <downloads>http://download.eclipse.org/dsdp/tm/downloads/</downloads>
-        <releasenotes>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0RC1-200805211446/buildNotes.php
+        <downloads>http://download.eclipse.org/tm/downloads/</downloads>
+        <releasenotes>http://download.eclipse.org/tm/downloads/drops/S-3.0RC1-200805211446/buildNotes.php
           </releasenotes>
         <releases>
           <release arch="ALL" os="ALL" type="SDK" ws="ALL">RSE-SDK-3.0RC1.zip</release>
         </releases>
         <tests>
-          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0RC1-200805211446/testResults.php" type="junit">
+          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0RC1-200805211446/testResults.php" type="junit">
             <result arch="ALL" os="ALL" ws="ALL">PASS</result>
           </test>
         </tests>
@@ -76,21 +76,21 @@
 
   <entry>
     <title>[announce] RSE 3.0.0M7 (S200805081345) is available</title>
-    <link href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M7-200805081345/index.php"/>
-    <id>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M7-200805081345/index.php</id>
+    <link href="http://download.eclipse.org/tm/downloads/drops/S-3.0M7-200805081345/index.php"/>
+    <id>http://download.eclipse.org/tm/downloads/drops/S-3.0M7-200805081345/index.php</id>
     <updated>2008-05-08T16:00:00Z</updated>
     <summary>
-      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200805081345" href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M7-200805081345/index.php" type="S" version="3.0.0">
-        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M7-200805081345/" log="buildlog.txt" map="directory.txt"/>
+      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200805081345" href="http://download.eclipse.org/tm/downloads/drops/S-3.0M7-200805081345/index.php" type="S" version="3.0.0">
+        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M7-200805081345/" log="buildlog.txt" map="directory.txt"/>
         <update>http://download.eclipse.org/dsdp/tm/updates/3.0</update>
-        <downloads>http://download.eclipse.org/dsdp/tm/downloads/</downloads>
-        <releasenotes>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M7-200805081345/buildNotes.php
+        <downloads>http://download.eclipse.org/tm/downloads/</downloads>
+        <releasenotes>http://download.eclipse.org/tm/downloads/drops/S-3.0M7-200805081345/buildNotes.php
           </releasenotes>
         <releases>
           <release arch="ALL" os="ALL" type="SDK" ws="ALL">RSE-SDK-3.0M7.zip</release>
         </releases>
         <tests>
-          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M7-200805081345/testResults.php" type="junit">
+          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M7-200805081345/testResults.php" type="junit">
             <result arch="ALL" os="ALL" ws="ALL">PASS</result>
           </test>
         </tests>
@@ -108,21 +108,21 @@
 
   <entry>
     <title>[announce] RSE 3.0.0M6 (S200804112145) is available</title>
-    <link href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M6-200804112145/index.php"/>
-    <id>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M6-200804112145/index.php</id>
+    <link href="http://download.eclipse.org/tm/downloads/drops/S-3.0M6-200804112145/index.php"/>
+    <id>http://download.eclipse.org/tm/downloads/drops/S-3.0M6-200804112145/index.php</id>
     <updated>2008-04-12T08:00:00Z</updated>
     <summary>
-      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200804112145" href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M6-200804112145/index.php" type="S" version="3.0.0">
-        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M6-200804112145/" log="buildlog.txt" map="directory.txt"/>
+      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200804112145" href="http://download.eclipse.org/tm/downloads/drops/S-3.0M6-200804112145/index.php" type="S" version="3.0.0">
+        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M6-200804112145/" log="buildlog.txt" map="directory.txt"/>
         <update>http://download.eclipse.org/dsdp/tm/updates/3.0</update>
-        <downloads>http://download.eclipse.org/dsdp/tm/downloads/</downloads>
-        <releasenotes>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M6-200804112145/buildNotes.php
+        <downloads>http://download.eclipse.org/tm/downloads/</downloads>
+        <releasenotes>http://download.eclipse.org/tm/downloads/drops/S-3.0M6-200804112145/buildNotes.php
           </releasenotes>
         <releases>
           <release arch="ALL" os="ALL" type="SDK" ws="ALL">RSE-SDK-3.0M6.zip</release>
         </releases>
         <tests>
-          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M6-200804112145/testResults.php" type="junit">
+          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M6-200804112145/testResults.php" type="junit">
             <result arch="ALL" os="ALL" ws="ALL">PASS</result>
           </test>
         </tests>
@@ -140,21 +140,21 @@
 
   <entry>
     <title>[announce] RSE 3.0.0M5 (S200802181400) is available</title>
-    <link href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M5-200802181400/index.php"/>
-    <id>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M5-200802181400/index.php</id>
+    <link href="http://download.eclipse.org/tm/downloads/drops/S-3.0M5-200802181400/index.php"/>
+    <id>http://download.eclipse.org/tm/downloads/drops/S-3.0M5-200802181400/index.php</id>
     <updated>2008-02-18T14:50:00Z</updated>
     <summary>
-      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200802181450" href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M5-200802181400/index.php" type="S" version="3.0.0">
-        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M5-200802181400/" log="buildlog.txt" map="directory.txt"/>
+      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200802181450" href="http://download.eclipse.org/tm/downloads/drops/S-3.0M5-200802181400/index.php" type="S" version="3.0.0">
+        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M5-200802181400/" log="buildlog.txt" map="directory.txt"/>
         <update>http://download.eclipse.org/dsdp/tm/updates/3.0</update>
-        <downloads>http://download.eclipse.org/dsdp/tm/downloads/</downloads>
-        <releasenotes>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M5-200802181400/buildNotes.php
+        <downloads>http://download.eclipse.org/tm/downloads/</downloads>
+        <releasenotes>http://download.eclipse.org/tm/downloads/drops/S-3.0M5-200802181400/buildNotes.php
           </releasenotes>
         <releases>
           <release arch="ALL" os="ALL" type="SDK" ws="ALL">RSE-SDK-3.0M5.zip</release>
         </releases>
         <tests>
-          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M5-200802181400/testResults.php" type="junit">
+          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M5-200802181400/testResults.php" type="junit">
             <result arch="ALL" os="ALL" ws="ALL">PASS</result>
           </test>
         </tests>
@@ -171,21 +171,21 @@
   </entry>
   <entry>
     <title>[announce] RSE 3.0.0M4 (S200801071150) is available</title>
-    <link href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M4-200801071150/index.php"/>
-    <id>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M4-200801071150/index.php</id>
+    <link href="http://download.eclipse.org/tm/downloads/drops/S-3.0M4-200801071150/index.php"/>
+    <id>http://download.eclipse.org/tm/downloads/drops/S-3.0M4-200801071150/index.php</id>
     <updated>2008-01-07T12:50:00Z</updated>
     <summary>
-      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200801071150" href="http://www.eclipse.org/dsdp/tm/downloads/?project=rse&amp;showAll=1&amp;hlbuild=S200801071150#S200801071150" type="S" version="3.0.0">
-        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M4-200801071150/" log="buildlog.txt" map="directory.txt"/>
+      <build xmlns="http://www.eclipse.org/2006/BuildFeed" branch="HEAD" datetime="200801071150" href="http://www.eclipse.org/tm/downloads/?project=rse&amp;showAll=1&amp;hlbuild=S200801071150#S200801071150" type="S" version="3.0.0">
+        <detail config="build.cfg" href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M4-200801071150/" log="buildlog.txt" map="directory.txt"/>
         <update>http://download.eclipse.org/dsdp/tm/updates/3.0/</update>
-        <downloads>http://download.eclipse.org/dsdp/tm/downloads/</downloads>
-        <releasenotes>http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M4-200801071150/buildNotes.php
+        <downloads>http://download.eclipse.org/tm/downloads/</downloads>
+        <releasenotes>http://download.eclipse.org/tm/downloads/drops/S-3.0M4-200801071150/buildNotes.php
           </releasenotes>
         <releases>
           <release arch="ALL" os="ALL" type="SDK" ws="ALL">RSE-SDK-3.0M4.zip</release>
         </releases>
         <tests>
-          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/dsdp/tm/downloads/drops/S-3.0M4-200801071150/testResults.php" type="junit">
+          <test href="http://www.eclipse.org/downloads/download.php?r=1&amp;file=/tm/downloads/drops/S-3.0M4-200801071150/testResults.php" type="junit">
             <result arch="ALL" os="ALL" ws="ALL">PASS</result>
           </test>
         </tests>
diff --git a/index.php b/index.php
index 3ee6b18..1c39354 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
 	# Author: 		Martin Oberhuber
 	# Date:			2006-02-01
 	#
-	# Description: DSDP-TM main page
+	# Description: TM main page
 	#
 	#
 	#****************************************************************************
@@ -61,10 +61,10 @@
         remote VNC display and other uses.</p>
 
 		<p><font size="+2"><b>Latest Release:</b> 
-		<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.2.1-201009070720/">
+		<a href="http://download.eclipse.org/tm/downloads/drops/R-3.2.1-201009070720/">
 		TM 3.2.1</a></font>
-		[<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.2.1-201009070720/">downloads</a> 
-		| <a href="http://download.eclipse.org/dsdp/tm/updates/3.2/">update site</a>
+		[<a href="http://download.eclipse.org/tm/downloads/drops/R-3.2.1-201009070720/">downloads</a> 
+		| <a href="http://download.eclipse.org/tm/updates/3.2/">update site</a>
 		| <a href="/tm/development/relnotes/3.2/readme_tm_3.2.html">release notes</a>
 		]<br/>
 		The TM 3.2.1 service release includes 22 bug fixes compared to TM 3.2. 
@@ -75,18 +75,18 @@
 		for more information.</p>
 
 		<p><font size="+0"><b>Latest Milestone:</b> 
-		<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.3M4-201012140730/">
+		<a href="http://download.eclipse.org/tm/downloads/drops/S-3.3M4-201012140730/">
 		TM 3.3M4</a></font>
-		[<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.3M4-201012140730/">downloads</a> 
-		| <a href="http://download.eclipse.org/dsdp/tm/updates/3.3milestones/">update site</a>
-		| <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.3M4-201012140730/buildNotes.php">
+		[<a href="http://download.eclipse.org/tm/downloads/drops/S-3.3M4-201012140730/">downloads</a> 
+		| <a href="http://download.eclipse.org/tm/updates/3.3milestones/">update site</a>
+		| <a href="http://download.eclipse.org/tm/downloads/drops/S-3.3M4-201012140730/buildNotes.php">
 		build notes</a>]<br/>
 		TM 3.3M4 contains a new SCP file subsystem, and several bug fixes. See the 
-		<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.3M4-201012140730/buildNotes.php">
+		<a href="http://download.eclipse.org/tm/downloads/drops/S-3.3M4-201012140730/buildNotes.php">
 		build notes</a> for new&amp;noteworthy and more information.
 		<!-- TODO Enable for ramp-down
 		<br/>
-		With M7, the <a href="http://wiki.eclipse.org/DSDP/TM/3.2_Ramp_down_Plan">
+		With M7, the <a href="http://wiki.eclipse.org/TM/3.2_Ramp_down_Plan">
 		Ramp-down phase</a> of release candidates towards
 		the TM 3.2 release with Helios end of June has been entered.
 		-->
@@ -104,19 +104,19 @@
 		<div class="homeitem">
 			<h3>Quick Links</h3>
 				<ul class="midlist">
-					<li><a href="http://wiki.eclipse.org/DSDP/TM" target="_blank"><b>Wiki</b></a> | We use the Wiki extensively for collaboration. Find ongoing discussions, meeting notes and other "not so official" stuff there.</li>
-					<li><a href="news://news.eclipse.org/eclipse.dsdp.tm" target="_blank"><b>Newsgroup</b></a> | For general questions and community discussion (<a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.dsdp.tm">Web access</a>, <a href="http://dev.eclipse.org/newslists/news.eclipse.dsdp.tm/maillist.html">archive</a>).</li>
-					<li><a href="http://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev" target="_blank"><b>Mailing List</b></a> | For project development discussions.</li>
+					<li><a href="http://wiki.eclipse.org/TM" target="_blank"><b>Wiki</b></a> | We use the Wiki extensively for collaboration. Find ongoing discussions, meeting notes and other "not so official" stuff there.</li>
+					<li><a href="news://news.eclipse.org/eclipse.tm" target="_blank"><b>Newsgroup</b></a> | For general questions and community discussion (<a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.dsdp.tm">Web access</a>, <a href="http://dev.eclipse.org/newslists/news.eclipse.dsdp.tm/maillist.html">archive</a>).</li>
+					<li><a href="http://dev.eclipse.org/mailman/listinfo/tm-dev" target="_blank"><b>Mailing List</b></a> | For project development discussions.</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&classification=DSDP&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit">all open</a> issues
+					   | 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</a></li>
-			    	<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
+			    	<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  				| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</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>
 					<li><a href="/tm/development/plan.php"><b>TM Project Plan</b></a></li>
 					<li><a href="/dsdp/dsdp-charter.php"><b>DSDP Project Charter</b></a></li>
@@ -125,7 +125,7 @@
 			<h3>Events</h3>
 			<ul class="midlist">
 				<li>Monthly developer phone conference, every 1st wednesday of the month, 9am PST
-				    (See the <a href="http://wiki.eclipse.org/DSDP/TM">Wiki</a> for actual
+				    (See the <a href="http://wiki.eclipse.org/TM">Wiki</a> for actual
 				    agenda and details)</li>
 				<li>
 				  <b>March 22-25, 2010</b>: <a href="http://www.eclipsecon.org/2010">EclipseCon 2010</a> - <ul>
@@ -137,16 +137,16 @@
 				    <li><a href="http://www.eclipsecon.org/2008/?page=sub/&id=38" target="_blank">
 				         <b>Remote access with the DSDP Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River)
 						(slides:  
-						<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_ECon08.ppt">PPT</a> 757 KB |
-						<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf">PDF</a> 639 KB) |
+						<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=/dsdp/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=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip">tmtutorial.zip</a> 465 KB)</li>
+						<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)</li>
 				    <li><a href="http://www.eclipsecon.org/2008/?page=sub/&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=/dsdp/tm/presentations/TM_Short_ECon08.ppt">PPT</a> 707 KB |
-						<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Short_ECon08.pdf">PDF</a> 581 KB)
+						<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)
 					</ul></li>
 				<li><b>March 14, 2008</b>: <a href="http://tmober.blogspot.com/2008/03/target-communication-framework-tcf.html">TCF</a>
 					publicly announced</li>
@@ -155,8 +155,8 @@
 				    <li><a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&id=21" target="_blank">
 				         <b>The DSDP Target Management Project</b></a>, long talk by Martin Oberhuber
 				         (slides:  
-				         <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2007-10-10_TM_ESE2007.ppt">PPT</a> |
-				         <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2007-10-10_TM_ESE2007.pdf">PDF</a>)
+				         <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>)
 				         </li>
 				    </ul></li>
 				<li><b>April 12, 2007</b>: 
@@ -167,8 +167,8 @@
 				  </li> 
 				<li><b>Sept. 27, 2006</b>: TM passed its 1.0 Release Review. The Slides are an interesting read
 				    for everyone (Slides as  
-				    <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3.ppt">PPT</a> | 
-				    <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3a.pdf">PDF</a>).</li>
+				    <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>).</li>
 			</ul>
 		</div>
 	</div>
@@ -179,7 +179,7 @@
 			<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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://eclipse.org/project-slides/Helios/TM_Helios_Release.pdf" target="_self">
@@ -189,7 +189,7 @@
 				<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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html"
@@ -203,9 +203,9 @@
 		
 		<div class="sideitem">
 			<h6>What's New</h6>
-			<ul><li>Sep 24th: <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.2.1-201009070720/">TM 3.2.1</a> released</li>
-			    <li>Jun 23rd: <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.2-201006071030/">TM 3.2</a> released</li>
-			    <li>Feb 26th: <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.1.2-201002152323/">TM 3.1.2</a> released</li>
+			<ul><li>Sep 24th: <a href="http://download.eclipse.org/tm/downloads/drops/R-3.2.1-201009070720/">TM 3.2.1</a> released</li>
+			    <li>Jun 23rd: <a href="http://download.eclipse.org/tm/downloads/drops/R-3.2-201006071030/">TM 3.2</a> released</li>
+			    <li>Feb 26th: <a href="http://download.eclipse.org/tm/downloads/drops/R-3.1.2-201002152323/">TM 3.1.2</a> released</li>
 			    <li>Mar 17th: <a href="http://www.eclipsecon.org/2008/?page=sub/&id=38" target="_blank">TM Tutorial</a> at EclipseCon</li>
 			    <li>Mar 14th: <a href="http://tmober.blogspot.com/2008/03/target-communication-framework-tcf.html">TCF</a> publicly announced</li>
 				<li>Apr 12th: 63 people registered at <a href="http://live.eclipse.org/node/229">TM Webinar</a></li>
diff --git a/rse/build/_common.php b/rse/build/_common.php
index bec258b..ce72a6e 100644
--- a/rse/build/_common.php
+++ b/rse/build/_common.php
@@ -14,8 +14,8 @@
 		"3.0.0=HEAD,/opt/JDKs/i386/ibm-java2-i386-60-0.0",
 		
 		"build.eclipse.org=------------,------------",
-		"3.0.0=HEAD,/shared/dsdp/JDKs/ppc/IBMJava2-ppc-142-10.0",
-		"3.0.0=HEAD,/shared/dsdp/JDKs/ppc/ibm-java2-ppc-50-6.0",
+		"3.0.0=HEAD,/shared/tools/tm/JDKs/ppc/IBMJava2-ppc-142-10.0",
+		"3.0.0=HEAD,/shared/tools/tm/JDKs/ppc/ibm-java2-ppc-50-6.0",
 		"3.0.0=HEAD,/shared/common/ibm-java-ppc-60"
 	),
 	
diff --git a/tm-new/_projectCommon.php b/tm-new/_projectCommon.php
index 7a53ee0..e68abb2 100644
--- a/tm-new/_projectCommon.php
+++ b/tm-new/_projectCommon.php
@@ -11,7 +11,7 @@
 	# these are optional
 	#$Nav->addNavSeparator("Target Management", 	"/tm/index.php");
 	#$Nav->addCustomNav("About", 		"/tm/about.php", 	 "_self", 2);
-	#$Nav->addCustomNav("Downloads", 	"/dsdp/tm/downloads.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);
 
@@ -32,19 +32,19 @@
 	$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/DSDP/TM", "_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=dsdp.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", "/dsdp/tm/tm-new/downloads/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.dsdp.tm/maillist.html", "_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/dsdp-tm-dev", "_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
index 92fcfe9..0d7a093 100644
--- a/tm-new/about/index.php
+++ b/tm-new/about/index.php
@@ -65,24 +65,21 @@
     is also part of our offering.</p>
     <p>
     Current releases can be downloaded for evaluation
-    <a href="http://download.eclipse.org/dsdp/tm/downloads/">here</a>.
+    <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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
+    	<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</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>
 		<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="http://wiki.eclipse.org/DSDP">
-      		DSDP Top-Level Overview Diagrams</a> to understand how the Target Management
-      		Project fits into DSDP, and what its basic building blocks are.</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>
@@ -99,14 +96,12 @@
 			<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
-			    	target="_self">DSDP Overview Diagrams</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"
diff --git a/tm-new/bugs/index.php b/tm-new/bugs/index.php
index 5e7bfba..8499bb3 100644
--- a/tm-new/bugs/index.php
+++ b/tm-new/bugs/index.php
@@ -43,21 +43,21 @@
 		<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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=&classification=DSDP&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=">
+				<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>
diff --git a/tm-new/downloads/index.php b/tm-new/downloads/index.php
index aad1f9a..6faf456 100755
--- a/tm-new/downloads/index.php
+++ b/tm-new/downloads/index.php
@@ -7,15 +7,15 @@
 	# Author: 		Martin Oberhuber
 	# Date:			2006-02-01
 	#
-	# Description: DSDP-TM downloads page
+	# Description: TM downloads page
 	#
 	#
 	#****************************************************************************
 	
 	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "DSDP-TM Downloads";
-	$pageKeywords	= "device, target";
+	$pageTitle 		= "TM Downloads";
+	$pageKeywords	= "device, remote, target";
 	$pageAuthor		= "Martin Oberhuber";
 	
 	# Add page-specific Nav bars here
@@ -36,9 +36,9 @@
 
 		The Target Management Downloads are now available on
 		<ul>
-		<li><a href="http://download.eclipse.org/dsdp/tm/downloads/">The TM Download Site</a>
-		<li><a href="http://download.eclipse.org/dsdp/tm/updates/3.0/">The TM 3.0 Update Site</a>
-		(or legacy: <a href="http://download.eclipse.org/dsdp/tm/updates/2.0">TM 2.x update site</a>)
+		<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:
@@ -50,7 +50,7 @@
 			</li>
 		</ul>
 		<p/>
-		In addition to that, <a href="/dsdp/tm/doc/index.php">Developer Documents</a> are available for download.
+		In addition to that, <a href="/tm/doc/index.php">Developer Documents</a> are available for download.
 		<p/>
 	</div>
 	<div id="rightcolumn">
@@ -61,10 +61,8 @@
 					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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
-			    	target="_self">DSDP Overview Diagrams</a></li>				
 				<li><a
 					href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
 					target="_self">TM Use Cases Document</a></li>
diff --git a/tm-new/index.php b/tm-new/index.php
index 3584999..61fd0a2 100644
--- a/tm-new/index.php
+++ b/tm-new/index.php
@@ -9,7 +9,7 @@
 	# Updated: 		2008-01-25
 	# Updated:      2009-01-25 dwd
 	#
-	# Description: DSDP-TM main page
+	# Description: TM main page
 	#
 	#****************************************************************************
 	
@@ -48,7 +48,7 @@
 				</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&classification=DSDP&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit">all open</a> issues
+					| 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>
@@ -56,9 +56,9 @@
 					<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"><b>Architectural Overview</b></a>
-    	  			(<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  			| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</a>).
+			    	<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>
@@ -74,10 +74,10 @@
 		</p>
 		<p>
 			<b>Latest Release:</b>
-			<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.0.3-200902181300/">TM 3.0.3</a>
-			[ <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.0.3-200902181300/">Downloads</a> 
-			| <a href="http://download.eclipse.org/dsdp/tm/updates/3.0/">Update Site</a>
-			| <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.0.3-200902181300/buildNotes.php">Build Notes</a>
+			<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/>
@@ -85,10 +85,10 @@
 		</p>
 		<p>
 			<b>Latest Milestone:</b> 
-			<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.1M6-200903192015/">TM 3.1M6</a>
-			[ <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.1M6-200903192015/">Downloads</a> 
+			<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/dsdp/tm/updates/3.1milestones/">Update Site</a>
-			| <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.1M6-200903192015/buildNotes.php">Build Notes</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.
@@ -104,9 +104,9 @@
 		<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/dsdp/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/dsdp/tm/downloads/drops/S-3.0M5-200802181400/"> TM 3.0M5 </a> released</li>
-			<li>January 7, 2008: <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M4-200801071150/"> TM 3.0M4 </a> released</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>
@@ -114,17 +114,17 @@
 			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank">Remote access with the DSDP 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=/dsdp/tm/presentations/TM_Tutorial_ECon08.ppt">PPT</a> 757 KB
-			| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf">PDF</a> 639 KB
-			<br/>code: <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip">tmtutorial.zip</a> 465 KB
+			<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=/dsdp/tm/presentations/TM_Short_ECon08.ppt">PPT</a> 707 KB
-			| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Short_ECon08.pdf">PDF</a> 581 KB
+			<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>
diff --git a/tm-new/presentations/index.php b/tm-new/presentations/index.php
index e5328b3..376f37c 100644
--- a/tm-new/presentations/index.php
+++ b/tm-new/presentations/index.php
@@ -34,14 +34,14 @@
 		<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 DSDP Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River) (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_ECon08.ppt"> PPT </a> 757 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf"> PDF </a> 639 KB) | (code: <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/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=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip"> tmtutorial.zip </a> 465 KB) 
+			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank"> <b> Remote access with the DSDP 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=/dsdp/tm/presentations/TM_Short_ECon08.ppt"> PPT </a> 707 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Short_ECon08.pdf"> PDF </a> 581 KB) 
+			<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 DSDP Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2007-10-10_TM_ESE2007.ppt">PPT</a> | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2007-10-10_TM_ESE2007.pdf">PDF</a>) 
+			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b>The DSDP 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>
@@ -53,7 +53,7 @@
 		</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 DSDP Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2007-10-10_TM_ESE2007.ppt"> PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2007-10-10_TM_ESE2007.pdf"> PDF</a>) 
+			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b> The DSDP 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>
@@ -63,13 +63,13 @@
 		</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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"> PDF</a>)
+			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=/dsdp/tm/presentations/TM_1.0_Release_Review_v3.ppt"> PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_1.0_Release_Review_v3a.pdf"> PDF</a>). 
+			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">
diff --git a/tm-new/team/index.php b/tm-new/team/index.php
index 563db95..1669883 100644
--- a/tm-new/team/index.php
+++ b/tm-new/team/index.php
@@ -14,8 +14,8 @@
 	
 	#
 	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "DSDP-TM Project Contributors";
-	$pageKeywords	= "device, target, contributor, committer, lead, author, developer";
+	$pageTitle 		= "TM Project Contributors";
+	$pageKeywords	= "device, remote, target, contributor, committer, lead, author, developer";
 	$pageAuthor		= "Martin Oberhuber";
 	
 	# Add page-specific Nav bars here
@@ -36,8 +36,7 @@
 		<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,
-			and in this role he also serves on the DSDP Project Management Council (PMC).
+			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
@@ -124,12 +123,10 @@
 		<div class="sideitem">
 			<h6>Getting started</h6>
 			<ul>				
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
-			    	target="_self">DSDP Overview Diagrams</a></li>				
 				<li><a
 					href="/tm/doc/TM_Use_Cases_v1.1c.pdf"
 					target="_self">TM Use Cases Document</a></li>
diff --git a/tm-new/tutorial/index.php b/tm-new/tutorial/index.php
index 1884fdc..4d2c650 100644
--- a/tm-new/tutorial/index.php
+++ b/tm-new/tutorial/index.php
@@ -62,13 +62,13 @@
 	
 	<p>TM 2.0 as well as upcoming service releases and milestones are available
     from our 
-	<a href="http://download.eclipse.org/dsdp/tm/downloads/">
+	<a href="http://download.eclipse.org/tm/downloads/">
 	download site</a> as well as our 
-	<a href="http://download.eclipse.org/dsdp/tm/updates/2.0/">
+	<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=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf">EclipseCon 2008 Tutorial</a>
-	(includes <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>),
+	<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://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html">
 	Tutorial</a> is available as part of the ISV documentation,
@@ -83,16 +83,16 @@
 	  <div class="homeitem3col">
 		<h3>For more information, see the</h3>
     	<ul>
-    	<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
+    	<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</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>
 	    <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=/dsdp/tm/presentations/TM_Short_ECon08.ppt">PPT</a> 707 KB |
-			<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Short_ECon08.pdf">PDF</a> 581 KB)
+			(<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> |
@@ -103,16 +103,13 @@
 		<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=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf">slides</a> and
-		  <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>)
+		  <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://dsdp.eclipse.org/help/latest/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="http://wiki.eclipse.org/DSDP">
-      		DSDP Top-Level Overview Diagrams</a> to understand how the Target Management
-      		Project fits into DSDP, and what its basic building blocks are.</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>
@@ -127,14 +124,12 @@
 		<div class="sideitem">
 			<h6>Getting started</h6>
 			<ul>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
-			    	target="_self">DSDP Overview Diagrams</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://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html"
diff --git a/tutorial/index.php b/tutorial/index.php
index ca2b5a9..90a2252 100644
--- a/tutorial/index.php
+++ b/tutorial/index.php
@@ -64,13 +64,13 @@
 	
 	<p>TM 3.0 as well as upcoming service releases and milestones are available
     from our 
-	<a href="http://download.eclipse.org/dsdp/tm/downloads/">
+	<a href="http://download.eclipse.org/tm/downloads/">
 	download site</a> as well as our 
 	<a href="http://download.eclipse.org/dsdp/tm/updates/3.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=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf">EclipseCon 2008 Tutorial</a>
-	(includes <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>),
+	<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://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html">
 	Tutorial</a> is available as part of the ISV documentation,
@@ -85,16 +85,16 @@
 	  <div class="homeitem3col">
 		<h3>For more information, see the</h3>
     	<ul>
-    	<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">
+    	<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=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.ppt">PPT</a>
-    	  	| <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf">PDF</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>
 	    <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=/dsdp/tm/presentations/TM_Short_ECon08.ppt">PPT</a> 707 KB |
-			<a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Short_ECon08.pdf">PDF</a> 581 KB)
+			(<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> |
@@ -105,16 +105,13 @@
 		<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=/dsdp/tm/presentations/TM_Tutorial_ECon08.pdf">slides</a> and
-		  <a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/TM_Tutorial_Econ08_samples.zip">sample code</a>)
+		  <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://dsdp.eclipse.org/help/latest/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_3.0_Known_Issues_and_Workarounds">
     		TM 3.0 Known Issues and Workarounds</a></li>
-    	<li><a href="http://wiki.eclipse.org/DSDP">
-      		DSDP Top-Level Overview Diagrams</a> to understand how the Target Management
-      		Project fits into DSDP, and what its basic building blocks are.</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>
@@ -129,13 +126,13 @@
 		<div class="sideitem">
 			<h6>Getting started</h6>
 			<ul>
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/presentations/2006-9-29_SummitEurope_TMOverview.pdf"
+				<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/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=/dsdp/tm/presentations/TM_2.0_Release_Review.ppt" target="_self">
+				<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="http://wiki.eclipse.org/DSDP" 
 			    	target="_self">DSDP Overview Diagrams</a></li>