diff --git a/Gruntfile.js b/Gruntfile.js
index 386b2a238..c357feb66 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -218,25 +218,25 @@ grunt.initConfig({
 	},
 
 	bowercopy: {
-		options: {
-			clean: true
-		},
-		qunit: {
+		all: {
+			options: {
+				clean: true,
+				destPrefix: "external"
+			},
 			files: {
-				"external": "qunit/qunit"
+				"qunit/qunit.js": "qunit/qunit/qunit.js",
+				"qunit/qunit.css": "qunit/qunit/qunit.css",
+				"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
+
+				"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
+
+				"jshint/jshint.js": "jshint/dist/jshint.js",
+				"jshint/LICENSE": "jshint/LICENSE",
+
+				"jquery/jquery.js": "jquery/jquery.js",
+				"jquery/MIT-LICENSE.txt": "jquery/MIT-LICENSE.txt"
 			}
-		},
-		mousewheel: {
-			files: {
-				"external": "jquery-mousewheel/jquery.mousewheel.js"
-			}
-		},
-		jshint: {
-			files: {
-				"external": "jshint/dist/jshint.js"
-			}
-		},
-		"jquery.js": "jquery/dist/jquery.js"
+		}
 	}
 });
 
diff --git a/demos/accordion/collapsible.html b/demos/accordion/collapsible.html
index 3eaa3c468..8002e6556 100644
--- a/demos/accordion/collapsible.html
+++ b/demos/accordion/collapsible.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Collapse content</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/accordion.js"></script>
diff --git a/demos/accordion/custom-icons.html b/demos/accordion/custom-icons.html
index 9603627da..91ca4543a 100644
--- a/demos/accordion/custom-icons.html
+++ b/demos/accordion/custom-icons.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Customize icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/accordion.js"></script>
diff --git a/demos/accordion/default.html b/demos/accordion/default.html
index 0720bf581..e5476378b 100644
--- a/demos/accordion/default.html
+++ b/demos/accordion/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/accordion.js"></script>
diff --git a/demos/accordion/fillspace.html b/demos/accordion/fillspace.html
index 43e8c26c4..0bc503c61 100644
--- a/demos/accordion/fillspace.html
+++ b/demos/accordion/fillspace.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Fill space</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/accordion/hoverintent.html b/demos/accordion/hoverintent.html
index e1d8e4996..dce8a8f0c 100644
--- a/demos/accordion/hoverintent.html
+++ b/demos/accordion/hoverintent.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Open on hoverintent</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/accordion.js"></script>
diff --git a/demos/accordion/no-auto-height.html b/demos/accordion/no-auto-height.html
index 648e9ba10..c1375c3ef 100644
--- a/demos/accordion/no-auto-height.html
+++ b/demos/accordion/no-auto-height.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - No auto height</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/accordion.js"></script>
diff --git a/demos/accordion/sortable.html b/demos/accordion/sortable.html
index f60dff087..13356995f 100644
--- a/demos/accordion/sortable.html
+++ b/demos/accordion/sortable.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Sortable</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/autocomplete/categories.html b/demos/autocomplete/categories.html
index 72dda4353..d986fdb11 100644
--- a/demos/autocomplete/categories.html
+++ b/demos/autocomplete/categories.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Categories</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html
index b00397931..8664ed530 100644
--- a/demos/autocomplete/combobox.html
+++ b/demos/autocomplete/combobox.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Combobox</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/autocomplete/custom-data.html b/demos/autocomplete/custom-data.html
index ce73f65dd..c243775a3 100644
--- a/demos/autocomplete/custom-data.html
+++ b/demos/autocomplete/custom-data.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Custom data and display</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/default.html b/demos/autocomplete/default.html
index f113fd13c..f0ade5ea7 100644
--- a/demos/autocomplete/default.html
+++ b/demos/autocomplete/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/folding.html b/demos/autocomplete/folding.html
index cd4c9d56e..405809402 100644
--- a/demos/autocomplete/folding.html
+++ b/demos/autocomplete/folding.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Accent folding</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/maxheight.html b/demos/autocomplete/maxheight.html
index 5266e84e2..9d7961591 100644
--- a/demos/autocomplete/maxheight.html
+++ b/demos/autocomplete/maxheight.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Scrollable results</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html
index 615646363..72c001754 100644
--- a/demos/autocomplete/multiple-remote.html
+++ b/demos/autocomplete/multiple-remote.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Multiple, remote</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/multiple.html b/demos/autocomplete/multiple.html
index 9fafdd3fc..63d379067 100644
--- a/demos/autocomplete/multiple.html
+++ b/demos/autocomplete/multiple.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Multiple values</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/remote-jsonp.html b/demos/autocomplete/remote-jsonp.html
index 32b980ff6..84c6957e0 100644
--- a/demos/autocomplete/remote-jsonp.html
+++ b/demos/autocomplete/remote-jsonp.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Remote JSONP datasource</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/remote-with-cache.html b/demos/autocomplete/remote-with-cache.html
index a5aa711ae..1eea5eff1 100644
--- a/demos/autocomplete/remote-with-cache.html
+++ b/demos/autocomplete/remote-with-cache.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Remote with caching</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/remote.html b/demos/autocomplete/remote.html
index c67e7cdcb..95d2ae49c 100644
--- a/demos/autocomplete/remote.html
+++ b/demos/autocomplete/remote.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Remote datasource</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/autocomplete/xml.html b/demos/autocomplete/xml.html
index c1b55f7a1..aa0394c10 100644
--- a/demos/autocomplete/xml.html
+++ b/demos/autocomplete/xml.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - XML data parsed once</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/button/checkbox.html b/demos/button/checkbox.html
index 7b914c871..6f2c5ec15 100644
--- a/demos/button/checkbox.html
+++ b/demos/button/checkbox.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button - Checkboxes</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/button/default.html b/demos/button/default.html
index b50d018c6..8c1690969 100644
--- a/demos/button/default.html
+++ b/demos/button/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/button/icons.html b/demos/button/icons.html
index e20d1c6d8..76cb11478 100644
--- a/demos/button/icons.html
+++ b/demos/button/icons.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button - Icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/button/radio.html b/demos/button/radio.html
index 32383303b..5d1fcdce9 100644
--- a/demos/button/radio.html
+++ b/demos/button/radio.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button - Radios</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/button/splitbutton.html b/demos/button/splitbutton.html
index 6b92206c0..de6e2bd2f 100644
--- a/demos/button/splitbutton.html
+++ b/demos/button/splitbutton.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button - Split button</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/button/toolbar.html b/demos/button/toolbar.html
index cf1dc89a7..4a93c5ccf 100644
--- a/demos/button/toolbar.html
+++ b/demos/button/toolbar.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button - Toolbar</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/datepicker/alt-field.html b/demos/datepicker/alt-field.html
index bfd28d15d..7e3b50a6d 100644
--- a/demos/datepicker/alt-field.html
+++ b/demos/datepicker/alt-field.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Populate alternate field</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/animation.html b/demos/datepicker/animation.html
index 8b24a0cc7..990fd6262 100644
--- a/demos/datepicker/animation.html
+++ b/demos/datepicker/animation.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Animations</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/effect.js"></script>
diff --git a/demos/datepicker/buttonbar.html b/demos/datepicker/buttonbar.html
index 8de270e25..040ec1112 100644
--- a/demos/datepicker/buttonbar.html
+++ b/demos/datepicker/buttonbar.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Display button bar</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/date-formats.html b/demos/datepicker/date-formats.html
index 5fe43990d..39be9aa15 100644
--- a/demos/datepicker/date-formats.html
+++ b/demos/datepicker/date-formats.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Format date</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/date-range.html b/demos/datepicker/date-range.html
index aafc585d2..34c64a9b2 100644
--- a/demos/datepicker/date-range.html
+++ b/demos/datepicker/date-range.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Select a Date Range</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/default.html b/demos/datepicker/default.html
index 009d32f06..a11d5def7 100644
--- a/demos/datepicker/default.html
+++ b/demos/datepicker/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/dropdown-month-year.html b/demos/datepicker/dropdown-month-year.html
index 07f8266bd..8668018d9 100644
--- a/demos/datepicker/dropdown-month-year.html
+++ b/demos/datepicker/dropdown-month-year.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Display month &amp; year menus</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/icon-trigger.html b/demos/datepicker/icon-trigger.html
index ea86832f5..6d0e096a3 100644
--- a/demos/datepicker/icon-trigger.html
+++ b/demos/datepicker/icon-trigger.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Icon trigger</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/inline.html b/demos/datepicker/inline.html
index 0e6bce8ee..5d120457b 100644
--- a/demos/datepicker/inline.html
+++ b/demos/datepicker/inline.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Display inline</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/localization.html b/demos/datepicker/localization.html
index 4ab003b69..2761dd31b 100644
--- a/demos/datepicker/localization.html
+++ b/demos/datepicker/localization.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Localize calendar</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/min-max.html b/demos/datepicker/min-max.html
index c2aea9717..4052c1785 100644
--- a/demos/datepicker/min-max.html
+++ b/demos/datepicker/min-max.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Restrict date range</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/multiple-calendars.html b/demos/datepicker/multiple-calendars.html
index ae8a61e33..716b6c68e 100644
--- a/demos/datepicker/multiple-calendars.html
+++ b/demos/datepicker/multiple-calendars.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Display multiple months</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/other-months.html b/demos/datepicker/other-months.html
index 71152033a..71a06c5d2 100644
--- a/demos/datepicker/other-months.html
+++ b/demos/datepicker/other-months.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Dates in other months</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/datepicker/show-week.html b/demos/datepicker/show-week.html
index b29e431c3..362645a7e 100644
--- a/demos/datepicker/show-week.html
+++ b/demos/datepicker/show-week.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker - Show week of the year</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/datepicker.js"></script>
diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html
index 8da52a6b1..d17fef363 100644
--- a/demos/dialog/animated.html
+++ b/demos/dialog/animated.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog - Animation</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/dialog/default.html b/demos/dialog/default.html
index 1efdc81d4..41c811668 100644
--- a/demos/dialog/default.html
+++ b/demos/dialog/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html
index 5794ff110..e14027826 100644
--- a/demos/dialog/modal-confirmation.html
+++ b/demos/dialog/modal-confirmation.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog - Modal confirmation</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html
index 3448ce824..6e36bb9d6 100644
--- a/demos/dialog/modal-form.html
+++ b/demos/dialog/modal-form.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog - Modal form</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html
index a1c1ab449..c7d05abeb 100644
--- a/demos/dialog/modal-message.html
+++ b/demos/dialog/modal-message.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog - Modal message</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/constrain-movement.html b/demos/draggable/constrain-movement.html
index a5cbf0258..cca74be21 100644
--- a/demos/draggable/constrain-movement.html
+++ b/demos/draggable/constrain-movement.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Constrain movement</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/cursor-style.html b/demos/draggable/cursor-style.html
index daea776f2..7f3b0fda4 100644
--- a/demos/draggable/cursor-style.html
+++ b/demos/draggable/cursor-style.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Cursor style</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/default.html b/demos/draggable/default.html
index fbb5c0100..df6bf9da9 100644
--- a/demos/draggable/default.html
+++ b/demos/draggable/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/events.html b/demos/draggable/events.html
index 41b9de480..ad8a98aaf 100644
--- a/demos/draggable/events.html
+++ b/demos/draggable/events.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Events</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/handle.html b/demos/draggable/handle.html
index d3cfed875..2e7fd2295 100644
--- a/demos/draggable/handle.html
+++ b/demos/draggable/handle.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Handles</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/revert.html b/demos/draggable/revert.html
index abe80c680..4371b7f2b 100644
--- a/demos/draggable/revert.html
+++ b/demos/draggable/revert.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Revert position</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/scroll.html b/demos/draggable/scroll.html
index 8e2eb6534..d3e97f326 100644
--- a/demos/draggable/scroll.html
+++ b/demos/draggable/scroll.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Auto-scroll</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/snap-to.html b/demos/draggable/snap-to.html
index fad5114f3..726a51384 100644
--- a/demos/draggable/snap-to.html
+++ b/demos/draggable/snap-to.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Snap to element or grid</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/sortable.html b/demos/draggable/sortable.html
index e1cb6acf2..1251f0e29 100644
--- a/demos/draggable/sortable.html
+++ b/demos/draggable/sortable.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable + Sortable</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/draggable/visual-feedback.html b/demos/draggable/visual-feedback.html
index e231e0789..135d86c2a 100644
--- a/demos/draggable/visual-feedback.html
+++ b/demos/draggable/visual-feedback.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable - Visual feedback</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/droppable/accepted-elements.html b/demos/droppable/accepted-elements.html
index cc7b5d732..19db54650 100644
--- a/demos/droppable/accepted-elements.html
+++ b/demos/droppable/accepted-elements.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Accept</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/droppable/default.html b/demos/droppable/default.html
index 5039403d4..a097e7183 100644
--- a/demos/droppable/default.html
+++ b/demos/droppable/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/droppable/photo-manager.html b/demos/droppable/photo-manager.html
index 9b4132c33..6323e5d7b 100644
--- a/demos/droppable/photo-manager.html
+++ b/demos/droppable/photo-manager.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Simple photo manager</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/position.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
diff --git a/demos/droppable/propagation.html b/demos/droppable/propagation.html
index e91388d46..60cf7cb37 100644
--- a/demos/droppable/propagation.html
+++ b/demos/droppable/propagation.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Prevent propagation</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/droppable/revert.html b/demos/droppable/revert.html
index f5f5a9718..74ccb6fc5 100644
--- a/demos/droppable/revert.html
+++ b/demos/droppable/revert.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Revert draggable position</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/droppable/shopping-cart.html b/demos/droppable/shopping-cart.html
index 704ddc9bb..0304004ed 100644
--- a/demos/droppable/shopping-cart.html
+++ b/demos/droppable/shopping-cart.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Shopping Cart Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/droppable/visual-feedback.html b/demos/droppable/visual-feedback.html
index ea462a964..9b197c56e 100644
--- a/demos/droppable/visual-feedback.html
+++ b/demos/droppable/visual-feedback.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable - Visual feedback</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/effect/addClass.html b/demos/effect/addClass.html
index f435da3a9..f594291fe 100644
--- a/demos/effect/addClass.html
+++ b/demos/effect/addClass.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - addClass demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/demos/effect/animate.html b/demos/effect/animate.html
index e5f45ed3c..41f969982 100644
--- a/demos/effect/animate.html
+++ b/demos/effect/animate.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - Animate demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/demos/effect/default.html b/demos/effect/default.html
index 115bf199c..aff19783f 100644
--- a/demos/effect/default.html
+++ b/demos/effect/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - Effect demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<script src="../../ui/effect-blind.js"></script>
 	<script src="../../ui/effect-bounce.js"></script>
