diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 30846a4e..9c22aa8f 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -86,7 +86,7 @@ class AssetAdmin extends LeftAndMain {
 
 		Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
 		Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/SWFUpload/swfupload.js");
+		Requirements::javascript(CMS_DIR . "/thirdparty/swfupload/swfupload.js");
 		
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js");
 		Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js");
@@ -97,9 +97,9 @@ class AssetAdmin extends LeftAndMain {
 		Requirements::customScript(<<<JS
 			_TREE_ICONS = {};
 			_TREE_ICONS['Folder'] = {
-					fileIcon: 'jsparty/tree/images/page-closedfolder.gif',
-					openFolderIcon: 'jsparty/tree/images/page-openfolder.gif',
-					closedFolderIcon: 'jsparty/tree/images/page-closedfolder.gif'
+					fileIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif',
+					openFolderIcon: 'sapphire/javascript/tree/images/page-openfolder.gif',
+					closedFolderIcon: 'sapphire/javascript/tree/images/page-closedfolder.gif'
 			};
 JS
 		);
@@ -111,14 +111,14 @@ JS
 	function uploadiframe() {
 		Requirements::clear();
 		
-		Requirements::javascript(THIRDPARTY_DIR . "/prototype.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/loader.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
+		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
+		Requirements::javascript(SAPPHIRE_DIR . "/javascript/layout_helpers.js");
 		Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/multifile/multifile.js");
-		Requirements::css(THIRDPARTY_DIR . "/multifile/multifile.css");
+		Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js");
+		Requirements::css(CMS_DIR . "/thirdparty/multifile/multifile.css");
 		Requirements::css(CMS_DIR . "/css/typography.css");
 		Requirements::css(CMS_DIR . "/css/layout.css");
 		Requirements::css(CMS_DIR . "/css/cms_left.css");
diff --git a/code/CMSMain.php b/code/CMSMain.php
index 72486c50..0aa78bf7 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -989,9 +989,9 @@ JS;
 	function canceldraftchangesdialog() {
 		Requirements::clear();
 		Requirements::css(CMS_DIR . 'css/dialog.css');
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
 		Requirements::javascript(CMS_DIR . '/javascript/dialog.js');
 
 		$message = _t('CMSMain.COPYPUBTOSTAGE',"Do you really want to copy the published content to the stage site?");
diff --git a/code/ImageEditor.php b/code/ImageEditor.php
index b0cdd2ed..4825e6f7 100644
--- a/code/ImageEditor.php
+++ b/code/ImageEditor.php
@@ -22,7 +22,7 @@ class ImageEditor extends Controller {
 	*/ 
 	public function index() {
 		Requirements::clear();
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/scriptaculous.js');
 		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Utils.js');
 		//Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageHistory.js');
@@ -37,8 +37,8 @@ class ImageEditor extends Controller {
 		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageEditor.js');
 		Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js');
 
-		Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
 		Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
 		Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css');
 
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 0ce67833..2edd4724 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -164,23 +164,23 @@ class LeftAndMain extends Controller {
 			// Firebug is a useful console for debugging javascript
 			// Its available as a Firefox extension or a javascript library
 			// for easy inclusion in other browsers (just append ?debug_firebug=1 to the URL)
-			Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebug-lite-compressed.js');
+			Requirements::javascript(THIRDPARTY_DIR . '/firebug-lite/firebug.js');
 		} else {
 			// By default, we include fake-objects for all firebug calls
 			// to avoid javascript errors when referencing console.log() etc in javascript code
-			Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebugx.js');
+			Requirements::javascript(THIRDPARTY_DIR . '/firebug-lite/firebugx.js');
 		}
 		
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/hover.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/layout_helpers.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js');
+		Requirements::javascript(CMS_DIR . '/javascript/hover.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/layout_helpers.js');
 		Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
 		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
 		
@@ -192,7 +192,7 @@ class LeftAndMain extends Controller {
 		Requirements::javascript(THIRDPARTY_DIR . '/greybox/AmiJS.js');
 		Requirements::javascript(THIRDPARTY_DIR . '/greybox/greybox.js');
 		
-		Requirements::javascript(THIRDPARTY_DIR . '/tree/tree.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/tree/tree.js');
 		Requirements::css(THIRDPARTY_DIR . '/tree/tree.css');
 		
 		Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js');
@@ -224,56 +224,56 @@ class LeftAndMain extends Controller {
 		Requirements::combine_files(
 			'assets/base.js',
 			array(
-				'jsparty/prototype.js',
-				'jsparty/behaviour.js',
-				'jsparty/prototype_improvements.js',
-				'jsparty/jquery/jquery.js',
-				'jsparty/jquery/plugins/livequery/jquery.livequery.js',
-				'jsparty/jquery/plugins/effen/jquery.fn.js',
-				'sapphire/javascript/core/jquery.ondemand.js',
-				'jsparty/jquery/jquery_improvements.js',
-				'jsparty/firebug/firebugx.js',
-				'sapphire/javascript/i18n.js',
+				THIRDPARTY_DIR . '/prototype/prototype.js',
+				THIRDPARTY_DIR . '/behaviour/behaviour.js',
+				SAPPHIRE_DIR . '/javascript/prototype_improvements.js',
+				THIRDPARTY_DIR .'/jquery/jquery.js',
+				THIRDPARTY_DIR .'/jquery-livequery/jquery.livequery.js',
+				THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js',
+				SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js',
+				SAPPHIRE_DIR . '/javascript/jquery_improvements.js',
+				THIRDPARTY_DIR . '/firebug-lite/firebugx.js',
+				SAPPHIRE_DIR . '/javascript/i18n.js',
 			)
 		);
 
 		Requirements::combine_files(
 			'assets/leftandmain.js',
 			array(
-				'jsparty/loader.js',
-				'jsparty/hover.js',
-				'jsparty/layout_helpers.js',
-				'jsparty/scriptaculous/effects.js',
-				'jsparty/scriptaculous/dragdrop.js',
-				'jsparty/scriptaculous/controls.js',
-				'jsparty/greybox/AmiJS.js',
-				'jsparty/greybox/greybox.js',
-				'cms/javascript/LeftAndMain.js',
-				'cms/javascript/LeftAndMain_left.js',
-				'cms/javascript/LeftAndMain_right.js',
-				'jsparty/tree/tree.js',
-				'jsparty/tabstrip/tabstrip.js',
-				'jsparty/SWFUpload/swfupload.js',
-				'cms/javascript/Upload.js',
-				'cms/javascript/TinyMCEImageEnhancement.js',
-				'sapphire/javascript/TreeSelectorField.js',
-		 		'cms/javascript/ThumbnailStripField.js',
+				SAPPHIRE_DIR . '/javascript/loader.js',
+				CMS_DIR . '/javascript/hover.js',
+				SAPPHIRE_DIR . '/javascript/layout_helpers.js',
+				THIRDPARTY_DIR . '/scriptaculous/effects.js',
+				THIRDPARTY_DIR . '/scriptaculous/dragdrop.js',
+				THIRDPARTY_DIR . '/scriptaculous/controls.js',
+				THIRDPARTY_DIR . '/greybox/AmiJS.js',
+				THIRDPARTY_DIR . '/greybox/greybox.js',
+				CMS_DIR . '/javascript/LeftAndMain.js',
+				CMS_DIR . '/javascript/LeftAndMain_left.js',
+				CMS_DIR . '/javascript/LeftAndMain_right.js',
+				SAPPHIRE_DIR . '/javascript/tree/tree.js',
+				THIRDPARTY_DIR . '/tabstrip/tabstrip.js',
+				CMS_DIR . '/thirdparty/swfupload/swfupload.js',
+				CMS_DIR . '/javascript/Upload.js',
+				CMS_DIR . '/javascript/TinyMCEImageEnhancement.js',
+				SAPPHIRE_DIR . '/javascript/TreeSelectorField.js',
+		 		CMS_DIR . '/javascript/ThumbnailStripField.js',
 			)
 		);
 
 		Requirements::combine_files(
 			'assets/cmsmain.js',
 			array(
-				'cms/javascript/CMSMain.js',
-				'cms/javascript/CMSMain_left.js',
-				'cms/javascript/CMSMain_right.js',
-				'cms/javascript/SideTabs.js',
-				'cms/javascript/SideReports.js',
-				'cms/javascript/LangSelector.js',
-				'cms/javascript/TranslationTab.js',
-				'jsparty/calendar/calendar.js',
-				'jsparty/calendar/lang/calendar-en.js',
-				'jsparty/calendar/calendar-setup.js',
+				CMS_DIR . '/javascript/CMSMain.js',
+				CMS_DIR . '/javascript/CMSMain_left.js',
+				CMS_DIR . '/javascript/CMSMain_right.js',
+				CMS_DIR . '/javascript/SideTabs.js',
+				CMS_DIR . '/javascript/SideReports.js',
+				CMS_DIR . '/javascript/LangSelector.js',
+				CMS_DIR . '/javascript/TranslationTab.js',
+				THIRDPARTY_DIR . '/calendar/calendar.js',
+				THIRDPARTY_DIR . '/calendar/lang/calendar-en.js',
+				THIRDPARTY_DIR . '/calendar/calendar-setup.js',
 			)
 		);
 
@@ -1073,7 +1073,6 @@ JS;
 	 */
 	public function CMSVersion() {
 		$sapphireVersionFile = file_get_contents('../sapphire/silverstripe_version');
-		$jspartyVersionFile = file_get_contents('../jsparty/silverstripe_version');
 		$cmsVersionFile = file_get_contents('../cms/silverstripe_version');
 
 		if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
@@ -1083,13 +1082,6 @@ JS;
 			$sapphireVersion = ($matches) ? $matches[1] : null;
 		}
 
-		if(strstr($jspartyVersionFile, "/jsparty/trunk")) {
-			$jspartyVersion = "trunk";
-		} else {
-			preg_match("/jsparty\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $jspartyVersionFile, $matches);
-			$jspartyVersion = ($matches) ? $matches[1] : null;
-		}
-
 		if(strstr($cmsVersionFile, "/cms/trunk")) {
 			$cmsVersion = "trunk";
 		} else {
@@ -1097,10 +1089,10 @@ JS;
 			$cmsVersion = ($matches) ? $matches[1] : null;
 		}
 
-		if($sapphireVersion == $jspartyVersion && $jspartyVersion == $cmsVersion) {
+		if($sapphireVersion == $cmsVersion) {
 			return $sapphireVersion;
 		}	else {
-			return "cms: $cmsVersion, sapphire: $sapphireVersion, jsparty: $jspartyVersion";
+			return "cms: $cmsVersion, sapphire: $sapphireVersion";
 		}
 	}
 
diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 027dce0d..cd7920f7 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -144,12 +144,12 @@ abstract class ModelAdmin extends LeftAndMain {
 		Requirements::css(CMS_DIR . '/css/silverstripe.tabs.css'); // follows the jQuery UI theme conventions
 		
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
 		//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js');
 		//Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/form/jquery.form.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/effen/jquery.fn.js');
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-form/jquery.form.js');
+		Requirements::javascript(THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js');
+		Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js');
 		Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js');
 	}
 	
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index cb374f7a..0ce89819 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -35,7 +35,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 	public function init() {
 		parent::init();
 
-		Requirements::javascript(THIRDPARTY_DIR . "/hover.js");
+		Requirements::javascript(CMS_DIR . '/javascript/hover.js');
 		Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js");
 
 		// needed for MemberTableField (Requirements not determined before Ajax-Call)
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index c34d82bc..127191b2 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -188,8 +188,8 @@ class PageCommentInterface extends RequestHandler {
 		
 		// Shall We use AJAX?
 		if(self::$use_ajax_commenting) {
-			Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
-			Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
+			Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js');
+			Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js');
 			Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js');
 			Requirements::javascript(CMS_DIR . '/javascript/PageCommentInterface.js');
 		}
diff --git a/css/cms_left.css b/css/cms_left.css
index 61421725..a2255c12 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -326,7 +326,7 @@ ul.tree span.a.children.Root span.c {
 }
 
 ul.tree span.a.Root span.c {
-	background: url(../../jsparty/tree/images/i-bottom.gif) no-repeat scroll 0 50%;
+	background: url(../../sapphire/javascript/tree/images/i-bottom.gif) no-repeat scroll 0 50%;
 }
 
 ul#sitetree.tree ul {
@@ -334,7 +334,7 @@ ul#sitetree.tree ul {
 }
 ul#sitetree.tree ul ul {
 	padding-left: 16px;
-	background: url(../../jsparty/tree/images/i-repeater.gif) repeat-y scroll 0 50%;
+	background: url(../../sapphire/javascript/tree/images/i-repeater.gif) repeat-y scroll 0 50%;
 }
 
 
diff --git a/css/silverstripe.tabs.css b/css/silverstripe.tabs.css
index 0a5decb9..b3d095d7 100644
--- a/css/silverstripe.tabs.css
+++ b/css/silverstripe.tabs.css
@@ -5,7 +5,7 @@
  * the jQuery theme format
  *
  * @todo move generic tab styles into this file
- * @todo add to silverstripe specific branch of /jsparty/jquery/ui/themes
+ * @todo add to silverstripe specific branch of /sapphire/thirdparty/jquery/ui/themes
  */
  
 /* Caution! Ensure accessibility in print and other media types... */
diff --git a/javascript/Upload.js b/javascript/Upload.js
index 88227c49..a5b51400 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -74,7 +74,7 @@ Upload.prototype = {
 				button_window_mode : "transparent",
 				button_width : this.buttonWidth,
 				button_height : this.buttonHeight,
-				flash_url : 'jsparty/SWFUpload/swfupload.swf',	// Relative to this file
+				flash_url : 'cms/thirdparty/swfupload/swfupload.swf',	// Relative to this file
 				swfupload_loaded_handler: this.buildUI.bind(this),
 				debug: false,
 				preserve_relative_urls: true
diff --git a/javascript/tinymce_ssmacron/macron.htm b/javascript/tinymce_ssmacron/macron.htm
index 1fc769e5..7c270fd3 100644
--- a/javascript/tinymce_ssmacron/macron.htm
+++ b/javascript/tinymce_ssmacron/macron.htm
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>Insert a Macron</title>
-   <script type="text/javascript" src="../tiny_mce/tiny_mce_popup.js"></script>
+   <script type="text/javascript" src="../../thirdparty/tinymce/tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/macron.js"></script>
 </head>
 <body id="charmap" style="display:none">
diff --git a/templates/Includes/ModelAdmin_left.ss b/templates/Includes/ModelAdmin_left.ss
index b5450a42..006ba86d 100755
--- a/templates/Includes/ModelAdmin_left.ss
+++ b/templates/Includes/ModelAdmin_left.ss
@@ -1,5 +1,5 @@
-<% require javascript(jsparty/tabstrip/tabstrip.js) %>
-<% require css(jsparty/tabstrip/tabstrip.css) %>
+<% require javascript(sapphire/thirdparty/tabstrip/tabstrip.js) %>
+<% require css(sapphire/thirdparty/tabstrip/tabstrip.css) %>
 
 <div id="LeftPane">
 	<div id="SearchForm_holder" class="leftbottom">