diff --git a/media/js/zamboni/excanvas.compiled.js b/media/js/lib/excanvas.compiled.js
similarity index 100%
rename from media/js/zamboni/excanvas.compiled.js
rename to media/js/lib/excanvas.compiled.js
diff --git a/media/js/zamboni/highcharts.src.js b/media/js/lib/highcharts.src.js
similarity index 100%
rename from media/js/zamboni/highcharts.src.js
rename to media/js/lib/highcharts.src.js
diff --git a/media/js/zamboni/jqmobile.js b/media/js/lib/jqmobile.js
similarity index 100%
rename from media/js/zamboni/jqmobile.js
rename to media/js/lib/jqmobile.js
diff --git a/media/js/zamboni/jquery-1.4.2.min.js b/media/js/lib/jquery-1.4.2.min.js
similarity index 100%
rename from media/js/zamboni/jquery-1.4.2.min.js
rename to media/js/lib/jquery-1.4.2.min.js
diff --git a/media/js/zamboni/jquery-1.5.min.js b/media/js/lib/jquery-1.5.min.js
similarity index 100%
rename from media/js/zamboni/jquery-1.5.min.js
rename to media/js/lib/jquery-1.5.min.js
diff --git a/media/js/zamboni/jquery-datepicker.js b/media/js/lib/jquery-datepicker.js
similarity index 100%
rename from media/js/zamboni/jquery-datepicker.js
rename to media/js/lib/jquery-datepicker.js
diff --git a/media/js/zamboni/jquery-ui/README b/media/js/lib/jquery-ui/README
similarity index 100%
rename from media/js/zamboni/jquery-ui/README
rename to media/js/lib/jquery-ui/README
diff --git a/media/js/zamboni/jquery-ui/custom-1.8.5.min.js b/media/js/lib/jquery-ui/custom-1.8.5.min.js
similarity index 100%
rename from media/js/zamboni/jquery-ui/custom-1.8.5.min.js
rename to media/js/lib/jquery-ui/custom-1.8.5.min.js
diff --git a/media/js/jquery-ui/jqModal.js b/media/js/lib/jquery-ui/jqModal.js
similarity index 100%
rename from media/js/jquery-ui/jqModal.js
rename to media/js/lib/jquery-ui/jqModal.js
diff --git a/media/js/jquery-ui/ui.lightbox.js b/media/js/lib/jquery-ui/ui.lightbox.js
similarity index 100%
rename from media/js/jquery-ui/ui.lightbox.js
rename to media/js/lib/jquery-ui/ui.lightbox.js
diff --git a/media/js/jquery.cookie.js b/media/js/lib/jquery.cookie.js
similarity index 100%
rename from media/js/jquery.cookie.js
rename to media/js/lib/jquery.cookie.js
diff --git a/media/js/zamboni/jquery.hoverIntent.min.js b/media/js/lib/jquery.hoverIntent.min.js
similarity index 100%
rename from media/js/zamboni/jquery.hoverIntent.min.js
rename to media/js/lib/jquery.hoverIntent.min.js
diff --git a/media/js/zamboni/jquery.mockjax.js b/media/js/lib/jquery.mockjax.js
similarity index 100%
rename from media/js/zamboni/jquery.mockjax.js
rename to media/js/lib/jquery.mockjax.js
diff --git a/media/js/zamboni/jquery.sparkline.min.js b/media/js/lib/jquery.sparkline.min.js
similarity index 100%
rename from media/js/zamboni/jquery.sparkline.min.js
rename to media/js/lib/jquery.sparkline.min.js
diff --git a/media/js/zamboni/jquery.tablesorter.min.js b/media/js/lib/jquery.tablesorter.min.js
similarity index 100%
rename from media/js/zamboni/jquery.tablesorter.min.js
rename to media/js/lib/jquery.tablesorter.min.js
diff --git a/media/js/zamboni/jstestnet.js b/media/js/lib/jstestnet.js
similarity index 100%
rename from media/js/zamboni/jstestnet.js
rename to media/js/lib/jstestnet.js
diff --git a/media/js/zamboni/stats/stats_worker.js b/media/js/workers/stats_worker.js
similarity index 99%
rename from media/js/zamboni/stats/stats_worker.js
rename to media/js/workers/stats_worker.js
index ebf54db34d..c9c2f523de 100644
--- a/media/js/zamboni/stats/stats_worker.js
+++ b/media/js/workers/stats_worker.js
@@ -151,7 +151,3 @@ addEventListener('message', function(e) {
     }
 }, false);
 