diff --git a/demos/effect/easing.html b/demos/effect/easing.html
index 94d20a57d..aa5bccbc6 100644
--- a/demos/effect/easing.html
+++ b/demos/effect/easing.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - Easing demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/demos/effect/hide.html b/demos/effect/hide.html
index 75fdd01b3..c665b0765 100644
--- a/demos/effect/hide.html
+++ b/demos/effect/hide.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - Hide Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<script src="../../ui/effect-blind.js"></script>
 	<script src="../../ui/effect-bounce.js"></script>
diff --git a/demos/effect/removeClass.html b/demos/effect/removeClass.html
index a5e943d1a..ae2fa562e 100644
--- a/demos/effect/removeClass.html
+++ b/demos/effect/removeClass.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - removeClass Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/demos/effect/show.html b/demos/effect/show.html
index cde360919..6da8f0228 100644
--- a/demos/effect/show.html
+++ b/demos/effect/show.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - Show Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<script src="../../ui/effect-blind.js"></script>
 	<script src="../../ui/effect-bounce.js"></script>
diff --git a/demos/effect/switchClass.html b/demos/effect/switchClass.html
index 65de87f3c..34af4715b 100644
--- a/demos/effect/switchClass.html
+++ b/demos/effect/switchClass.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - switchClass Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/demos/effect/toggle.html b/demos/effect/toggle.html
index 5363abe49..e1769c108 100644
--- a/demos/effect/toggle.html
+++ b/demos/effect/toggle.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - Toggle Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<script src="../../ui/effect-blind.js"></script>
 	<script src="../../ui/effect-bounce.js"></script>
