From abc97542dd55aef1c906d6cb3be07bc9c1720fce Mon Sep 17 00:00:00 2001
From: Ghislain Seguin <ghislain@gmail.com>
Date: Fri, 10 Jan 2014 12:21:13 -0700
Subject: [PATCH] Source tree: Moved third party code to external directory

Fixes gh-6871
---
 Gruntfile.js                                  | 36 ++++++-------------
 .../autodividers-linkbar-demo.html            |  2 +-
 demos/listview-grid/listview-grid.html        |  2 +-
 demos/pages-dialog/dialog-alt.html            |  2 +-
 demos/pages-dialog/dialog-buttons.html        |  2 +-
 demos/pages-dialog/dialog-corners.html        |  2 +-
 demos/pages-dialog/dialog-noclosebtn.html     |  2 +-
 demos/pages-dialog/dialog-overlay.html        |  2 +-
 demos/pages-dialog/dialog-rightclosebtn.html  |  2 +-
 demos/pages-dialog/dialog-success.html        |  2 +-
 demos/pages-dialog/dialog-with-select.html    |  2 +-
 demos/pages-dialog/dialog.html                |  2 +-
 demos/pages-multi-page/index.html             |  2 +-
 demos/pages-single-page/index.html            |  2 +-
 demos/pages/samepagetransition.html           |  2 +-
 demos/pages/startpage.html                    |  2 +-
 demos/panel-external-internal/index.html      |  2 +-
 demos/panel-external-internal/page-b.html     |  2 +-
 demos/panel-external-internal/page-c.html     |  2 +-
 demos/swipe-page/buenosaires.html             |  2 +-
 demos/swipe-page/capetown.html                |  2 +-
 demos/swipe-page/newyork.html                 |  2 +-
 demos/swipe-page/paris.html                   |  2 +-
 demos/swipe-page/seoul.html                   |  2 +-
 demos/swipe-page/sydney.html                  |  2 +-
 {js => external/jquery-ui}/jquery.ui.core.js  |  0
 .../jquery-ui}/jquery.ui.tabs.js              |  0
 .../jquery-ui}/jquery.ui.widget.js            |  0
 {js => external/jquery}/jquery.js             |  0
 .../jquery/plugins}/jquery.hashchange.js      |  0
 external/{ => qunit}/qunit.css                |  0
 external/{ => qunit}/qunit.js                 |  0
 js/events/navigate.js                         |  2 +-
 js/jquery.mobile.helpers.js                   |  2 +-
 js/jquery.mobile.init.js                      |  4 +--
 js/jquery.mobile.js                           |  1 -
 js/jquery.mobile.navigation.js                |  2 +-
 js/jquery.mobile.widget.js                    |  2 +-
 js/jquery.tag.inserter.js                     |  2 +-
 js/requirejs.config.js                        | 14 +++++---
 js/widgets/pagecontainer.js                   |  2 +-
 js/widgets/popup.js                           |  2 +-
 js/widgets/tabs.js                            |  2 +-
 tests/functional/addrbar.html                 |  2 +-
 tests/functional/autodividers.html            |  2 +-
 tests/functional/eventlogger.html             |  2 +-
 tests/functional/gridlayout.html              |  2 +-
 tests/functional/hashchange/hashchange.html   |  2 +-
 tests/functional/hashchange/hashchange1.html  |  2 +-
 tests/functional/hashchange/hashchange2.html  |  2 +-
 tests/integration/checkboxradio/index.html    |  4 +--
 tests/integration/collapsible/index.html      |  4 +--
 tests/integration/core/index.html             |  4 +--
 tests/integration/degrade-inputs/index.html   |  4 +--
 tests/integration/dialog-extension/index.html |  4 +--
 .../dialog-extension/no-hash-tests.html       |  4 +--
 tests/integration/dialog/index.html           |  4 +--
 tests/integration/dialog/no-hash-tests.html   |  4 +--
 tests/integration/filterable/index.html       |  4 +--
 tests/integration/fixed-toolbar/index.html    |  4 +--
 tests/integration/forms/index.html            |  4 +--
 tests/integration/listview/index.html         |  4 +--
 .../listview/push-state-disabled-tests.html   |  2 +-
 tests/integration/navigation/base-tests.html  |  4 +--
 .../navigation/click-handler-tests.html       |  4 +--
 .../event/beforenavigate-tests.html           |  4 +--
 tests/integration/navigation/event/index.html |  4 +--
 .../event/push-state-disabled-tests.html      |  2 +-
 tests/integration/navigation/index.html       |  4 +--
 .../init-query-param-hash-tests.html          |  2 +-
 .../init-tests/query-param-hash.html          |  4 +--
 .../integration/navigation/method/index.html  |  4 +--
 .../push-state-disabled-method-tests.html     |  2 +-
 .../navigation/multipage/index.html           |  4 +--
 .../push-state-disabled-base-tests.html       |  2 +-
 .../navigation/push-state-disabled-tests.html |  2 +-
 .../navigation/sequence/index.html            |  4 +--
 .../sequence-dialog-hash-key-tests.html       |  2 +-
 ...nce-path1-path2-dialog-hash-key-tests.html |  2 +-
 ...-state-disabled-dialog-hash-key-tests.html |  2 +-
 ...led-path1-path2-dialog-hash-key-tests.html |  2 +-
 .../sequence-push-state-disabled-tests.html   |  2 +-
 .../sequence/sequence-redirect.html           |  4 +--
 tests/integration/page/index.html             |  4 +--
 tests/integration/popup/index.html            |  4 +--
 tests/integration/select/cached-tests.html    |  4 +--
 tests/integration/select/index.html           |  4 +--
 tests/integration/toolbar/index.html          |  4 +--
 tests/integration/transitions/index.html      |  4 +--
 tests/unit/button-markup/index.html           |  4 +--
 tests/unit/button/index.html                  |  4 +--
 tests/unit/checkboxradio/index.html           |  4 +--
 tests/unit/content/index.html                 |  4 +--
 tests/unit/controlgroup/index.html            |  4 +--
 tests/unit/core/index.html                    |  4 +--
 tests/unit/degrade-inputs/index.html          |  4 +--
 tests/unit/dialog/index.html                  |  4 +--
 tests/unit/event/index.html                   |  4 +--
 tests/unit/field-contain/index.html           |  4 +--
 tests/unit/filterable/index.html              |  4 +--
 tests/unit/fixed-toolbar/index.html           |  4 +--
 tests/unit/flipswitch/index.html              |  4 +--
 .../unit/individual-modules/button-tests.html |  4 +--
 .../individual-modules/collapsible-tests.html |  4 +--
 .../collapsibleset-tests.html                 |  4 +--
 .../individual-modules/textinput-tests.html   |  4 +--
 tests/unit/init/dialog-load-tests.html        |  4 +--
 tests/unit/init/index.html                    |  4 +--
 tests/unit/init/nopage.html                   |  4 +--
 tests/unit/kitchensink/index.html             |  6 ++--
 tests/unit/loader/index.html                  |  4 +--
 tests/unit/media/index.html                   |  4 +--
 tests/unit/navbar/index.html                  |  4 +--
 tests/unit/page-sections/index.html           |  4 +--
 tests/unit/page/index.html                    |  4 +--
 tests/unit/panel/index.html                   |  4 +--
 tests/unit/path/index.html                    |  4 +--
 tests/unit/popup/index.html                   |  4 +--
 tests/unit/rangeslider/index.html             |  4 +--
 tests/unit/select/index.html                  |  4 +--
 tests/unit/slider/index.html                  |  4 +--
 tests/unit/support/index.html                 |  4 +--
 tests/unit/table/index.html                   |  4 +--
 tests/unit/textinput/index.html               |  4 +--
 tests/unit/transitions/index.html             |  4 +--
 tests/unit/widget/index.html                  |  4 +--
 tests/unit/zoom/index.html                    |  4 +--
 tests/unit/zoom/initial-disable.html          |  6 ++--
 tools/config-props.html                       |  2 +-
 tools/index.html                              |  2 +-
 130 files changed, 210 insertions(+), 221 deletions(-)
 rename {js => external/jquery-ui}/jquery.ui.core.js (100%)
 rename {js/widgets => external/jquery-ui}/jquery.ui.tabs.js (100%)
 rename {js => external/jquery-ui}/jquery.ui.widget.js (100%)
 rename {js => external/jquery}/jquery.js (100%)
 rename {js => external/jquery/plugins}/jquery.hashchange.js (100%)
 rename external/{ => qunit}/qunit.css (100%)
 rename external/{ => qunit}/qunit.js (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 77e3ad472e1..2a21ee53593 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -642,9 +642,8 @@ module.exports = function( grunt ) {
 					baseUrl: ".",
 					src: [
 						"js/**/*.js",
-						"!js/jquery.js",
-						"!js/**/jquery.ui*.js",
-						"!js/jquery.hashchange.js"
+						"!js/jquery.tag.inserter.js",
+						"!js/requirejs.config.js"
 					],
 					instrumentedFiles: "temp/",
 					htmlReport: "build/report/coverage",
@@ -740,22 +739,17 @@ module.exports = function( grunt ) {
 			options: {
 
 				// Bower components folder will be removed afterwards
-				clean: true
+				clean: true,
+				destPrefix: "external"
 			},
 			tests: {
-				options: {
-					destPrefix: "external"
-				},
 				files: {
-					"qunit.js": "qunit/qunit/qunit.js",
-					"qunit.css": "qunit/qunit/qunit.css",
+					"qunit/qunit.js": "qunit/qunit/qunit.js",
+					"qunit/qunit.css": "qunit/qunit/qunit.css",
 					"jshint/jshint.js": "jshint/dist/jshint.js"
 				}
 			},
 			requirejs: {
-				options: {
-					destPrefix: "external"
-				},
 				files: {
 					"requirejs/require.js": "requirejs/require.js",
 					"requirejs/plugins/text.js": "requirejs-text/text.js",
@@ -763,16 +757,12 @@ module.exports = function( grunt ) {
 				}
 			},
 			jquery: {
-				options: {
-					destPrefix: "js"
-				},
 				files: {
-					"jquery.js": "jquery/jquery.js"
+					"jquery/jquery.js": "jquery/jquery.js"
 				}
 			},
 			"jquery-ui": {
 				options: {
-					destPrefix: "js",
 					copyOptions: {
 						process: function( content ) {
 							var version = grunt.file.readJSON( "bower.json" ).dependencies[ "jquery-ui" ];
@@ -784,13 +774,12 @@ module.exports = function( grunt ) {
 					}
 				},
 				files: {
-					"jquery.ui.core.js": "jquery-ui/ui/jquery.ui.core.js",
-					"jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js"
+					"jquery-ui/jquery.ui.core.js": "jquery-ui/ui/jquery.ui.core.js",
+					"jquery-ui/jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js"
 				}
 			},
 			"jquery-ui-tabs": {
 				options: {
-					destPrefix: "js",
 					copyOptions: {
 						process: function( content ) {
 							var version = grunt.file.readJSON( "bower.json" ).dependencies[ "jquery-ui-tabs" ];
@@ -802,15 +791,12 @@ module.exports = function( grunt ) {
 					}
 				},
 				files: {
-					"widgets/jquery.ui.tabs.js": "jquery-ui-tabs/ui/jquery.ui.tabs.js"
+					"jquery-ui/jquery.ui.tabs.js": "jquery-ui-tabs/ui/jquery.ui.tabs.js"
 				}
 			},
 			"jquery-plugins": {
-				options: {
-					destPrefix: "js"
-				},
 				files: {
-					"jquery.hashchange.js": "jquery-hashchange/jquery.ba-hashchange.js"
+					"jquery/plugins/jquery.hashchange.js": "jquery-hashchange/jquery.ba-hashchange.js"
 				}
 			}
 		},
diff --git a/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html b/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html
index 7f78583313c..e30b694b097 100644
--- a/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html
+++ b/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="autodividers-linkbar.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="autodividers-linkbar.js"></script>
diff --git a/demos/listview-grid/listview-grid.html b/demos/listview-grid/listview-grid.html
index 2484b0ab153..b0c884e0d4c 100644
--- a/demos/listview-grid/listview-grid.html
+++ b/demos/listview-grid/listview-grid.html
@@ -7,7 +7,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="listview-grid.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 </head>
 <body>
diff --git a/demos/pages-dialog/dialog-alt.html b/demos/pages-dialog/dialog-alt.html
index 78df05e9b56..2c7885a6caf 100644
--- a/demos/pages-dialog/dialog-alt.html
+++ b/demos/pages-dialog/dialog-alt.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-dialog/dialog-buttons.html b/demos/pages-dialog/dialog-buttons.html
index c858b5ed08d..17eb3985d42 100644
--- a/demos/pages-dialog/dialog-buttons.html
+++ b/demos/pages-dialog/dialog-buttons.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>
diff --git a/demos/pages-dialog/dialog-corners.html b/demos/pages-dialog/dialog-corners.html
index 1ce5921b42d..60c3c42b2f8 100644
--- a/demos/pages-dialog/dialog-corners.html
+++ b/demos/pages-dialog/dialog-corners.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-dialog/dialog-noclosebtn.html b/demos/pages-dialog/dialog-noclosebtn.html
index d1820c594ed..f6ceb6bc16b 100644
--- a/demos/pages-dialog/dialog-noclosebtn.html
+++ b/demos/pages-dialog/dialog-noclosebtn.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-dialog/dialog-overlay.html b/demos/pages-dialog/dialog-overlay.html
index b6f9d6e90c6..5d04ade6a40 100644
--- a/demos/pages-dialog/dialog-overlay.html
+++ b/demos/pages-dialog/dialog-overlay.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-dialog/dialog-rightclosebtn.html b/demos/pages-dialog/dialog-rightclosebtn.html
index e622157ae46..87c5c66a1cb 100644
--- a/demos/pages-dialog/dialog-rightclosebtn.html
+++ b/demos/pages-dialog/dialog-rightclosebtn.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-dialog/dialog-success.html b/demos/pages-dialog/dialog-success.html
index fe29a0e1729..8fabf0e5871 100644
--- a/demos/pages-dialog/dialog-success.html
+++ b/demos/pages-dialog/dialog-success.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>
diff --git a/demos/pages-dialog/dialog-with-select.html b/demos/pages-dialog/dialog-with-select.html
index 430e00d68bb..048b970f513 100644
--- a/demos/pages-dialog/dialog-with-select.html
+++ b/demos/pages-dialog/dialog-with-select.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-dialog/dialog.html b/demos/pages-dialog/dialog.html
index 975abdfb5e7..1ff9c807d34 100644
--- a/demos/pages-dialog/dialog.html
+++ b/demos/pages-dialog/dialog.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-multi-page/index.html b/demos/pages-multi-page/index.html
index fc5ee144a6b..72dfa88f327 100644
--- a/demos/pages-multi-page/index.html
+++ b/demos/pages-multi-page/index.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages-single-page/index.html b/demos/pages-single-page/index.html
index ce1509ce13a..3a134310301 100644
--- a/demos/pages-single-page/index.html
+++ b/demos/pages-single-page/index.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>
diff --git a/demos/pages/samepagetransition.html b/demos/pages/samepagetransition.html
index 697f7d4818c..5b40c50cfed 100644
--- a/demos/pages/samepagetransition.html
+++ b/demos/pages/samepagetransition.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" href="../favicon.ico">
   <link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-  <script src="../../js/jquery.js"></script>
+  <script src="../../external/jquery/jquery.js"></script>
   <script src="../../js/"></script>
   <script>
     // JS
diff --git a/demos/pages/startpage.html b/demos/pages/startpage.html
index ea814e7ef6b..9ff454b3f2f 100644
--- a/demos/pages/startpage.html
+++ b/demos/pages/startpage.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" href="../favicon.ico">
   <link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-  <script src="../../js/jquery.js"></script>
+  <script src="../../external/jquery/jquery.js"></script>
   <script src="../../js/"></script>
   <script>
 $('#page1').on('pagecreate', function() {
diff --git a/demos/panel-external-internal/index.html b/demos/panel-external-internal/index.html
index 3ec2ef0e9eb..17124ba3363 100644
--- a/demos/panel-external-internal/index.html
+++ b/demos/panel-external-internal/index.html
@@ -6,7 +6,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 	<script>
 		$( document ).on( "pagecreate", function() {
diff --git a/demos/panel-external-internal/page-b.html b/demos/panel-external-internal/page-b.html
index ea62827aa84..dc3b3142120 100644
--- a/demos/panel-external-internal/page-b.html
+++ b/demos/panel-external-internal/page-b.html
@@ -6,7 +6,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 	<script>
 		$( document ).on( "pagecreate", function() {
diff --git a/demos/panel-external-internal/page-c.html b/demos/panel-external-internal/page-c.html
index 096e0d21e73..1a54b12f856 100644
--- a/demos/panel-external-internal/page-c.html
+++ b/demos/panel-external-internal/page-c.html
@@ -6,7 +6,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 	<script>
 		$( document ).on( "pagecreate", function() {
diff --git a/demos/swipe-page/buenosaires.html b/demos/swipe-page/buenosaires.html
index e044e4e7400..970f2ec9d3f 100644
--- a/demos/swipe-page/buenosaires.html
+++ b/demos/swipe-page/buenosaires.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>
diff --git a/demos/swipe-page/capetown.html b/demos/swipe-page/capetown.html
index 1d716020333..c9f1246837c 100644
--- a/demos/swipe-page/capetown.html
+++ b/demos/swipe-page/capetown.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>
diff --git a/demos/swipe-page/newyork.html b/demos/swipe-page/newyork.html
index b907b01bd9b..fa55cd8d676 100644
--- a/demos/swipe-page/newyork.html
+++ b/demos/swipe-page/newyork.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>
diff --git a/demos/swipe-page/paris.html b/demos/swipe-page/paris.html
index 07cc3828551..c66e0ddd624 100644
--- a/demos/swipe-page/paris.html
+++ b/demos/swipe-page/paris.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>
diff --git a/demos/swipe-page/seoul.html b/demos/swipe-page/seoul.html
index 67c94a0de99..955f4a17550 100644
--- a/demos/swipe-page/seoul.html
+++ b/demos/swipe-page/seoul.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>
diff --git a/demos/swipe-page/sydney.html b/demos/swipe-page/sydney.html
index 3421a93d6f9..46636dbc27b 100644
--- a/demos/swipe-page/sydney.html
+++ b/demos/swipe-page/sydney.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>
diff --git a/js/jquery.ui.core.js b/external/jquery-ui/jquery.ui.core.js
similarity index 100%
rename from js/jquery.ui.core.js
rename to external/jquery-ui/jquery.ui.core.js
diff --git a/js/widgets/jquery.ui.tabs.js b/external/jquery-ui/jquery.ui.tabs.js
similarity index 100%
rename from js/widgets/jquery.ui.tabs.js
rename to external/jquery-ui/jquery.ui.tabs.js
diff --git a/js/jquery.ui.widget.js b/external/jquery-ui/jquery.ui.widget.js
similarity index 100%
rename from js/jquery.ui.widget.js
rename to external/jquery-ui/jquery.ui.widget.js
diff --git a/js/jquery.js b/external/jquery/jquery.js
similarity index 100%
rename from js/jquery.js
rename to external/jquery/jquery.js
diff --git a/js/jquery.hashchange.js b/external/jquery/plugins/jquery.hashchange.js
similarity index 100%
rename from js/jquery.hashchange.js
rename to external/jquery/plugins/jquery.hashchange.js
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/js/events/navigate.js b/js/events/navigate.js
index 41f13eb41bb..7d3af2eb73d 100644
--- a/js/events/navigate.js
+++ b/js/events/navigate.js
@@ -6,7 +6,7 @@
 // TODO break out pushstate support test so we don't depend on the whole thing
 define([
 	"jquery",
-	"jquery.hashchange",
+	"jquery-plugins/jquery.hashchange",
 	"./../jquery.mobile.ns",
 	"./../jquery.mobile.support" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/jquery.mobile.helpers.js b/js/jquery.mobile.helpers.js
index a64e1f3e5df..c7fce1543ce 100644
--- a/js/jquery.mobile.helpers.js
+++ b/js/jquery.mobile.helpers.js
@@ -5,7 +5,7 @@
 //>>css.structure: ../css/structure/jquery.mobile.core.css
 //>>css.theme: ../css/themes/default/jquery.mobile.theme.css
 
-define( [ "jquery", "./jquery.mobile.ns", "./jquery.ui.core" ], function( jQuery ) {
+define( [ "jquery", "./jquery.mobile.ns", "jquery-ui/jquery.ui.core" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, window, undefined ) {
 
diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js
index 05789572df9..d1448f081b8 100644
--- a/js/jquery.mobile.init.js
+++ b/js/jquery.mobile.init.js
@@ -5,7 +5,7 @@
 
 define([
 	"jquery",
-	"./jquery.ui.core",
+	"jquery-ui/jquery.ui.core",
 	"./jquery.mobile.defaults",
 	"./jquery.mobile.helpers",
 	"./jquery.mobile.data",
@@ -16,7 +16,7 @@ define([
 	"./jquery.mobile.navigation",
 	"./widgets/loader",
 	"./jquery.mobile.vmouse",
-	"jquery.hashchange" ], function( jQuery ) {
+	"jquery-plugins/jquery.hashchange" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, window, undefined ) {
 	var	$html = $( "html" ),
diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js
index 01249aa3cf0..57d62174ffb 100644
--- a/js/jquery.mobile.js
+++ b/js/jquery.mobile.js
@@ -49,7 +49,6 @@ define([
 	"./widgets/table.reflow",
 	"./widgets/filterable",
 	"./widgets/filterable.backcompat",
-	"./widgets/jquery.ui.tabs",
 	"./widgets/tabs",
 	"./jquery.mobile.zoom",
 	"./jquery.mobile.zoom.iosorientationfix"
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
index f13c46217e7..661ad5a1829 100644
--- a/js/jquery.mobile.navigation.js
+++ b/js/jquery.mobile.navigation.js
@@ -12,7 +12,7 @@ define( [
 	"./navigation/method",
 	"./jquery.mobile.events",
 	"./jquery.mobile.support",
-	"jquery.hashchange",
+	"jquery-plugins/jquery.hashchange",
 	"./widgets/pagecontainer",
 	"./widgets/page",
 	"./transitions/handlers" ], function( jQuery ) {
diff --git a/js/jquery.mobile.widget.js b/js/jquery.mobile.widget.js
index 2005ee7a83b..d9357b12197 100644
--- a/js/jquery.mobile.widget.js
+++ b/js/jquery.mobile.widget.js
@@ -6,7 +6,7 @@
 
 define( [ "jquery",
 	"./jquery.mobile.ns",
-	"jquery.ui.widget",
+	"jquery-ui/jquery.ui.widget",
 	"./jquery.mobile.data" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
diff --git a/js/jquery.tag.inserter.js b/js/jquery.tag.inserter.js
index c1256cd3eb9..440df043242 100644
--- a/js/jquery.tag.inserter.js
+++ b/js/jquery.tag.inserter.js
@@ -8,7 +8,7 @@
 		version = "",
 		myScriptTag = document.getElementsByTagName( "script" )[document.getElementsByTagName( "script" ).length - 1],
 		baseUrl = myScriptTag.src.replace( /(.*)\/.*$/, "$1/" ),
-		url = baseUrl + "jquery.js";
+		url = baseUrl + "../external/jquery/jquery.js";
 
 	if ( results ) {
 		version = decodeURIComponent( results[results.length - 1].replace( /\+/g, " " ) );
diff --git a/js/requirejs.config.js b/js/requirejs.config.js
index 6248aae508e..7fe7667f85b 100644
--- a/js/requirejs.config.js
+++ b/js/requirejs.config.js
@@ -2,12 +2,16 @@ requirejs.config({
 	"paths": {
 		// requireJS plugins
 		"text": "../external/requirejs/plugins/text",
-		"json": "../external/requirejs/plugins/json"
+		"json": "../external/requirejs/plugins/json",
+
+		"jquery": "../external/jquery/jquery",
+		"jquery-ui": "../external/jquery-ui",
+		"jquery-plugins": "../external/jquery/plugins"
 	},
 	"shim": {
-		"jquery.hashchange": [ "jquery" ],
-		"jquery.ui.widget": [ "jquery" ],
-		"widgets/jquery.ui.tabs": [ "jquery.ui.widget" ],
-		"widgets/jquery.ui.core": [ "jquery" ]
+		"jquery-plugins/jquery.hashchange": [ "jquery" ],
+		"jquery-ui/jquery.ui.widget": [ "jquery" ],
+		"jquery-ui/jquery.ui.tabs": [ "jquery-ui/jquery.ui.widget" ],
+		"jquery-ui/jquery.ui.core": [ "jquery" ]
 	}
 });
diff --git a/js/widgets/pagecontainer.js b/js/widgets/pagecontainer.js
index d87365962e0..68fdf86b888 100644
--- a/js/widgets/pagecontainer.js
+++ b/js/widgets/pagecontainer.js
@@ -13,7 +13,7 @@ define( [
 	"../navigation/method",
 	"../jquery.mobile.events",
 	"../jquery.mobile.support",
-	"jquery.hashchange",
+	"jquery-plugins/jquery.hashchange",
 	"../widgets/page",
 	"../transitions/handlers" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index 84b25f8cfaf..685a7ef86a7 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -22,7 +22,7 @@ define( [
 	"../navigation/navigator",
 	"../navigation/method",
 	"../jquery.mobile.navigation",
-	"jquery.hashchange" ], function( jQuery ) {
+	"jquery-plugins/jquery.hashchange" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
diff --git a/js/widgets/tabs.js b/js/widgets/tabs.js
index c59f18a0464..b9e545a38ea 100644
--- a/js/widgets/tabs.js
+++ b/js/widgets/tabs.js
@@ -4,7 +4,7 @@
 //>>group: Widgets
 //>>css.theme: ../css/themes/default/jquery.mobile.theme.css
 
-define( [ "jquery", "../jquery.mobile.widget", "../jquery.ui.core","./jquery.ui.tabs" ], function( jQuery ) {
+define( [ "jquery", "../jquery.mobile.widget", "jquery-ui/jquery.ui.core", "jquery-ui/jquery.ui.tabs" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
diff --git a/tests/functional/addrbar.html b/tests/functional/addrbar.html
index ebe18df52cc..311db08a2d9 100644
--- a/tests/functional/addrbar.html
+++ b/tests/functional/addrbar.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet"  href="../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../docs/_assets/css/jqm-docs.css" />
 	<script src="../../js/jquery.tag.inserter.js"></script>
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../docs/_assets/js/jqm-docs.js"></script>
 	<script src="../../js/"></script>
 
diff --git a/tests/functional/autodividers.html b/tests/functional/autodividers.html
index f4ff1f23606..0d8b443e360 100644
--- a/tests/functional/autodividers.html
+++ b/tests/functional/autodividers.html
@@ -5,7 +5,7 @@
 	<meta charset="utf-8" />
 	<title>jQuery Mobile: Autodividers</title>
 	<link rel="stylesheet"  href="../../css/themes/default/jquery.mobile.css" />
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 </head>
 
diff --git a/tests/functional/eventlogger.html b/tests/functional/eventlogger.html
index 1486f2e4829..b5c24284605 100644
--- a/tests/functional/eventlogger.html
+++ b/tests/functional/eventlogger.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet"  href="../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../docs/_assets/css/jqm-docs.css" />
 	<script src="../../js/jquery.tag.inserter.js"></script>
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../docs/_assets/js/jqm-docs.js"></script>
 	<script src="../../js/"></script>
 
diff --git a/tests/functional/gridlayout.html b/tests/functional/gridlayout.html
index 286386a5720..89e4f1a42b7 100644
--- a/tests/functional/gridlayout.html
+++ b/tests/functional/gridlayout.html
@@ -6,7 +6,7 @@
 	<link rel="stylesheet"  href="../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../docs/_assets/css/jqm-docs.css" />
 	<script src="../../js/jquery.tag.inserter.js"></script>
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../docs/_assets/js/jqm-docs.js"></script>
 	<script src="../../js/"></script>
 
diff --git a/tests/functional/hashchange/hashchange.html b/tests/functional/hashchange/hashchange.html
index f01824d1744..1c00eb8ca47 100644
--- a/tests/functional/hashchange/hashchange.html
+++ b/tests/functional/hashchange/hashchange.html
@@ -6,7 +6,7 @@
 	<title>jQuery Mobile: hashchange Tester: A page</title>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script>
 (function( $, undefined ) {
 	$( document ).bind( "mobileinit", function() {
diff --git a/tests/functional/hashchange/hashchange1.html b/tests/functional/hashchange/hashchange1.html
index 7a31cd713f5..cd41f3c9e59 100644
--- a/tests/functional/hashchange/hashchange1.html
+++ b/tests/functional/hashchange/hashchange1.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../../docs/_assets/css/jqm-docs.css" />
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../docs/_assets/js/jqm-docs.js"></script>
 	<script src="../../../js/"></script>
 </head>
diff --git a/tests/functional/hashchange/hashchange2.html b/tests/functional/hashchange/hashchange2.html
index 210655c925c..54de4710709 100644
--- a/tests/functional/hashchange/hashchange2.html
+++ b/tests/functional/hashchange/hashchange2.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
 	<link rel="stylesheet" href="../../../docs/_assets/css/jqm-docs.css" />
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../../docs/_assets/js/jqm-docs.js"></script>
 	<script src="../../../js/"></script>
 </head>
diff --git a/tests/integration/checkboxradio/index.html b/tests/integration/checkboxradio/index.html
index be34f14dd9c..3333461b1ef 100644
--- a/tests/integration/checkboxradio/index.html
+++ b/tests/integration/checkboxradio/index.html
@@ -9,7 +9,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -24,7 +24,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/collapsible/index.html b/tests/integration/collapsible/index.html
index 7da1bc814e6..a19b39cc74a 100644
--- a/tests/integration/collapsible/index.html
+++ b/tests/integration/collapsible/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -25,7 +25,7 @@
 		]);
 	</script>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/core/index.html b/tests/integration/core/index.html
index bf19d455840..39df6a23983 100644
--- a/tests/integration/core/index.html
+++ b/tests/integration/core/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "jquery.mobile.core" ],
@@ -19,7 +19,7 @@
 		]);
 	</script>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/degrade-inputs/index.html b/tests/integration/degrade-inputs/index.html
index a252c49dddb..3c15f52ef74 100644
--- a/tests/integration/degrade-inputs/index.html
+++ b/tests/integration/degrade-inputs/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -21,7 +21,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<script src="../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/integration/dialog-extension/index.html b/tests/integration/dialog-extension/index.html
index 743af476fe4..f6304af94f0 100644
--- a/tests/integration/dialog-extension/index.html
+++ b/tests/integration/dialog-extension/index.html
@@ -15,7 +15,7 @@
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -33,7 +33,7 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/dialog-extension/no-hash-tests.html b/tests/integration/dialog-extension/no-hash-tests.html
index 38f347d3571..ac1c2e6503c 100644
--- a/tests/integration/dialog-extension/no-hash-tests.html
+++ b/tests/integration/dialog-extension/no-hash-tests.html
@@ -16,7 +16,7 @@
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -35,7 +35,7 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/dialog/index.html b/tests/integration/dialog/index.html
index aab4df11293..1a8ec4ce72e 100644
--- a/tests/integration/dialog/index.html
+++ b/tests/integration/dialog/index.html
@@ -15,7 +15,7 @@
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -33,7 +33,7 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/dialog/no-hash-tests.html b/tests/integration/dialog/no-hash-tests.html
index 51b66214e02..4a8fda1e529 100644
--- a/tests/integration/dialog/no-hash-tests.html
+++ b/tests/integration/dialog/no-hash-tests.html
@@ -16,7 +16,7 @@
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -34,7 +34,7 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/filterable/index.html b/tests/integration/filterable/index.html
index a7031c6ea32..d1ebdfea69e 100644
--- a/tests/integration/filterable/index.html
+++ b/tests/integration/filterable/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script type="text/javascript">
 		// redirects from push-state-tests.html
 		$( document ).bind( 'mobileinit', function(){
@@ -41,7 +41,7 @@
 	</script>
 
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 	
diff --git a/tests/integration/fixed-toolbar/index.html b/tests/integration/fixed-toolbar/index.html
index c2d24bde88e..b9740501fc5 100644
--- a/tests/integration/fixed-toolbar/index.html
+++ b/tests/integration/fixed-toolbar/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.fn.fixedtoolbar = $.fn.toolbar;
 		$.testHelper.asyncLoad([
@@ -26,7 +26,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/forms/index.html b/tests/integration/forms/index.html
index 4625a5a78e6..0df3b4c6bd4 100644
--- a/tests/integration/forms/index.html
+++ b/tests/integration/forms/index.html
@@ -14,8 +14,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
diff --git a/tests/integration/listview/index.html b/tests/integration/listview/index.html
index 1d9df71419b..cf72754be26 100644
--- a/tests/integration/listview/index.html
+++ b/tests/integration/listview/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
   <script type="text/javascript">
     // redirects from push-state-tests.html
     $( document ).bind( 'mobileinit', function(){
@@ -34,7 +34,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/listview/push-state-disabled-tests.html b/tests/integration/listview/push-state-disabled-tests.html
index a00c55a1598..28c4721dbe7 100644
--- a/tests/integration/listview/push-state-disabled-tests.html
+++ b/tests/integration/listview/push-state-disabled-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./" );
diff --git a/tests/integration/navigation/base-tests.html b/tests/integration/navigation/base-tests.html
index 24b390e8afd..abe3ae509c0 100644
--- a/tests/integration/navigation/base-tests.html
+++ b/tests/integration/navigation/base-tests.html
@@ -23,8 +23,8 @@
 
 
 	<link rel="stylesheet" href="../../../../../css/themes/default/jquery.mobile.css"/>
-	<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 type="text/javascript">
 		$.testHelper.setPushState();
 	</script>
diff --git a/tests/integration/navigation/click-handler-tests.html b/tests/integration/navigation/click-handler-tests.html
index 725ca001575..29f7598cd7f 100644
--- a/tests/integration/navigation/click-handler-tests.html
+++ b/tests/integration/navigation/click-handler-tests.html
@@ -13,8 +13,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
diff --git a/tests/integration/navigation/event/beforenavigate-tests.html b/tests/integration/navigation/event/beforenavigate-tests.html
index a338160b6a8..0c62f10f895 100644
--- a/tests/integration/navigation/event/beforenavigate-tests.html
+++ b/tests/integration/navigation/event/beforenavigate-tests.html
@@ -8,8 +8,8 @@
     <script src="../../../../js/requirejs.config.js"></script>
 	<script src="../../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../../external/qunit.js"></script>
-	<link rel="stylesheet" href="../../../../external/qunit.css"/>
+	<script src="../../../../external/qunit/qunit.js"></script>
+	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "events/navigate" ],
diff --git a/tests/integration/navigation/event/index.html b/tests/integration/navigation/event/index.html
index bf7ed57e160..c69f9f8fc1a 100644
--- a/tests/integration/navigation/event/index.html
+++ b/tests/integration/navigation/event/index.html
@@ -8,8 +8,8 @@
     <script src="../../../../js/requirejs.config.js"></script>
 	<script src="../../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../../external/qunit.js"></script>
-	<link rel="stylesheet" href="../../../../external/qunit.css"/>
+	<script src="../../../../external/qunit/qunit.js"></script>
+	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "events/navigate" ],
diff --git a/tests/integration/navigation/event/push-state-disabled-tests.html b/tests/integration/navigation/event/push-state-disabled-tests.html
index 836a0902e9e..d15d800e365 100644
--- a/tests/integration/navigation/event/push-state-disabled-tests.html
+++ b/tests/integration/navigation/event/push-state-disabled-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./" );
diff --git a/tests/integration/navigation/index.html b/tests/integration/navigation/index.html
index f3d68cd602f..ba003d4fd98 100644
--- a/tests/integration/navigation/index.html
+++ b/tests/integration/navigation/index.html
@@ -19,8 +19,8 @@
     <script src="../../../js/jquery.mobile.define.js"></script>
     <script src="../../../js/"></script>
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css"/>
-	<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 type="text/javascript" src="navigation_core.js"></script>
 	<script type="text/javascript" src="navigation_paths.js"></script>
 	<script src="../../swarminject.js"></script>
diff --git a/tests/integration/navigation/init-query-param-hash-tests.html b/tests/integration/navigation/init-query-param-hash-tests.html
index f56197388fd..9a6f550da60 100644
--- a/tests/integration/navigation/init-query-param-hash-tests.html
+++ b/tests/integration/navigation/init-query-param-hash-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.redirect( "init-tests/query-param-hash.html#loaded?test-query-param-hash=true" );
diff --git a/tests/integration/navigation/init-tests/query-param-hash.html b/tests/integration/navigation/init-tests/query-param-hash.html
index 495da02aca3..80da2e15a43 100644
--- a/tests/integration/navigation/init-tests/query-param-hash.html
+++ b/tests/integration/navigation/init-tests/query-param-hash.html
@@ -15,8 +15,8 @@
 	</script>
 	<script src="../../../../js/"></script>
 	<link rel="stylesheet"	href="../../../../css/themes/default/jquery.mobile.css"/>
-	<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="../../../swarminject.js"></script>
   <script type="text/javascript" src="navigation_query_param_hash.js"></script>
 </head>
diff --git a/tests/integration/navigation/method/index.html b/tests/integration/navigation/method/index.html
index d022691413c..a29893ea4de 100644
--- a/tests/integration/navigation/method/index.html
+++ b/tests/integration/navigation/method/index.html
@@ -8,8 +8,8 @@
     <script src="../../../../js/requirejs.config.js"></script>
 	<script src="../../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../../external/qunit.js"></script>
-	<link rel="stylesheet" href="../../../../../external/qunit.css"/>
+	<script src="../../../../external/qunit/qunit.js"></script>
+	<link rel="stylesheet" href="../../../../../external/qunit/qunit.css"/>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "navigation/method" ],
diff --git a/tests/integration/navigation/method/push-state-disabled-method-tests.html b/tests/integration/navigation/method/push-state-disabled-method-tests.html
index 836a0902e9e..d15d800e365 100644
--- a/tests/integration/navigation/method/push-state-disabled-method-tests.html
+++ b/tests/integration/navigation/method/push-state-disabled-method-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./" );
diff --git a/tests/integration/navigation/multipage/index.html b/tests/integration/navigation/multipage/index.html
index 97c501696f9..f6e8007730e 100644
--- a/tests/integration/navigation/multipage/index.html
+++ b/tests/integration/navigation/multipage/index.html
@@ -15,7 +15,7 @@
 	</script>
 	<script src="../../../jquery.setNameSpace.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
-	<script src="../../../../external/qunit.js"></script>
+	<script src="../../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -30,7 +30,7 @@
 
 
 	<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
 	<script src="../../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/integration/navigation/push-state-disabled-base-tests.html b/tests/integration/navigation/push-state-disabled-base-tests.html
index f79b0e167c3..aa019ede53c 100644
--- a/tests/integration/navigation/push-state-disabled-base-tests.html
+++ b/tests/integration/navigation/push-state-disabled-base-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "base-tests.html" );
diff --git a/tests/integration/navigation/push-state-disabled-tests.html b/tests/integration/navigation/push-state-disabled-tests.html
index a00c55a1598..28c4721dbe7 100644
--- a/tests/integration/navigation/push-state-disabled-tests.html
+++ b/tests/integration/navigation/push-state-disabled-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./" );
diff --git a/tests/integration/navigation/sequence/index.html b/tests/integration/navigation/sequence/index.html
index 9a125787545..646a7822a05 100644
--- a/tests/integration/navigation/sequence/index.html
+++ b/tests/integration/navigation/sequence/index.html
@@ -15,7 +15,7 @@
 	</script>
 	<script src="../../../jquery.setNameSpace.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
-	<script src="../../../../external/qunit.js"></script>
+	<script src="../../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -32,7 +32,7 @@
 
 
 	<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
 	<script src="../../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/integration/navigation/sequence/sequence-dialog-hash-key-tests.html b/tests/integration/navigation/sequence/sequence-dialog-hash-key-tests.html
index c997aa859a7..5d2b1d40da3 100644
--- a/tests/integration/navigation/sequence/sequence-dialog-hash-key-tests.html
+++ b/tests/integration/navigation/sequence/sequence-dialog-hash-key-tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../../js/"></script>
 	<script>
 (function($) {
diff --git a/tests/integration/navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html b/tests/integration/navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
index e56d94d4ff2..b9a0cb71125 100644
--- a/tests/integration/navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
+++ b/tests/integration/navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../../js/"></script>
 	<script>
 (function($) {
diff --git a/tests/integration/navigation/sequence/sequence-push-state-disabled-dialog-hash-key-tests.html b/tests/integration/navigation/sequence/sequence-push-state-disabled-dialog-hash-key-tests.html
index 443ae235bd2..d8388e27831 100644
--- a/tests/integration/navigation/sequence/sequence-push-state-disabled-dialog-hash-key-tests.html
+++ b/tests/integration/navigation/sequence/sequence-push-state-disabled-dialog-hash-key-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./sequence-dialog-hash-key-tests.html" );
diff --git a/tests/integration/navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html b/tests/integration/navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html
index a134255d284..535302107bc 100644
--- a/tests/integration/navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html
+++ b/tests/integration/navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./sequence-path1-path2-dialog-hash-key-tests.html" );
diff --git a/tests/integration/navigation/sequence/sequence-push-state-disabled-tests.html b/tests/integration/navigation/sequence/sequence-push-state-disabled-tests.html
index 6f33d84ca36..c0d1e8a0d36 100644
--- a/tests/integration/navigation/sequence/sequence-push-state-disabled-tests.html
+++ b/tests/integration/navigation/sequence/sequence-push-state-disabled-tests.html
@@ -4,7 +4,7 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/integration/ls.php,
        test/integration/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../../external/jquery/jquery.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
 		$.testHelper.pushStateRedirect( "./index.html" );
diff --git a/tests/integration/navigation/sequence/sequence-redirect.html b/tests/integration/navigation/sequence/sequence-redirect.html
index a3145cedbd8..92380c41a4f 100644
--- a/tests/integration/navigation/sequence/sequence-redirect.html
+++ b/tests/integration/navigation/sequence/sequence-redirect.html
@@ -15,7 +15,7 @@
 	</script>
 	<script src="../../../jquery.setNameSpace.js"></script>
 	<script src="../../../jquery.testHelper.js"></script>
-	<script src="../../../../external/qunit.js"></script>
+	<script src="../../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -32,7 +32,7 @@
 
 
 	<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
 
 	<script src="../../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/page/index.html b/tests/integration/page/index.html
index 4b855c2a29b..c0c134165e9 100644
--- a/tests/integration/page/index.html
+++ b/tests/integration/page/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -25,7 +25,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/popup/index.html b/tests/integration/popup/index.html
index dafb6050737..67c12bee481 100644
--- a/tests/integration/popup/index.html
+++ b/tests/integration/popup/index.html
@@ -13,8 +13,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		( function( $, undefined ) {
 			// Set the default transition to "fade" if specified in the query
diff --git a/tests/integration/select/cached-tests.html b/tests/integration/select/cached-tests.html
index 3f9cb2b3ec3..1fb44e55726 100644
--- a/tests/integration/select/cached-tests.html
+++ b/tests/integration/select/cached-tests.html
@@ -13,8 +13,8 @@
 
 
     <link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-    <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>
 		$.testHelper.asyncLoad([
 			[
diff --git a/tests/integration/select/index.html b/tests/integration/select/index.html
index 59456a273cc..87769e65d93 100644
--- a/tests/integration/select/index.html
+++ b/tests/integration/select/index.html
@@ -9,7 +9,7 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -26,7 +26,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/toolbar/index.html b/tests/integration/toolbar/index.html
index 4d8665ab8fb..d92ef86d9a1 100644
--- a/tests/integration/toolbar/index.html
+++ b/tests/integration/toolbar/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -22,7 +22,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/integration/transitions/index.html b/tests/integration/transitions/index.html
index 0b299ddc2df..7e25f1e0023 100644
--- a/tests/integration/transitions/index.html
+++ b/tests/integration/transitions/index.html
@@ -14,8 +14,8 @@
 
 	<script src="../../../js/"></script>
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css"/>
-	<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 type="text/javascript" src="transitions_core.js"></script>
 	<script src="../../swarminject.js"></script>
diff --git a/tests/unit/button-markup/index.html b/tests/unit/button-markup/index.html
index 8b77d4d24a8..9076ed6ff9d 100644
--- a/tests/unit/button-markup/index.html
+++ b/tests/unit/button-markup/index.html
@@ -8,7 +8,7 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -28,7 +28,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/button/index.html b/tests/unit/button/index.html
index 06bed8a757b..d8406562e4d 100644
--- a/tests/unit/button/index.html
+++ b/tests/unit/button/index.html
@@ -13,8 +13,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
diff --git a/tests/unit/checkboxradio/index.html b/tests/unit/checkboxradio/index.html
index 5d365775fd0..9dcfe754d94 100644
--- a/tests/unit/checkboxradio/index.html
+++ b/tests/unit/checkboxradio/index.html
@@ -9,7 +9,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -28,7 +28,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/content/index.html b/tests/unit/content/index.html
index 6b930f505eb..a91fdc6d75f 100644
--- a/tests/unit/content/index.html
+++ b/tests/unit/content/index.html
@@ -7,7 +7,7 @@
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -16,7 +16,7 @@
 		]);
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<script src="../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/unit/controlgroup/index.html b/tests/unit/controlgroup/index.html
index 2da9c8f66bb..300c82e36a3 100644
--- a/tests/unit/controlgroup/index.html
+++ b/tests/unit/controlgroup/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			['widgets/page'],
@@ -27,7 +27,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/core/index.html b/tests/unit/core/index.html
index b696bb5de18..9f2500e04eb 100644
--- a/tests/unit/core/index.html
+++ b/tests/unit/core/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "jquery.mobile.core" ],
@@ -19,7 +19,7 @@
 		]);
 	</script>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/degrade-inputs/index.html b/tests/unit/degrade-inputs/index.html
index 631b18593ab..0970dfa8bba 100644
--- a/tests/unit/degrade-inputs/index.html
+++ b/tests/unit/degrade-inputs/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "jquery.mobile.degradeInputs"	],
@@ -20,7 +20,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<script src="../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/unit/dialog/index.html b/tests/unit/dialog/index.html
index 0d6040180bb..91fdef5111c 100644
--- a/tests/unit/dialog/index.html
+++ b/tests/unit/dialog/index.html
@@ -15,7 +15,7 @@
 	</script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -31,7 +31,7 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/event/index.html b/tests/unit/event/index.html
index b7c652d032b..f5022341b50 100644
--- a/tests/unit/event/index.html
+++ b/tests/unit/event/index.html
@@ -21,8 +21,8 @@
 	<script src="../../../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="event_core.js"></script>
 
diff --git a/tests/unit/field-contain/index.html b/tests/unit/field-contain/index.html
index 99973cf8f7f..d06e616691f 100644
--- a/tests/unit/field-contain/index.html
+++ b/tests/unit/field-contain/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -24,7 +24,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/filterable/index.html b/tests/unit/filterable/index.html
index 391d07c0b64..f30ab38d3d9 100644
--- a/tests/unit/filterable/index.html
+++ b/tests/unit/filterable/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -35,7 +35,7 @@
 	</script>
 
 	<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 	
diff --git a/tests/unit/fixed-toolbar/index.html b/tests/unit/fixed-toolbar/index.html
index eeed3dd79db..55fef1ac303 100644
--- a/tests/unit/fixed-toolbar/index.html
+++ b/tests/unit/fixed-toolbar/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -25,7 +25,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/flipswitch/index.html b/tests/unit/flipswitch/index.html
index f6f9a045f81..620aa0429ab 100644
--- a/tests/unit/flipswitch/index.html
+++ b/tests/unit/flipswitch/index.html
@@ -13,8 +13,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
diff --git a/tests/unit/individual-modules/button-tests.html b/tests/unit/individual-modules/button-tests.html
index de2412496bf..486722547b4 100644
--- a/tests/unit/individual-modules/button-tests.html
+++ b/tests/unit/individual-modules/button-tests.html
@@ -12,8 +12,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[
diff --git a/tests/unit/individual-modules/collapsible-tests.html b/tests/unit/individual-modules/collapsible-tests.html
index 034a0714fc2..a6c18579883 100644
--- a/tests/unit/individual-modules/collapsible-tests.html
+++ b/tests/unit/individual-modules/collapsible-tests.html
@@ -13,8 +13,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[
diff --git a/tests/unit/individual-modules/collapsibleset-tests.html b/tests/unit/individual-modules/collapsibleset-tests.html
index bc72bd69cd1..c8e3113bcc9 100644
--- a/tests/unit/individual-modules/collapsibleset-tests.html
+++ b/tests/unit/individual-modules/collapsibleset-tests.html
@@ -12,8 +12,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[
diff --git a/tests/unit/individual-modules/textinput-tests.html b/tests/unit/individual-modules/textinput-tests.html
index 4eb10f4a451..a8105ffe326 100644
--- a/tests/unit/individual-modules/textinput-tests.html
+++ b/tests/unit/individual-modules/textinput-tests.html
@@ -12,8 +12,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		$.testHelper.asyncLoad([
 			[
diff --git a/tests/unit/init/dialog-load-tests.html b/tests/unit/init/dialog-load-tests.html
index ade89200979..a94d0e7602e 100644
--- a/tests/unit/init/dialog-load-tests.html
+++ b/tests/unit/init/dialog-load-tests.html
@@ -6,11 +6,11 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
     <script type="text/javascript" src="../../../js/"></script>
     <script type="text/javascript" src="init_dialog.js"></script>
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 	</script>
diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html
index d0f9dd96fde..1134fdf7d74 100644
--- a/tests/unit/init/index.html
+++ b/tests/unit/init/index.html
@@ -6,7 +6,7 @@
 	<!-- meta viewport left out on purpose for test append -->
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="init_core.js"></script>
     <!-- Because our reloading code reloads our AMD modules
@@ -18,7 +18,7 @@
 	<script data-src="../../../js/jquery.mobile.init.js"></script>
 	<script data-src="../../../js/jquery.mobile.core.js"></script>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/init/nopage.html b/tests/unit/init/nopage.html
index 00b887c25b5..101450c4528 100644
--- a/tests/unit/init/nopage.html
+++ b/tests/unit/init/nopage.html
@@ -7,11 +7,11 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../js/"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="init_core_nopage.js"></script>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<script src="../../swarminject.js"></script>
 
 	<style>
diff --git a/tests/unit/kitchensink/index.html b/tests/unit/kitchensink/index.html
index 745e827357c..2e17fb91a60 100644
--- a/tests/unit/kitchensink/index.html
+++ b/tests/unit/kitchensink/index.html
@@ -7,8 +7,8 @@
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
   <script src="../../../js/jquery.mobile.define.js"></script>
@@ -17,7 +17,7 @@
   <script src="kitchensink_core.js"></script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/loader/index.html b/tests/unit/loader/index.html
index 6b93d896399..7d3d5671c78 100644
--- a/tests/unit/loader/index.html
+++ b/tests/unit/loader/index.html
@@ -6,12 +6,12 @@
 	<!-- meta viewport left out on purpose for test append -->
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="loader_core.js"></script>
 	<script src="../../../js/"></script>
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/media/index.html b/tests/unit/media/index.html
index c76f1529d32..af979eb9333 100644
--- a/tests/unit/media/index.html
+++ b/tests/unit/media/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -23,7 +23,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/navbar/index.html b/tests/unit/navbar/index.html
index 33f8d29cec3..90d341498b0 100644
--- a/tests/unit/navbar/index.html
+++ b/tests/unit/navbar/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "widgets/page" ],
@@ -26,7 +26,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<script src="../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/unit/page-sections/index.html b/tests/unit/page-sections/index.html
index f03f2e5cede..e02713e3e30 100644
--- a/tests/unit/page-sections/index.html
+++ b/tests/unit/page-sections/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -25,7 +25,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/page/index.html b/tests/unit/page/index.html
index 9de76ae99c6..c95a4c9fa13 100644
--- a/tests/unit/page/index.html
+++ b/tests/unit/page/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -23,7 +23,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/panel/index.html b/tests/unit/panel/index.html
index 1bd7a0be617..09e906e415f 100644
--- a/tests/unit/panel/index.html
+++ b/tests/unit/panel/index.html
@@ -10,7 +10,7 @@
 		<script src="../../../js/jquery.tag.inserter.js"></script>
 		<script src="../../jquery.setNameSpace.js"></script>
 		<script src="../../jquery.testHelper.js"></script>
-		<script src="../../../external/qunit.js"></script>
+		<script src="../../../external/qunit/qunit.js"></script>
 		<script type="text/javascript">
 			// redirects from push-state-tests.html
 			$( document ).bind( 'mobileinit', function(){
@@ -26,7 +26,7 @@
 		</script>
 
 		<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css" />
-		<link rel="stylesheet" href="../../../external/qunit.css"/>
+		<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 		<script src="../../swarminject.js"></script>
 	</head>
diff --git a/tests/unit/path/index.html b/tests/unit/path/index.html
index 4ad04aaecbd..3dcc047ac60 100644
--- a/tests/unit/path/index.html
+++ b/tests/unit/path/index.html
@@ -9,8 +9,8 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
     <script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
-	<link rel="stylesheet" href="../../../../external/qunit.css"/>
+	<script src="../../../external/qunit/qunit.js"></script>
+	<link rel="stylesheet" href="../../../../vendor/qunit/qunit.css"/>
     <!-- Because our reloading code reloads our AMD modules
     but now tests are running against the built bundle, we need to include the define shim
     in order for the reload to work -->
diff --git a/tests/unit/popup/index.html b/tests/unit/popup/index.html
index b4e2653f709..75a4631a739 100644
--- a/tests/unit/popup/index.html
+++ b/tests/unit/popup/index.html
@@ -13,8 +13,8 @@
 
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<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>
 		( function( $, undefined ) {
 			// Set the default transition to "fade" if specified in the query
diff --git a/tests/unit/rangeslider/index.html b/tests/unit/rangeslider/index.html
index 0ace775bfe2..814bfda2993 100644
--- a/tests/unit/rangeslider/index.html
+++ b/tests/unit/rangeslider/index.html
@@ -9,7 +9,7 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -23,7 +23,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html
index 3eda45580e8..83d8e8c21a5 100644
--- a/tests/unit/select/index.html
+++ b/tests/unit/select/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -22,7 +22,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/slider/index.html b/tests/unit/slider/index.html
index f19b7fccf40..765663d678b 100644
--- a/tests/unit/slider/index.html
+++ b/tests/unit/slider/index.html
@@ -9,7 +9,7 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -25,7 +25,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/support/index.html b/tests/unit/support/index.html
index d2935dd35a9..890730b3ebc 100644
--- a/tests/unit/support/index.html
+++ b/tests/unit/support/index.html
@@ -9,7 +9,7 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 
 	<script>
@@ -24,7 +24,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/table/index.html b/tests/unit/table/index.html
index 5e89ce41f82..24c3849fa5e 100644
--- a/tests/unit/table/index.html
+++ b/tests/unit/table/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script type="text/javascript">
 		// redirects from push-state-tests.html
 		$( document ).bind( 'mobileinit', function(){
@@ -30,7 +30,7 @@
 	</script>
 
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css" />
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 	<script type="text/javascript">
diff --git a/tests/unit/textinput/index.html b/tests/unit/textinput/index.html
index 1cfb9f4af2b..4624da5ccc3 100644
--- a/tests/unit/textinput/index.html
+++ b/tests/unit/textinput/index.html
@@ -8,7 +8,7 @@
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -20,7 +20,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/transitions/index.html b/tests/unit/transitions/index.html
index 03747633130..b3e4d713a64 100644
--- a/tests/unit/transitions/index.html
+++ b/tests/unit/transitions/index.html
@@ -7,7 +7,7 @@
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -16,7 +16,7 @@
 		]);
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<script src="../../swarminject.js"></script>
 </head>
 <body>
diff --git a/tests/unit/widget/index.html b/tests/unit/widget/index.html
index c167922191b..9b155d79c81 100644
--- a/tests/unit/widget/index.html
+++ b/tests/unit/widget/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
@@ -29,7 +29,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/zoom/index.html b/tests/unit/zoom/index.html
index d71d524cc0f..0a86bf767c4 100644
--- a/tests/unit/zoom/index.html
+++ b/tests/unit/zoom/index.html
@@ -10,7 +10,7 @@
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[ "jquery.mobile.zoom" ],
@@ -20,7 +20,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tests/unit/zoom/initial-disable.html b/tests/unit/zoom/initial-disable.html
index 9ade157464a..54553d15430 100644
--- a/tests/unit/zoom/initial-disable.html
+++ b/tests/unit/zoom/initial-disable.html
@@ -7,10 +7,10 @@
 
 	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/requirejs.config.js"></script>
-	<script src="../../../js/jquery.js"></script>
+	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../external/qunit.js"></script>
+	<script src="../../../external/qunit/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
 			[
@@ -24,7 +24,7 @@
 	</script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
-	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 
 	<script src="../../swarminject.js"></script>
 </head>
diff --git a/tools/config-props.html b/tools/config-props.html
index 7d741148ed2..60f6c98cfe3 100644
--- a/tools/config-props.html
+++ b/tools/config-props.html
@@ -13,7 +13,7 @@
 .ui-li { overflow: hidden; }
 
 </style>
-<script src="../js/jquery.js"></script>
+<script src="../external/jquery/jquery.js"></script>
 <script src="../js/"></script>
 <script>
 
diff --git a/tools/index.html b/tools/index.html
index e9ba68306c5..3a3121a580a 100644
--- a/tools/index.html
+++ b/tools/index.html
@@ -4,7 +4,7 @@
 <meta charset="UTF-8">
 <title>jQuery Mobile Tools</title>
 <link rel="stylesheet" href="../css/themes/default/jquery.mobile.css">
-<script src="../js/jquery.js"></script>
+<script src="../external/jquery/jquery.js"></script>
 <script src="../js/"></script>
 </head>