-
-
-
-
diff --git a/media/js/zamboni/stats/stats_manager.js b/media/js/zamboni/stats/stats_manager.js
index 671d2c5de4..0c57785743 100644
--- a/media/js/zamboni/stats/stats_manager.js
+++ b/media/js/zamboni/stats/stats_manager.js
@@ -53,7 +53,7 @@
 
     // Worker pool for Web Worker management
 
-    var stats_worker_url = z.media_url+"js/zamboni/stats/stats_worker.js";
+    var stats_worker_url = z.media_url+"js/workers/stats_worker.js";
 
     var StatsWorkerPool = new WorkerPool(4);
 
diff --git a/media/js/zamboni/underscore-min.js b/media/js/zamboni/underscore-min.js
deleted file mode 100644
index 2c8b499882..0000000000
--- a/media/js/zamboni/underscore-min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.6";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)||b.isArguments(a))for(var e=0,f=a.length;e<f;e++)c.call(d,
-a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bind(d,e),c);
-var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.every))return a.every(c,
-d);var e=true;b.each(a,function(f,g,h){(e=e&&c.call(d,f,g,h))||b.breakLoop()});return e};b.any=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.some))return a.some(c,d);var e=false;b.each(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(b.isArray(a))return b.indexOf(a,c)!=-1;var d=false;b.each(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply(e,d)})};b.pluck=
-function(a,c){return b.map(a,function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,
-function(e,f,g){return{value:e,criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return k.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return c&&!d?k.call(a,
-0,c):a[0]};b.rest=function(a,c,d){return k.call(a,b.isUndefined(c)||d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.select(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.select(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f||(c===true?b.last(d)!=e:!b.include(d,
-e)))d.push(e);return d})};b.intersect=function(a){var c=b.rest(arguments);return b.select(b.uniq(a),function(d){return b.all(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(a.indexOf)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(a.lastIndexOf)return a.lastIndexOf(c);for(var d=
-a.length;d--;)if(a[d]===c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]||1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;1;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind(a[d],a)});
-return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.range(0,a.length);
-var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c||a&&!c)return false;
-if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){return b.keys(a).length==
-0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&&
-a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.templateSettings={start:"<%",end:"%>",interpolate:/<%=(.+?)%>/g};b.template=function(a,c){var d=b.templateSettings;a=new Function("obj",
-"var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g," ").replace(new RegExp("'(?=[^"+d.end[0]+"]*"+d.end+")","g"),"\t").split("'").join("\\'").split("\t").join("'").replace(d.interpolate,"',$1,'").split(d.start).join("');").split(d.end).join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;
-var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b.toArray(arguments);o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,
-arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.value=function(){return this._wrapped}})();
diff --git a/settings.py b/settings.py
index f52ce1d580..2503844b28 100644
--- a/settings.py
+++ b/settings.py
@@ -395,9 +395,9 @@ MINIFY_BUNDLES = {
     'js': {
         # JS files common to the entire site.
         'common': (
-            'js/zamboni/jquery-1.4.2.min.js',
-            'js/zamboni/jquery-ui/custom-1.8.5.min.js',
-            'js/zamboni/underscore-min.js',
+            'js/lib/jquery-1.4.2.min.js',
+            'js/lib/jquery-ui/custom-1.8.5.min.js',
+            'js/lib/underscore-min.js',
             'js/zamboni/browser.js',
             'js/amo2009/addons.js',
             'js/zamboni/init.js',
@@ -405,10 +405,10 @@ MINIFY_BUNDLES = {
             'js/zamboni/buttons.js',
             'js/zamboni/tabs.js',
 
-            'js/jquery.cookie.js',
+            'js/lib/jquery.cookie.js',
             'js/zamboni/global.js',
             'js/amo2009/global.js',
-            'js/jquery-ui/jqModal.js',
+            'js/lib/jquery-ui/jqModal.js',
             'js/amo2009/home.js',
             'js/zamboni/l10n.js',
             'js/zamboni/storage.js',
@@ -417,14 +417,14 @@ MINIFY_BUNDLES = {
             'js/zamboni/homepage.js',
 
             # Add-ons details page
-            'js/jquery-ui/ui.lightbox.js',
+            'js/lib/jquery-ui/ui.lightbox.js',
             'js/get-satisfaction-v2.js',
             'js/zamboni/contributions.js',
             'js/zamboni/addon_details.js',
             'js/zamboni/reviews.js',
 
             # Personas
-            'js/zamboni/jquery.hoverIntent.min.js',
+            'js/lib/jquery.hoverIntent.min.js',
             'js/zamboni/personas.js',
 
             # Collections
@@ -443,22 +443,22 @@ MINIFY_BUNDLES = {
             'js/global/menu.js',
         ),
         'zamboni/discovery': (
-            'js/zamboni/jquery-1.4.2.min.js',
-            'js/zamboni/underscore-min.js',
+            'js/lib/jquery-1.4.2.min.js',
+            'js/lib/underscore-min.js',
             'js/zamboni/browser.js',
             'js/zamboni/init.js',
             'js/zamboni/format.js',
 
             # Add-ons details
             'js/zamboni/buttons.js',
-            'js/jquery-ui/ui.lightbox.js',
+            'js/lib/jquery-ui/ui.lightbox.js',
 
             # Personas
-            'js/zamboni/jquery.hoverIntent.min.js',
+            'js/lib/jquery.hoverIntent.min.js',
             'js/zamboni/personas.js',
 
             'js/zamboni/truncation.js',
-            'js/jquery.cookie.js',
+            'js/lib/jquery.cookie.js',
             'js/zamboni/storage.js',
             'js/zamboni/discovery_addons.js',
             'js/zamboni/discovery_pane.js',
@@ -476,9 +476,9 @@ MINIFY_BUNDLES = {
             'js/zamboni/files.js',
         ),
         'zamboni/mobile': (
-            'js/zamboni/jquery-1.5.min.js',
-            'js/zamboni/jqmobile.js',
-            'js/jquery.cookie.js',
+            'js/lib/jquery-1.5.min.js',
+            'js/lib/jqmobile.js',
+            'js/lib/jquery.cookie.js',
             'js/zamboni/browser.js',
             'js/zamboni/init.js',
             'js/zamboni/format.js',
diff --git a/templates/qunit.html b/templates/qunit.html
index e5ef37f2db..51ad488632 100644
--- a/templates/qunit.html
+++ b/templates/qunit.html
@@ -270,7 +270,7 @@
   {{ js('common') }}
   <script async defer src="{{ url('addons.buttons.js') }}/build:{{ BUILD_ID_JS }}"></script>
   <script type="text/javascript" src="{{ url('qunit_js') }}"></script>
-  <script type="text/javascript" src="{{ MEDIA_URL }}js/zamboni/jquery.mockjax.js"></script>
+  <script type="text/javascript" src="{{ MEDIA_URL }}js/lib/jquery.mockjax.js"></script>
   {% for url in suite.extra_urls %}
     <script type="text/javascript" src="{{ url }}"></script>
   {% endfor %}