diff --git a/demos/effect/toggleClass.html b/demos/effect/toggleClass.html
index 182f2121c..f8bf31fe7 100644
--- a/demos/effect/toggleClass.html
+++ b/demos/effect/toggleClass.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects - toggleClass Demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/demos/menu/default.html b/demos/menu/default.html
index 5ee96651d..6da41e016 100644
--- a/demos/menu/default.html
+++ b/demos/menu/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Menu - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/menu/icons.html b/demos/menu/icons.html
index 40e83ffd4..bd1de828e 100644
--- a/demos/menu/icons.html
+++ b/demos/menu/icons.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Menu - Icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/position/cycler.html b/demos/position/cycler.html
index 873cac58f..6bb9b9cea 100644
--- a/demos/position/cycler.html
+++ b/demos/position/cycler.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Position - Image Cycler</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/position/default.html b/demos/position/default.html
index 2b0d42a39..71fc8a0fa 100644
--- a/demos/position/default.html
+++ b/demos/position/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Position - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/progressbar/default.html b/demos/progressbar/default.html
index cd97f1808..197a976c5 100644
--- a/demos/progressbar/default.html
+++ b/demos/progressbar/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/progressbar.js"></script>
diff --git a/demos/progressbar/download.html b/demos/progressbar/download.html
index c35d47333..7e197d571 100644
--- a/demos/progressbar/download.html
+++ b/demos/progressbar/download.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar - Download Dialog</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/progressbar.js"></script>
diff --git a/demos/progressbar/indeterminate.html b/demos/progressbar/indeterminate.html
index fa058cac5..ef5f446f2 100644
--- a/demos/progressbar/indeterminate.html
+++ b/demos/progressbar/indeterminate.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar - Indeterminate Value</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/progressbar.js"></script>
diff --git a/demos/progressbar/label.html b/demos/progressbar/label.html
index f3fde9676..f4c493707 100644
--- a/demos/progressbar/label.html
+++ b/demos/progressbar/label.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar - Custom Label</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/progressbar.js"></script>
diff --git a/demos/resizable/animate.html b/demos/resizable/animate.html
index 484d26eac..b06e41ddb 100644
--- a/demos/resizable/animate.html
+++ b/demos/resizable/animate.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Animate</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/aspect-ratio.html b/demos/resizable/aspect-ratio.html
index 9e981c018..2da2a2926 100644
--- a/demos/resizable/aspect-ratio.html
+++ b/demos/resizable/aspect-ratio.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Preserve aspect ratio</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/constrain-area.html b/demos/resizable/constrain-area.html
index 8fa275891..e6ce3b28b 100644
--- a/demos/resizable/constrain-area.html
+++ b/demos/resizable/constrain-area.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Constrain resize area</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/default.html b/demos/resizable/default.html
index 2a6ed12c8..a77afc34e 100644
--- a/demos/resizable/default.html
+++ b/demos/resizable/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/helper.html b/demos/resizable/helper.html
index eed4202b3..fff0c8bd9 100644
--- a/demos/resizable/helper.html
+++ b/demos/resizable/helper.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Helper</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/max-min.html b/demos/resizable/max-min.html
index 1c5f309e6..88e8ca3f3 100644
--- a/demos/resizable/max-min.html
+++ b/demos/resizable/max-min.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Maximum / minimum size</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/snap-to-grid.html b/demos/resizable/snap-to-grid.html
index 46c36e9b1..6e13ae618 100644
--- a/demos/resizable/snap-to-grid.html
+++ b/demos/resizable/snap-to-grid.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Snap to grid</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/synchronous-resize.html b/demos/resizable/synchronous-resize.html
index 53fffee2d..e645ea351 100644
--- a/demos/resizable/synchronous-resize.html
+++ b/demos/resizable/synchronous-resize.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Synchronous resize</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/textarea.html b/demos/resizable/textarea.html
index 22fb486d0..04b180a11 100644
--- a/demos/resizable/textarea.html
+++ b/demos/resizable/textarea.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Textarea</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/resizable/visual-feedback.html b/demos/resizable/visual-feedback.html
index 5ca82245c..aa66fb5cf 100644
--- a/demos/resizable/visual-feedback.html
+++ b/demos/resizable/visual-feedback.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable - Visual feedback</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/selectable/default.html b/demos/selectable/default.html
index 72c4fb359..6b72bda75 100644
--- a/demos/selectable/default.html
+++ b/demos/selectable/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectable - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/selectable/display-grid.html b/demos/selectable/display-grid.html
index 6aa53fe50..27babbf6a 100644
--- a/demos/selectable/display-grid.html
+++ b/demos/selectable/display-grid.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectable - Display as grid</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/selectable/serialize.html b/demos/selectable/serialize.html
index 60a0051e2..82391b9e7 100644
--- a/demos/selectable/serialize.html
+++ b/demos/selectable/serialize.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectable - Serialize</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/selectmenu/custom_render.html b/demos/selectmenu/custom_render.html
index 8e6b644fc..76493dc98 100644
--- a/demos/selectmenu/custom_render.html
+++ b/demos/selectmenu/custom_render.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Selectmenu - Custom Rendering</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/selectmenu/default.html b/demos/selectmenu/default.html
index e87f70bc6..d9b198683 100644
--- a/demos/selectmenu/default.html
+++ b/demos/selectmenu/default.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Selectmenu - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/selectmenu/product-selection.html b/demos/selectmenu/product-selection.html
index 2d9d8232c..40b3a921d 100644
--- a/demos/selectmenu/product-selection.html
+++ b/demos/selectmenu/product-selection.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Selectmenu - Product Selection</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/slider/colorpicker.html b/demos/slider/colorpicker.html
index 03b1ba62f..6f438a2e5 100644
--- a/demos/slider/colorpicker.html
+++ b/demos/slider/colorpicker.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Colorpicker</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/default.html b/demos/slider/default.html
index 83dd00e52..141fec23d 100644
--- a/demos/slider/default.html
+++ b/demos/slider/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8" >
 	<title>jQuery UI Slider - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/hotelrooms.html b/demos/slider/hotelrooms.html
index b50128d8b..e5ee79c55 100644
--- a/demos/slider/hotelrooms.html
+++ b/demos/slider/hotelrooms.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Slider bound to select</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/multiple-vertical.html b/demos/slider/multiple-vertical.html
index d9bed56aa..5f23a2dd2 100644
--- a/demos/slider/multiple-vertical.html
+++ b/demos/slider/multiple-vertical.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Multiple sliders</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/range-vertical.html b/demos/slider/range-vertical.html
index 62e46640e..a29737b90 100644
--- a/demos/slider/range-vertical.html
+++ b/demos/slider/range-vertical.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Vertical range slider</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/range.html b/demos/slider/range.html
index e8760f195..a923a6d15 100644
--- a/demos/slider/range.html
+++ b/demos/slider/range.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Range slider</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/rangemax.html b/demos/slider/rangemax.html
index b0e62c5f4..b96346b6f 100644
--- a/demos/slider/rangemax.html
+++ b/demos/slider/rangemax.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Range with fixed maximum</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/rangemin.html b/demos/slider/rangemin.html
index 648fe534c..a3d1b0628 100644
--- a/demos/slider/rangemin.html
+++ b/demos/slider/rangemin.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Range with fixed minimum</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/side-scroll.html b/demos/slider/side-scroll.html
index 3aa2c0cf8..1e6df620d 100644
--- a/demos/slider/side-scroll.html
+++ b/demos/slider/side-scroll.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Slider scrollbar</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/slider-vertical.html b/demos/slider/slider-vertical.html
index 95de2f40a..0a5ecd97d 100644
--- a/demos/slider/slider-vertical.html
+++ b/demos/slider/slider-vertical.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Vertical slider</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/slider/steps.html b/demos/slider/steps.html
index 9965a385a..9b8ca2add 100644
--- a/demos/slider/steps.html
+++ b/demos/slider/steps.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider - Snap to increments</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/connect-lists.html b/demos/sortable/connect-lists.html
index 4808b348d..834cb560a 100644
--- a/demos/sortable/connect-lists.html
+++ b/demos/sortable/connect-lists.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Connect lists</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/default.html b/demos/sortable/default.html
index bcce5e15b..6d3e742db 100644
--- a/demos/sortable/default.html
+++ b/demos/sortable/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/display-grid.html b/demos/sortable/display-grid.html
index 27d3648c4..3e8e5be75 100644
--- a/demos/sortable/display-grid.html
+++ b/demos/sortable/display-grid.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Display as grid</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/empty-lists.html b/demos/sortable/empty-lists.html
index 874092d4e..6d8f6565b 100644
--- a/demos/sortable/empty-lists.html
+++ b/demos/sortable/empty-lists.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Handle empty lists</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/items.html b/demos/sortable/items.html
index 0b1c04057..b6ed39235 100644
--- a/demos/sortable/items.html
+++ b/demos/sortable/items.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Include / exclude items</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/placeholder.html b/demos/sortable/placeholder.html
index 45e0441b8..c925b77ad 100644
--- a/demos/sortable/placeholder.html
+++ b/demos/sortable/placeholder.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Drop placeholder</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/sortable/portlets.html b/demos/sortable/portlets.html
index cad88dec4..4d7f9cd53 100644
--- a/demos/sortable/portlets.html
+++ b/demos/sortable/portlets.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable - Portlets</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html
index 19e0c2396..2e64da384 100644
--- a/demos/spinner/currency.html
+++ b/demos/spinner/currency.html
@@ -4,11 +4,11 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner - Currency</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>
-	<script src="../../external/globalize.js"></script>
-	<script src="../../external/globalize.culture.de-DE.js"></script>
-	<script src="../../external/globalize.culture.ja-JP.js"></script>
+	<script src="../../external/globalize/globalize.js"></script>
+	<script src="../../external/globalize/globalize.culture.de-DE.js"></script>
+	<script src="../../external/globalize/globalize.culture.ja-JP.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html
index 682e2f994..ecb8bd83e 100644
--- a/demos/spinner/decimal.html
+++ b/demos/spinner/decimal.html
@@ -4,11 +4,11 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner - Decimal</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>
-	<script src="../../external/globalize.js"></script>
-	<script src="../../external/globalize.culture.de-DE.js"></script>
-	<script src="../../external/globalize.culture.ja-JP.js"></script>
+	<script src="../../external/globalize/globalize.js"></script>
+	<script src="../../external/globalize/globalize.culture.de-DE.js"></script>
+	<script src="../../external/globalize/globalize.culture.ja-JP.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/spinner/default.html b/demos/spinner/default.html
index a127374b2..1e1ab7d90 100644
--- a/demos/spinner/default.html
+++ b/demos/spinner/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html
index 432501c8b..e1fa035df 100644
--- a/demos/spinner/latlong.html
+++ b/demos/spinner/latlong.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Spinner - Map</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
 	<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
diff --git a/demos/spinner/overflow.html b/demos/spinner/overflow.html
index 6ca14e7b6..d8a5e40fb 100644
--- a/demos/spinner/overflow.html
+++ b/demos/spinner/overflow.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner - Overflow</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
diff --git a/demos/spinner/time.html b/demos/spinner/time.html
index e1235e914..949bc1b0e 100644
--- a/demos/spinner/time.html
+++ b/demos/spinner/time.html
@@ -4,10 +4,10 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner - Time</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>
-	<script src="../../external/globalize.js"></script>
-	<script src="../../external/globalize.culture.de-DE.js"></script>
+	<script src="../../external/globalize/globalize.js"></script>
+	<script src="../../external/globalize/globalize.culture.de-DE.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
diff --git a/demos/tabs/ajax.html b/demos/tabs/ajax.html
index d36061a79..9892fe192 100644
--- a/demos/tabs/ajax.html
+++ b/demos/tabs/ajax.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Content via Ajax</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/tabs.js"></script>
diff --git a/demos/tabs/collapsible.html b/demos/tabs/collapsible.html
index 7a5577b43..dcb79954e 100644
--- a/demos/tabs/collapsible.html
+++ b/demos/tabs/collapsible.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Collapse content</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/tabs.js"></script>
diff --git a/demos/tabs/default.html b/demos/tabs/default.html
index bb98caaa0..966a1057f 100644
--- a/demos/tabs/default.html
+++ b/demos/tabs/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/tabs.js"></script>
diff --git a/demos/tabs/manipulation.html b/demos/tabs/manipulation.html
index a12e67409..fc9b750b3 100644
--- a/demos/tabs/manipulation.html
+++ b/demos/tabs/manipulation.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Simple manipulation</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/position.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
diff --git a/demos/tabs/mouseover.html b/demos/tabs/mouseover.html
index 96366ebbc..6fb316114 100644
--- a/demos/tabs/mouseover.html
+++ b/demos/tabs/mouseover.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Open on mouseover</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/tabs.js"></script>
diff --git a/demos/tabs/sortable.html b/demos/tabs/sortable.html
index 1081062ba..1bc865aa0 100644
--- a/demos/tabs/sortable.html
+++ b/demos/tabs/sortable.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Sortable</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/demos/tabs/vertical.html b/demos/tabs/vertical.html
index 7fa3e0a84..ec0b8e7af 100644
--- a/demos/tabs/vertical.html
+++ b/demos/tabs/vertical.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs - Vertical Tabs functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/tabs.js"></script>
diff --git a/demos/tooltip/custom-animation.html b/demos/tooltip/custom-animation.html
index 990a8fcae..892462a89 100644
--- a/demos/tooltip/custom-animation.html
+++ b/demos/tooltip/custom-animation.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Custom animation demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/tooltip/custom-content.html b/demos/tooltip/custom-content.html
index e5f638073..530b33525 100644
--- a/demos/tooltip/custom-content.html
+++ b/demos/tooltip/custom-content.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Custom content</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/tooltip/custom-style.html b/demos/tooltip/custom-style.html
index 31670ebbd..c926776c5 100644
--- a/demos/tooltip/custom-style.html
+++ b/demos/tooltip/custom-style.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Custom Styling</title>
 	<link rel="stylesheet" href="../../themes/base/tooltip.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/tooltip/default.html b/demos/tooltip/default.html
index d53a4099e..e70f92320 100644
--- a/demos/tooltip/default.html
+++ b/demos/tooltip/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/tooltip/forms.html b/demos/tooltip/forms.html
index 804e3fc2b..d93c004ba 100644
--- a/demos/tooltip/forms.html
+++ b/demos/tooltip/forms.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Forms</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/tooltip/tracking.html b/demos/tooltip/tracking.html
index 06b884e35..856f55564 100644
--- a/demos/tooltip/tracking.html
+++ b/demos/tooltip/tracking.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Track the mouse</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/tooltip/video-player.html b/demos/tooltip/video-player.html
index 1a41ef7f4..56c0fed1e 100644
--- a/demos/tooltip/video-player.html
+++ b/demos/tooltip/video-player.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Video Player demo</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/position.js"></script>
diff --git a/demos/widget/default.html b/demos/widget/default.html
index 77ec62e52..885960abf 100644
--- a/demos/widget/default.html
+++ b/demos/widget/default.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Widget - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/position.js"></script>
 	<script src="../../ui/widget.js"></script>
diff --git a/external/globalize/LICENSE b/external/globalize/LICENSE
new file mode 100644
index 000000000..9c8b02240
--- /dev/null
+++ b/external/globalize/LICENSE
@@ -0,0 +1,21 @@
+Copyright Software Freedom Conservancy, Inc.
+http://jquery.org/license
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/external/globalize.culture.de-DE.js b/external/globalize/globalize.culture.de-DE.js
similarity index 100%
rename from external/globalize.culture.de-DE.js
rename to external/globalize/globalize.culture.de-DE.js
diff --git a/external/globalize.culture.ja-JP.js b/external/globalize/globalize.culture.ja-JP.js
similarity index 100%
rename from external/globalize.culture.ja-JP.js
rename to external/globalize/globalize.culture.ja-JP.js
diff --git a/external/globalize.js b/external/globalize/globalize.js
similarity index 100%
rename from external/globalize.js
rename to external/globalize/globalize.js
diff --git a/external/jquery.mousewheel.js b/external/jquery-mousewheel/jquery.mousewheel.js
similarity index 100%
rename from external/jquery.mousewheel.js
rename to external/jquery-mousewheel/jquery.mousewheel.js
diff --git a/external/jquery/MIT-LICENSE.txt b/external/jquery/MIT-LICENSE.txt
new file mode 100644
index 000000000..957f26d3e
--- /dev/null
+++ b/external/jquery/MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/jquery.js b/external/jquery/jquery.js
similarity index 100%
rename from jquery.js
rename to external/jquery/jquery.js
diff --git a/external/jshint/LICENSE/LICENSE b/external/jshint/LICENSE/LICENSE
new file mode 100644
index 000000000..0e247b19f
--- /dev/null
+++ b/external/jshint/LICENSE/LICENSE
@@ -0,0 +1,20 @@
+Copyright 2012 Anton Kovalyov (http://jshint.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/external/jshint.js b/external/jshint/jshint.js
similarity index 100%
rename from external/jshint.js
rename to external/jshint/jshint.js
diff --git a/external/qunit/MIT-LICENSE.txt b/external/qunit/MIT-LICENSE.txt
new file mode 100644
index 000000000..957f26d3e
--- /dev/null
+++ b/external/qunit/MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/external/qunit.css b/external/qunit/qunit.css
similarity index 100%
rename from external/qunit.css
rename to external/qunit/qunit.css
diff --git a/external/qunit.js b/external/qunit/qunit.js
similarity index 100%
rename from external/qunit.js
rename to external/qunit/qunit.js
diff --git a/package.json b/package.json
index 35a073525..f5b9ba85c 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
 	"devDependencies": {
 		"commitplease": "1.6.0",
 		"grunt": "0.4.2",
-		"grunt-bowercopy": "0.8.0",
+		"grunt-bowercopy": "1.0.0",
 		"grunt-compare-size": "0.4.0",
 		"grunt-contrib-concat": "0.1.3",
 		"grunt-contrib-csslint": "0.2.0",
diff --git a/tests/index.html b/tests/index.html
index 4cb9a450d..89323d61a 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="../themes/base/core.css">
 	<link rel="stylesheet" href="../themes/base/theme.css">
 	<link rel="stylesheet" href="index.css">
-	<script src="../jquery.js"></script>
+	<script src="../external/jquery/jquery.js"></script>
 	<script src="index.js"></script>
 </head>
 <body>
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index 0e78f89c4..c16b3e6ea 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Accordion Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html
index 41ad6d85b..b70c86931 100644
--- a/tests/unit/accordion/all.html
+++ b/tests/unit/accordion/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/all.html b/tests/unit/all.html
index 0d59d0ec6..f8a4636d0 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../external/qunit.css">
+	<link rel="stylesheet" href="../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="qunit-composite.css">
-	<script src="../../external/qunit.js"></script>
+	<script src="../../external/qunit/qunit.js"></script>
 	<script src="qunit-composite.js"></script>
 
 	<script>
diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html
index 4d9ac5d2d..e5e380198 100644
--- a/tests/unit/autocomplete/all.html
+++ b/tests/unit/autocomplete/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index dc9192862..6c29c5d49 100644
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Autocomplete Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/button/all.html b/tests/unit/button/all.html
index ab0a58dc1..264c977b8 100644
--- a/tests/unit/button/all.html
+++ b/tests/unit/button/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index a6ff8fc61..ac16532cd 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Button Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/core/all.html b/tests/unit/core/all.html
index 869d07fb0..518ada766 100644
--- a/tests/unit/core/all.html
+++ b/tests/unit/core/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 21f4533da..006abb50d 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Core Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/core/core_deprecated.html b/tests/unit/core/core_deprecated.html
index e5935fabb..e6f2bbb06 100644
--- a/tests/unit/core/core_deprecated.html
+++ b/tests/unit/core/core_deprecated.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Core Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html
index a2076be00..8a2911d8f 100644
--- a/tests/unit/datepicker/all.html
+++ b/tests/unit/datepicker/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 093320024..4d2b3fd5b 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Datepicker Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/dialog/all.html b/tests/unit/dialog/all.html
index faec898fc..a98a61cf7 100644
--- a/tests/unit/dialog/all.html
+++ b/tests/unit/dialog/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 3e532df71..49d15266a 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -8,8 +8,8 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/draggable/all.html b/tests/unit/draggable/all.html
index 1e913646e..40e3bfab8 100644
--- a/tests/unit/draggable/all.html
+++ b/tests/unit/draggable/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index 823cc462a..c4b769f5c 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -5,7 +5,7 @@
 	<title>jQuery UI Draggable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 
 	<style>
 		#main {
@@ -48,7 +48,7 @@
 		}
 	</style>
 
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/droppable/all.html b/tests/unit/droppable/all.html
index 32e9adf6b..19dc4ec9d 100644
--- a/tests/unit/droppable/all.html
+++ b/tests/unit/droppable/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index 8571f9c0f..8e4ee6f4c 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Droppable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/effects/all.html b/tests/unit/effects/all.html
index f4d06ab75..ca9b39c4a 100644
--- a/tests/unit/effects/all.html
+++ b/tests/unit/effects/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index b5a603d8e..d0190b9a5 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Effects Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/menu/all.html b/tests/unit/menu/all.html
index 69926ab2e..fa1c004da 100644
--- a/tests/unit/menu/all.html
+++ b/tests/unit/menu/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 9df56a8d1..8e0ae6112 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Menu Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/position/all.html b/tests/unit/position/all.html
index 8acdb934b..486f25fd4 100644
--- a/tests/unit/position/all.html
+++ b/tests/unit/position/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 8f6a5e503..81f67bc8e 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html
index 298d2c5e6..e52d7727b 100644
--- a/tests/unit/progressbar/all.html
+++ b/tests/unit/progressbar/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index 68badd818..280a77f3d 100644
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Progressbar Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html
index f1beaf1e2..49ccee0b0 100644
--- a/tests/unit/resizable/all.html
+++ b/tests/unit/resizable/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 108585157..df7ad2193 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Resizable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html
index 612ac4b65..1a45a3d08 100644
--- a/tests/unit/selectable/all.html
+++ b/tests/unit/selectable/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 9b52fecfe..7e56718d5 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Selectable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/selectmenu/all.html b/tests/unit/selectmenu/all.html
index 64ce723b7..5fde6f150 100644
--- a/tests/unit/selectmenu/all.html
+++ b/tests/unit/selectmenu/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/selectmenu/selectmenu.html b/tests/unit/selectmenu/selectmenu.html
index 9008ff616..9be5d7195 100644
--- a/tests/unit/selectmenu/selectmenu.html
+++ b/tests/unit/selectmenu/selectmenu.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Selectmenu Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/slider/all.html b/tests/unit/slider/all.html
index cd8b17786..06d24a7d9 100644
--- a/tests/unit/slider/all.html
+++ b/tests/unit/slider/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 1407c8970..70658674b 100644
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Slider Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/sortable/all.html b/tests/unit/sortable/all.html
index 66e837ea9..14f64c2b1 100644
--- a/tests/unit/sortable/all.html
+++ b/tests/unit/sortable/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index b5e522798..85126d62d 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Sortable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/spinner/all.html b/tests/unit/spinner/all.html
index 6f670282f..732370c61 100644
--- a/tests/unit/spinner/all.html
+++ b/tests/unit/spinner/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index aa4fb9619..dff2a36cd 100644
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -5,10 +5,10 @@
 	<title>jQuery UI Spinner Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../external/globalize.js"></script>
-	<script src="../../../external/globalize.culture.ja-JP.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/globalize/globalize.js"></script>
+	<script src="../../../external/globalize/globalize.culture.ja-JP.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/tabs/all.html b/tests/unit/tabs/all.html
index 65b115f2e..498f4091e 100644
--- a/tests/unit/tabs/all.html
+++ b/tests/unit/tabs/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 2521dcdf0..06fd36f87 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Tabs Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index c2f30222b..9dd0b04ab 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -77,7 +77,7 @@ TestHelpers.testJshint = function( module ) {
 	}
 
 	if ( !jshintLoaded ) {
-		includeScript( "external/jshint.js" );
+		includeScript( "external/jshint/jshint.js" );
 		jshintLoaded = true;
 	}
 
diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html
index b49fc8ffe..453b36743 100644
--- a/tests/unit/tooltip/all.html
+++ b/tests/unit/tooltip/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 503a744be..3e13977fd 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Tooltip Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html
index aa28891a6..edb1fb0d0 100644
--- a/tests/unit/widget/all.html
+++ b/tests/unit/widget/all.html
@@ -6,9 +6,9 @@
 
 	<script src="../../../jquery.js"></script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 03b0f9404..1afc4a3f9 100644
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,8 +5,8 @@
 	<title>jQuery UI Widget Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
diff --git a/tests/visual/accordion/icons.html b/tests/visual/accordion/icons.html
index 2170b422b..a8723a859 100644
--- a/tests/visual/accordion/icons.html
+++ b/tests/visual/accordion/icons.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Accordion Visual Test</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/accordion.js"></script>
diff --git a/tests/visual/addClass/queue.html b/tests/visual/addClass/queue.html
index 8fb7e9e56..88611ddc4 100644
--- a/tests/visual/addClass/queue.html
+++ b/tests/visual/addClass/queue.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>addClass Visual Test : Queue</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/effect.js"></script>
 	<style>
 	.box {
diff --git a/tests/visual/button/button.html b/tests/visual/button/button.html
index d4ce47b40..3ac055b91 100644
--- a/tests/visual/button/button.html
+++ b/tests/visual/button/button.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Button Visual Test</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/button.js"></script>
diff --git a/tests/visual/button/performance.html b/tests/visual/button/performance.html
index e905ab088..ba90965a9 100644
--- a/tests/visual/button/performance.html
+++ b/tests/visual/button/performance.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Button Visual Test: Initialization Performance</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/button.js"></script>
diff --git a/tests/visual/compound/accordion_tabs.html b/tests/visual/compound/accordion_tabs.html
index 9ec6bc0c7..68207d151 100644
--- a/tests/visual/compound/accordion_tabs.html
+++ b/tests/visual/compound/accordion_tabs.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Accordion in Tabs</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/accordion.js"></script>
diff --git a/tests/visual/compound/datepicker_dialog.html b/tests/visual/compound/datepicker_dialog.html
index 0e3714841..e6a25a2e8 100644
--- a/tests/visual/compound/datepicker_dialog.html
+++ b/tests/visual/compound/datepicker_dialog.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Datepicker in Dialog</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/compound/dialog_widgets.html b/tests/visual/compound/dialog_widgets.html
index 4989d4be0..fa3ffb4e4 100644
--- a/tests/visual/compound/dialog_widgets.html
+++ b/tests/visual/compound/dialog_widgets.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : All Widgets in Dialog</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/compound/draggable_accordion.html b/tests/visual/compound/draggable_accordion.html
index 24debaa50..528cdc321 100644
--- a/tests/visual/compound/draggable_accordion.html
+++ b/tests/visual/compound/draggable_accordion.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Draggable in Accordion</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html b/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
index 92b829b9e..302a2e910 100644
--- a/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
+++ b/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Draggable in Accordion</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/compound/draggable_resizable.html b/tests/visual/compound/draggable_resizable.html
index d38399431..d07c8bdc4 100644
--- a/tests/visual/compound/draggable_resizable.html
+++ b/tests/visual/compound/draggable_resizable.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test: Draggable and Resizable block element</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/compound/sortable_accordion_sortable_tabs.html b/tests/visual/compound/sortable_accordion_sortable_tabs.html
index 2966561eb..f44f2b929 100644
--- a/tests/visual/compound/sortable_accordion_sortable_tabs.html
+++ b/tests/visual/compound/sortable_accordion_sortable_tabs.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Accordion in Tabs</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/compound/tabs_selectmenu.html b/tests/visual/compound/tabs_selectmenu.html
index 6c116b4e2..ca2020b71 100644
--- a/tests/visual/compound/tabs_selectmenu.html
+++ b/tests/visual/compound/tabs_selectmenu.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Selectmenu in Tabs</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>
diff --git a/tests/visual/compound/tabs_tabs.html b/tests/visual/compound/tabs_tabs.html
index 1996e8ad5..bf5cf4ead 100644
--- a/tests/visual/compound/tabs_tabs.html
+++ b/tests/visual/compound/tabs_tabs.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Tabs in Tabs</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/accordion.js"></script>
diff --git a/tests/visual/compound/tabs_tooltips.html b/tests/visual/compound/tabs_tooltips.html
index a994bbe64..bb8f2d11d 100644
--- a/tests/visual/compound/tabs_tooltips.html
+++ b/tests/visual/compound/tabs_tooltips.html
@@ -5,7 +5,7 @@
 	<title>Compound Visual Test : Tabs in Tabs</title>
 	<link rel="stylesheet" href="../visual.css">
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>
diff --git a/tests/visual/dialog/animated.html b/tests/visual/dialog/animated.html
index 454ed75e3..06c46fc86 100644
--- a/tests/visual/dialog/animated.html
+++ b/tests/visual/dialog/animated.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Dialog Visual Test</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/dialog/complex-dialogs.html b/tests/visual/dialog/complex-dialogs.html
index d3986e5d0..0a9c8c47e 100644
--- a/tests/visual/dialog/complex-dialogs.html
+++ b/tests/visual/dialog/complex-dialogs.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Dialog Visual Test</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/dialog/form.html b/tests/visual/dialog/form.html
index ec5e327c8..eab41cdbe 100644
--- a/tests/visual/dialog/form.html
+++ b/tests/visual/dialog/form.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Dialog Visual Test</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/dialog/performance.html b/tests/visual/dialog/performance.html
index a66064a82..37ff93238 100644
--- a/tests/visual/dialog/performance.html
+++ b/tests/visual/dialog/performance.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Dialog Visual Test - Modal Dialog in Large DOM</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/position.js"></script>
 	<script src="../../../ui/widget.js"></script>
diff --git a/tests/visual/dialog/stacking.html b/tests/visual/dialog/stacking.html
index 1d25fd9d3..5b0030dc0 100644
--- a/tests/visual/dialog/stacking.html
+++ b/tests/visual/dialog/stacking.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Dialog Visual Test</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/effects/all.html b/tests/visual/effects/all.html
index 2a9b0a2cc..9fb4cf9c4 100644
--- a/tests/visual/effects/all.html
+++ b/tests/visual/effects/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects Test Suite</title>
 	<link rel="stylesheet" href="effects.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/effect.js"></script>
 	<script src="../../../ui/effect-blind.js"></script>
 	<script src="../../../ui/effect-bounce.js"></script>
diff --git a/tests/visual/effects/scale.html b/tests/visual/effects/scale.html
index acf309641..177442955 100644
--- a/tests/visual/effects/scale.html
+++ b/tests/visual/effects/scale.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects Test Suite</title>
 	<link rel="stylesheet" href="effects.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/effect.js"></script>
 	<script src="../../../ui/effect-scale.js"></script>
 	<script>
diff --git a/tests/visual/index.html b/tests/visual/index.html
index 593ddcb07..949fb7e82 100644
--- a/tests/visual/index.html
+++ b/tests/visual/index.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../themes/base/core.css">
 	<link rel="stylesheet" href="../../themes/base/theme.css">
 	<link rel="stylesheet" href="../index.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../index.js"></script>
 </head>
 <body>
diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html
index 02c8d1ab5..0770b991b 100644
--- a/tests/visual/menu/menu.html
+++ b/tests/visual/menu/menu.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Menu Visual Test: Default</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>
diff --git a/tests/visual/position/position.html b/tests/visual/position/position.html
index d0df2c4be..d9c7adb85 100644
--- a/tests/visual/position/position.html
+++ b/tests/visual/position/position.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<title>Position Visual Test</title>
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/mouse.js"></script>
diff --git a/tests/visual/position/position_feedback.html b/tests/visual/position/position_feedback.html
index c254846d9..97682c628 100644
--- a/tests/visual/position/position_feedback.html
+++ b/tests/visual/position/position_feedback.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Position Visual Test: Feedback</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>
diff --git a/tests/visual/selectmenu/selectmenu.html b/tests/visual/selectmenu/selectmenu.html
index 1bac8dddc..6558c4a8a 100644
--- a/tests/visual/selectmenu/selectmenu.html
+++ b/tests/visual/selectmenu/selectmenu.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Selectmenu Visual Test: Default</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>
diff --git a/tests/visual/theme.html b/tests/visual/theme.html
index 5ba5865c8..2f7899b2b 100644
--- a/tests/visual/theme.html
+++ b/tests/visual/theme.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Example Page</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/mouse.js"></script>
diff --git a/tests/visual/tooltip/animations.html b/tests/visual/tooltip/animations.html
index d21c437a5..6131db436 100644
--- a/tests/visual/tooltip/animations.html
+++ b/tests/visual/tooltip/animations.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Tooltip Visual Test: Animations</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>
diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html
index f8523198c..8d5364d78 100644
--- a/tests/visual/tooltip/tooltip.html
+++ b/tests/visual/tooltip/tooltip.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Tooltip Visual Test: Default</title>
 	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../ui/core.js"></script>
 	<script src="../../../ui/widget.js"></script>
 	<script src="../../../ui/position.js"></script>