Split /resources into /resources/lib and /resources/src
[lhc/web/wiklou.git] / resources / Resources.php
index 708e25a..00251ef 100644 (file)
@@ -55,27 +55,30 @@ return array(
         *
         * Level 1 "elements":
         *     The base level that only contains the most basic of common skin styles.
-        *     Only styles for single elements are included, no styling for complex structures like the TOC
-        *     is present. This level is for skins that want to implement the entire style of even content area
-        *     structures like the TOC themselves.
+        *     Only styles for single elements are included, no styling for complex structures like the
+        *     TOC is present. This level is for skins that want to implement the entire style of even
+        *     content area structures like the TOC themselves.
         *
         * Level 2 "content":
-        *     The most commonly used level for skins implemented from scratch. This level includes all the single
-        *     element styles from "elements" as well as styles for complex structures such as the TOC that are output
-        *     in the content area by MediaWiki rather than the skin. Essentially this is the common level that lets
-        *     skins leave the style of the content area as it is normally styled, while leaving the rest of the skin
-        *     up to the skin implementation.
+        *     The most commonly used level for skins implemented from scratch. This level includes all
+        *     the single element styles from "elements" as well as styles for complex structures such
+        *     as the TOC that are output in the content area by MediaWiki rather than the skin.
+        *     Essentially this is the common level that lets skins leave the style of the content area
+        *     as it is normally styled, while leaving the rest of the skin up to the skin
+        *     implementation.
         *
         * Level 3 "interface":
-        *     The highest level, this stylesheet contains extra common styles for classes like .firstHeading, #contentSub,
-        *     et cetera which are not outputted by MediaWiki but are common to skins like MonoBook, Vector, etc...
-        *     Essentially this level is for styles that are common to MonoBook clones. And since practically every skin
-        *     that currently exists within core is a MonoBook clone, all our core skins currently use this level.
+        *     The highest level, this stylesheet contains extra common styles for classes like
+        *     .firstHeading, #contentSub, et cetera which are not outputted by MediaWiki but are common
+        *     to skins like MonoBook, Vector, etc... Essentially this level is for styles that are
+        *     common to MonoBook clones. And since practically every skin that currently exists within
+        *     core is a MonoBook clone, all our core skins currently use this level.
         *
-        * These modules are typically loaded by addModuleStyles which has absolutely no concept of dependency
-        * management. As a result the skins.common.* modules contain duplicate stylesheet references instead of
-        * setting 'dependencies' to the lower level the module is based on. For this reason avoid including multiple
-        * skins.common.* modules into your skin as this will result in duplicate css.
+        * These modules are typically loaded by addModuleStyles which has absolutely no concept of
+        * dependency management. As a result, the skins.common.* modules contain duplicate stylesheet
+        * references instead of setting 'dependencies' to the lower level the module is based on. For
+        * this reason avoid including multiple skins.common.* modules into your skin as this will
+        * result in duplicate css.
         */
        'skins.common.elements' => array(
                'styles' => array(
@@ -174,7 +177,7 @@ return array(
        /* jQuery */
 
        'jquery' => array(
-               'scripts' => 'resources/jquery/jquery.js',
+               'scripts' => 'resources/lib/jquery/jquery.js',
                'debugRaw' => false,
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -182,152 +185,152 @@ return array(
        /* jQuery Plugins */
 
        'jquery.appear' => array(
-               'scripts' => 'resources/jquery/jquery.appear.js',
+               'scripts' => 'resources/lib/jquery/jquery.appear.js',
        ),
        'jquery.arrowSteps' => array(
-               'scripts' => 'resources/jquery/jquery.arrowSteps.js',
-               'styles' => 'resources/jquery/jquery.arrowSteps.css',
+               'scripts' => 'resources/src/jquery/jquery.arrowSteps.js',
+               'styles' => 'resources/src/jquery/jquery.arrowSteps.css',
        ),
        'jquery.async' => array(
-               'scripts' => 'resources/jquery/jquery.async.js',
+               'scripts' => 'resources/lib/jquery/jquery.async.js',
        ),
        'jquery.autoEllipsis' => array(
-               'scripts' => 'resources/jquery/jquery.autoEllipsis.js',
+               'scripts' => 'resources/src/jquery/jquery.autoEllipsis.js',
                'dependencies' => 'jquery.highlightText',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.badge' => array(
-               'scripts' => 'resources/jquery/jquery.badge.js',
-               'styles' => 'resources/jquery/jquery.badge.css',
+               'scripts' => 'resources/src/jquery/jquery.badge.js',
+               'styles' => 'resources/src/jquery/jquery.badge.css',
                'dependencies' => 'mediawiki.language',
        ),
        'jquery.byteLength' => array(
-               'scripts' => 'resources/jquery/jquery.byteLength.js',
+               'scripts' => 'resources/src/jquery/jquery.byteLength.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.byteLimit' => array(
-               'scripts' => 'resources/jquery/jquery.byteLimit.js',
+               'scripts' => 'resources/src/jquery/jquery.byteLimit.js',
                'dependencies' => 'jquery.byteLength',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.checkboxShiftClick' => array(
-               'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js',
+               'scripts' => 'resources/src/jquery/jquery.checkboxShiftClick.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.chosen' => array(
-               'scripts' => 'resources/jquery.chosen/chosen.jquery.js',
-               'styles' => 'resources/jquery.chosen/chosen.css',
+               'scripts' => 'resources/lib/jquery.chosen/chosen.jquery.js',
+               'styles' => 'resources/lib/jquery.chosen/chosen.css',
        ),
        'jquery.client' => array(
-               'scripts' => 'resources/jquery/jquery.client.js',
+               'scripts' => 'resources/src/jquery/jquery.client.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.color' => array(
-               'scripts' => 'resources/jquery/jquery.color.js',
+               'scripts' => 'resources/src/jquery/jquery.color.js',
                'dependencies' => 'jquery.colorUtil',
        ),
        'jquery.colorUtil' => array(
-               'scripts' => 'resources/jquery/jquery.colorUtil.js',
+               'scripts' => 'resources/src/jquery/jquery.colorUtil.js',
        ),
        'jquery.cookie' => array(
-               'scripts' => 'resources/jquery/jquery.cookie.js',
+               'scripts' => 'resources/lib/jquery/jquery.cookie.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.delayedBind' => array(
-               'scripts' => 'resources/jquery/jquery.delayedBind.js',
+               'scripts' => 'resources/src/jquery/jquery.delayedBind.js',
        ),
        'jquery.expandableField' => array(
-               'scripts' => 'resources/jquery/jquery.expandableField.js',
+               'scripts' => 'resources/src/jquery/jquery.expandableField.js',
        ),
        'jquery.farbtastic' => array(
-               'scripts' => 'resources/jquery/jquery.farbtastic.js',
-               'styles' => 'resources/jquery/jquery.farbtastic.css',
+               'scripts' => 'resources/src/jquery/jquery.farbtastic.js',
+               'styles' => 'resources/src/jquery/jquery.farbtastic.css',
                'dependencies' => 'jquery.colorUtil',
        ),
        'jquery.footHovzer' => array(
-               'scripts' => 'resources/jquery/jquery.footHovzer.js',
-               'styles' => 'resources/jquery/jquery.footHovzer.css',
+               'scripts' => 'resources/src/jquery/jquery.footHovzer.js',
+               'styles' => 'resources/src/jquery/jquery.footHovzer.css',
        ),
        'jquery.form' => array(
-               'scripts' => 'resources/jquery/jquery.form.js',
+               'scripts' => 'resources/lib/jquery/jquery.form.js',
        ),
        'jquery.fullscreen' => array(
-               'scripts' => 'resources/jquery/jquery.fullscreen.js',
+               'scripts' => 'resources/lib/jquery/jquery.fullscreen.js',
        ),
        'jquery.getAttrs' => array(
-               'scripts' => 'resources/jquery/jquery.getAttrs.js',
+               'scripts' => 'resources/src/jquery/jquery.getAttrs.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.hidpi' => array(
-               'scripts' => 'resources/jquery/jquery.hidpi.js',
+               'scripts' => 'resources/src/jquery/jquery.hidpi.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.highlightText' => array(
-               'scripts' => 'resources/jquery/jquery.highlightText.js',
+               'scripts' => 'resources/src/jquery/jquery.highlightText.js',
                'dependencies' => 'jquery.mwExtension',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.hoverIntent' => array(
-               'scripts' => 'resources/jquery/jquery.hoverIntent.js',
+               'scripts' => 'resources/lib/jquery/jquery.hoverIntent.js',
        ),
        'jquery.json' => array(
-               'scripts' => 'resources/jquery/jquery.json.js',
+               'scripts' => 'resources/lib/jquery/jquery.json.js',
                'targets' => array( 'mobile', 'desktop' ),
        ),
        'jquery.localize' => array(
-               'scripts' => 'resources/jquery/jquery.localize.js',
+               'scripts' => 'resources/src/jquery/jquery.localize.js',
        ),
        'jquery.makeCollapsible' => array(
-               'scripts' => 'resources/jquery/jquery.makeCollapsible.js',
-               'styles' => 'resources/jquery/jquery.makeCollapsible.css',
+               'scripts' => 'resources/src/jquery/jquery.makeCollapsible.js',
+               'styles' => 'resources/src/jquery/jquery.makeCollapsible.css',
                'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.mockjax' => array(
-               'scripts' => 'resources/jquery/jquery.mockjax.js',
+               'scripts' => 'resources/lib/jquery/jquery.mockjax.js',
        ),
        'jquery.mw-jump' => array(
-               'scripts' => 'resources/jquery/jquery.mw-jump.js',
+               'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.mwExtension' => array(
-               'scripts' => 'resources/jquery/jquery.mwExtension.js',
+               'scripts' => 'resources/src/jquery/jquery.mwExtension.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.placeholder' => array(
-               'scripts' => 'resources/jquery/jquery.placeholder.js',
+               'scripts' => 'resources/src/jquery/jquery.placeholder.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.qunit' => array(
-               'scripts' => 'resources/jquery/jquery.qunit.js',
-               'styles' => 'resources/jquery/jquery.qunit.css',
+               'scripts' => 'resources/lib/jquery/jquery.qunit.js',
+               'styles' => 'resources/lib/jquery/jquery.qunit.css',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.qunit.completenessTest' => array(
-               'scripts' => 'resources/jquery/jquery.qunit.completenessTest.js',
+               'scripts' => 'resources/src/jquery/jquery.qunit.completenessTest.js',
                'dependencies' => 'jquery.qunit',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.spinner' => array(
-               'scripts' => 'resources/jquery/jquery.spinner.js',
-               'styles' => 'resources/jquery/jquery.spinner.css',
+               'scripts' => 'resources/src/jquery/jquery.spinner.js',
+               'styles' => 'resources/src/jquery/jquery.spinner.css',
        ),
        'jquery.jStorage' => array(
-               'scripts' => 'resources/jquery/jquery.jStorage.js',
+               'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
                'dependencies' => 'jquery.json',
        ),
        'jquery.suggestions' => array(
-               'scripts' => 'resources/jquery/jquery.suggestions.js',
-               'styles' => 'resources/jquery/jquery.suggestions.css',
+               'scripts' => 'resources/src/jquery/jquery.suggestions.js',
+               'styles' => 'resources/src/jquery/jquery.suggestions.css',
                'dependencies' => 'jquery.highlightText',
        ),
        'jquery.tabIndex' => array(
-               'scripts' => 'resources/jquery/jquery.tabIndex.js',
+               'scripts' => 'resources/src/jquery/jquery.tabIndex.js',
        ),
        'jquery.tablesorter' => array(
-               'scripts' => 'resources/jquery/jquery.tablesorter.js',
-               'styles' => 'resources/jquery/jquery.tablesorter.css',
+               'scripts' => 'resources/src/jquery/jquery.tablesorter.js',
+               'styles' => 'resources/src/jquery/jquery.tablesorter.css',
                'messages' => array( 'sort-descending', 'sort-ascending' ),
                'dependencies' => array(
                        'jquery.mwExtension',
@@ -335,195 +338,195 @@ return array(
                ),
        ),
        'jquery.textSelection' => array(
-               'scripts' => 'resources/jquery/jquery.textSelection.js',
+               'scripts' => 'resources/src/jquery/jquery.textSelection.js',
                'dependencies' => 'jquery.client',
        ),
        'jquery.throttle-debounce' => array(
-               'scripts' => 'resources/jquery/jquery.ba-throttle-debounce.js',
+               'scripts' => 'resources/lib/jquery/jquery.ba-throttle-debounce.js',
        ),
        'jquery.validate' => array(
-               'scripts' => 'resources/jquery/jquery.validate.js',
+               'scripts' => 'resources/lib/jquery/jquery.validate.js',
        ),
        'jquery.xmldom' => array(
-               'scripts' => 'resources/jquery/jquery.xmldom.js',
+               'scripts' => 'resources/lib/jquery/jquery.xmldom.js',
        ),
 
        /* jQuery Tipsy */
 
        'jquery.tipsy' => array(
-               'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js',
-               'styles' => 'resources/jquery.tipsy/jquery.tipsy.css',
+               'scripts' => 'resources/src/jquery.tipsy/jquery.tipsy.js',
+               'styles' => 'resources/src/jquery.tipsy/jquery.tipsy.css',
        ),
 
        /* jQuery UI */
 
        // Core
        'jquery.ui.core' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.core.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js',
                'skinStyles' => array(
                        'default' => array(
-                               'resources/jquery.ui/themes/default/jquery.ui.core.css',
-                               'resources/jquery.ui/themes/default/jquery.ui.theme.css',
+                               'resources/lib/jquery.ui/themes/default/jquery.ui.core.css',
+                               'resources/lib/jquery.ui/themes/default/jquery.ui.theme.css',
                        ),
                        'vector' => array(
-                               'resources/jquery.ui/themes/vector/jquery.ui.core.css',
-                               'resources/jquery.ui/themes/vector/jquery.ui.theme.css',
+                               'resources/src/jquery.ui-themes/vector/jquery.ui.core.css',
+                               'resources/src/jquery.ui-themes/vector/jquery.ui.theme.css',
                        ),
                ),
                'dependencies' => 'jquery',
                'group' => 'jquery.ui',
        ),
        'jquery.ui.widget' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.widget.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.widget.js',
                'group' => 'jquery.ui',
        ),
        'jquery.ui.mouse' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.mouse.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.mouse.js',
                'dependencies' => 'jquery.ui.widget',
                'group' => 'jquery.ui',
        ),
        'jquery.ui.position' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.position.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.position.js',
                'group' => 'jquery.ui',
        ),
        // Interactions
        'jquery.ui.draggable' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.draggable.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.draggable.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget' ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.droppable' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.droppable.js',
                'dependencies' => array(
                        'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.resizable' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.resizable.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.resizable.js',
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.resizable.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.resizable.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.resizable.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.resizable.css',
                ),
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.selectable' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.selectable.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.selectable.js',
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.selectable.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.selectable.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.selectable.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.selectable.css',
                ),
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.sortable' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.sortable.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.sortable.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
                'group' => 'jquery.ui',
        ),
        // Widgets
        'jquery.ui.accordion' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.accordion.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.accordion.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.accordion.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.accordion.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.accordion.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.accordion.css',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.autocomplete' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.autocomplete.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.autocomplete.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.position' ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.autocomplete.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.autocomplete.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.autocomplete.css',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.button' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.button.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.button.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.button.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.button.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.button.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.button.css',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.datepicker' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.datepicker.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.datepicker.js',
                'dependencies' => 'jquery.ui.core',
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.datepicker.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.datepicker.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.datepicker.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.datepicker.css',
                ),
                'languageScripts' => array(
-                       'af' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-af.js',
-                       'ar' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ar.js',
-                       'az' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-az.js',
-                       'bg' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-bg.js',
-                       'bs' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-bs.js',
-                       'ca' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ca.js',
-                       'cs' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-cs.js',
-                       'da' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-da.js',
-                       'de' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-de.js',
-                       'el' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-el.js',
-                       'en-gb' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-en-GB.js',
-                       'eo' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-eo.js',
-                       'es' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-es.js',
-                       'et' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-et.js',
-                       'eu' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-eu.js',
-                       'fa' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fa.js',
-                       'fi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fi.js',
-                       'fo' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fo.js',
-                       'fr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fr.js',
-                       'gl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-gl.js',
-                       'he' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-he.js',
-                       'hi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hi.js',
-                       'hr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hr.js',
-                       'hu' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hu.js',
-                       'hy' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hy.js',
-                       'id' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-id.js',
-                       'is' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-is.js',
-                       'it' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-it.js',
-                       'ja' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ja.js',
-                       'ka' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ka.js',
-                       'kk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-kk.js',
-                       'km' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-km.js',
-                       'ko' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ko.js',
-                       'lb' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lb.js',
-                       'lt' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lt.js',
-                       'lv' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lv.js',
-                       'mk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-mk.js',
-                       'ml' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ml.js',
-                       'ms' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ms.js',
-                       'nl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-nl.js',
-                       'no' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-no.js',
-                       'pl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-pl.js',
-                       'pt' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-pt.js',
-                       'pt-br' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-pt-BR.js',
-                       'rm' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-rm.js',
-                       'ro' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ro.js',
-                       'ru' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ru.js',
-                       'sk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-sk.js',
-                       'sl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-sl.js',
-                       'sq' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-sq.js',
-                       'sr-sr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-sr-SR.js',
-                       'sr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-sr.js',
-                       'sv' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-sv.js',
-                       'ta' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ta.js',
-                       'th' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-th.js',
-                       'tr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-tr.js',
-                       'uk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-uk.js',
-                       'vi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-vi.js',
-                       'zh-cn' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-CN.js',
-                       'zh-hk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js',
-                       'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js',
+                       'af' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-af.js',
+                       'ar' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ar.js',
+                       'az' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-az.js',
+                       'bg' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-bg.js',
+                       'bs' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-bs.js',
+                       'ca' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ca.js',
+                       'cs' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-cs.js',
+                       'da' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-da.js',
+                       'de' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de.js',
+                       'el' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-el.js',
+                       'en-gb' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-en-GB.js',
+                       'eo' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-eo.js',
+                       'es' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-es.js',
+                       'et' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-et.js',
+                       'eu' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-eu.js',
+                       'fa' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-fa.js',
+                       'fi' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-fi.js',
+                       'fo' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-fo.js',
+                       'fr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-fr.js',
+                       'gl' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-gl.js',
+                       'he' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-he.js',
+                       'hi' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-hi.js',
+                       'hr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-hr.js',
+                       'hu' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-hu.js',
+                       'hy' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-hy.js',
+                       'id' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-id.js',
+                       'is' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-is.js',
+                       'it' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-it.js',
+                       'ja' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ja.js',
+                       'ka' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ka.js',
+                       'kk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-kk.js',
+                       'km' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-km.js',
+                       'ko' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ko.js',
+                       'lb' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-lb.js',
+                       'lt' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-lt.js',
+                       'lv' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-lv.js',
+                       'mk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-mk.js',
+                       'ml' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ml.js',
+                       'ms' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ms.js',
+                       'nl' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-nl.js',
+                       'no' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-no.js',
+                       'pl' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-pl.js',
+                       'pt' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-pt.js',
+                       'pt-br' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-pt-BR.js',
+                       'rm' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-rm.js',
+                       'ro' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ro.js',
+                       'ru' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ru.js',
+                       'sk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sk.js',
+                       'sl' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sl.js',
+                       'sq' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sq.js',
+                       'sr-sr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sr-SR.js',
+                       'sr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sr.js',
+                       'sv' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-sv.js',
+                       'ta' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ta.js',
+                       'th' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-th.js',
+                       'tr' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-tr.js',
+                       'uk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-uk.js',
+                       'vi' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-vi.js',
+                       'zh-cn' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-zh-CN.js',
+                       'zh-hk' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js',
+                       'zh-tw' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.dialog' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.dialog.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.dialog.js',
                'dependencies' => array(
                        'jquery.ui.core',
                        'jquery.ui.widget',
@@ -534,106 +537,106 @@ return array(
                        'jquery.ui.resizable',
                ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.dialog.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.dialog.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.dialog.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.dialog.css',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.progressbar' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.progressbar.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.progressbar.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.progressbar.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.progressbar.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.progressbar.css',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.slider' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.slider.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.slider.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.slider.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.slider.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.slider.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.slider.css',
                ),
                'group' => 'jquery.ui',
        ),
        'jquery.ui.tabs' => array(
-               'scripts' => 'resources/jquery.ui/jquery.ui.tabs.js',
+               'scripts' => 'resources/lib/jquery.ui/jquery.ui.tabs.js',
                'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget' ),
                'skinStyles' => array(
-                       'default' => 'resources/jquery.ui/themes/default/jquery.ui.tabs.css',
-                       'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.tabs.css',
+                       'default' => 'resources/lib/jquery.ui/themes/default/jquery.ui.tabs.css',
+                       'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.tabs.css',
                ),
                'group' => 'jquery.ui',
        ),
        // Effects
        'jquery.effects.core' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.core.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.core.js',
                'dependencies' => 'jquery',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.blind' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.blind.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.blind.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.bounce' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.bounce.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.bounce.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.clip' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.clip.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.clip.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.drop' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.drop.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.drop.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.explode' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.explode.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.explode.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.fade' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.fade.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.fade.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.fold' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.fold.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.fold.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.highlight' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.highlight.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.highlight.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.pulsate' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.pulsate.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.pulsate.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.scale' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.scale.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.scale.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.shake' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.shake.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.shake.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.slide' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.slide.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.slide.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.transfer' => array(
-               'scripts' => 'resources/jquery.effects/jquery.effects.transfer.js',
+               'scripts' => 'resources/lib/jquery.effects/jquery.effects.transfer.js',
                'dependencies' => 'jquery.effects.core',
                'group' => 'jquery.ui',
        ),
@@ -641,100 +644,100 @@ return array(
        /* Moment.js */
 
        'moment' => array(
-               'scripts' => 'resources/moment/moment.js',
+               'scripts' => 'resources/lib/moment/moment.js',
                'languageScripts' => array(
-                       'ar-ma' => 'resources/moment/lang/ar-ma.js',
-                       'ar' => 'resources/moment/lang/ar.js',
-                       'bg' => 'resources/moment/lang/bg.js',
-                       'br' => 'resources/moment/lang/br.js',
-                       'bs' => 'resources/moment/lang/bs.js',
-                       'ca' => 'resources/moment/lang/ca.js',
-                       'cs' => 'resources/moment/lang/cs.js',
-                       'cv' => 'resources/moment/lang/cv.js',
-                       'cy' => 'resources/moment/lang/cy.js',
-                       'da' => 'resources/moment/lang/da.js',
-                       'de' => 'resources/moment/lang/de.js',
-                       'el' => 'resources/moment/lang/el.js',
-                       'en-au' => 'resources/moment/lang/en-au.js',
-                       'en-ca' => 'resources/moment/lang/en-ca.js',
-                       'en-gb' => 'resources/moment/lang/en-gb.js',
-                       'eo' => 'resources/moment/lang/eo.js',
-                       'es' => 'resources/moment/lang/es.js',
-                       'et' => 'resources/moment/lang/et.js',
-                       'eu' => 'resources/moment/lang/eu.js',
-                       'fa' => 'resources/moment/lang/fa.js',
-                       'fi' => 'resources/moment/lang/fi.js',
-                       'fo' => 'resources/moment/lang/fo.js',
-                       'fr-ca' => 'resources/moment/lang/fr-ca.js',
-                       'fr' => 'resources/moment/lang/fr.js',
-                       'gl' => 'resources/moment/lang/gl.js',
-                       'he' => 'resources/moment/lang/he.js',
-                       'hi' => 'resources/moment/lang/hi.js',
-                       'hr' => 'resources/moment/lang/hr.js',
-                       'hu' => 'resources/moment/lang/hu.js',
-                       'hy-am' => 'resources/moment/lang/hy-am.js',
-                       'id' => 'resources/moment/lang/id.js',
-                       'is' => 'resources/moment/lang/is.js',
-                       'it' => 'resources/moment/lang/it.js',
-                       'ja' => 'resources/moment/lang/ja.js',
-                       'ka' => 'resources/moment/lang/ka.js',
-                       'ko' => 'resources/moment/lang/ko.js',
-                       'lt' => 'resources/moment/lang/lt.js',
-                       'lv' => 'resources/moment/lang/lv.js',
-                       'mk' => 'resources/moment/lang/mk.js',
-                       'ml' => 'resources/moment/lang/ml.js',
-                       'mr' => 'resources/moment/lang/mr.js',
-                       'ms-my' => 'resources/moment/lang/ms-my.js',
-                       'nb' => 'resources/moment/lang/nb.js',
-                       'ne' => 'resources/moment/lang/ne.js',
-                       'nl' => 'resources/moment/lang/nl.js',
-                       'nn' => 'resources/moment/lang/nn.js',
-                       'pl' => 'resources/moment/lang/pl.js',
-                       'pt-br' => 'resources/moment/lang/pt-br.js',
-                       'pt' => 'resources/moment/lang/pt.js',
-                       'ro' => 'resources/moment/lang/ro.js',
-                       'rs' => 'resources/moment/lang/rs.js',
-                       'ru' => 'resources/moment/lang/ru.js',
-                       'sk' => 'resources/moment/lang/sk.js',
-                       'sl' => 'resources/moment/lang/sl.js',
-                       'sq' => 'resources/moment/lang/sq.js',
-                       'sv' => 'resources/moment/lang/sv.js',
-                       'ta' => 'resources/moment/lang/ta.js',
-                       'th' => 'resources/moment/lang/th.js',
-                       'tl-ph' => 'resources/moment/lang/tl-ph.js',
-                       'tr' => 'resources/moment/lang/tr.js',
-                       'tzm-la' => 'resources/moment/lang/tzm-la.js',
-                       'tzm' => 'resources/moment/lang/tzm.js',
-                       'uk' => 'resources/moment/lang/uk.js',
-                       'uz' => 'resources/moment/lang/uz.js',
-                       'vn' => 'resources/moment/lang/vn.js',
-                       'zh-cn' => 'resources/moment/lang/zh-cn.js',
-                       'zh-tw' => 'resources/moment/lang/zh-tw.js',
+                       'ar-ma' => 'resources/lib/moment/lang/ar-ma.js',
+                       'ar' => 'resources/lib/moment/lang/ar.js',
+                       'bg' => 'resources/lib/moment/lang/bg.js',
+                       'br' => 'resources/lib/moment/lang/br.js',
+                       'bs' => 'resources/lib/moment/lang/bs.js',
+                       'ca' => 'resources/lib/moment/lang/ca.js',
+                       'cs' => 'resources/lib/moment/lang/cs.js',
+                       'cv' => 'resources/lib/moment/lang/cv.js',
+                       'cy' => 'resources/lib/moment/lang/cy.js',
+                       'da' => 'resources/lib/moment/lang/da.js',
+                       'de' => 'resources/lib/moment/lang/de.js',
+                       'el' => 'resources/lib/moment/lang/el.js',
+                       'en-au' => 'resources/lib/moment/lang/en-au.js',
+                       'en-ca' => 'resources/lib/moment/lang/en-ca.js',
+                       'en-gb' => 'resources/lib/moment/lang/en-gb.js',
+                       'eo' => 'resources/lib/moment/lang/eo.js',
+                       'es' => 'resources/lib/moment/lang/es.js',
+                       'et' => 'resources/lib/moment/lang/et.js',
+                       'eu' => 'resources/lib/moment/lang/eu.js',
+                       'fa' => 'resources/lib/moment/lang/fa.js',
+                       'fi' => 'resources/lib/moment/lang/fi.js',
+                       'fo' => 'resources/lib/moment/lang/fo.js',
+                       'fr-ca' => 'resources/lib/moment/lang/fr-ca.js',
+                       'fr' => 'resources/lib/moment/lang/fr.js',
+                       'gl' => 'resources/lib/moment/lang/gl.js',
+                       'he' => 'resources/lib/moment/lang/he.js',
+                       'hi' => 'resources/lib/moment/lang/hi.js',
+                       'hr' => 'resources/lib/moment/lang/hr.js',
+                       'hu' => 'resources/lib/moment/lang/hu.js',
+                       'hy-am' => 'resources/lib/moment/lang/hy-am.js',
+                       'id' => 'resources/lib/moment/lang/id.js',
+                       'is' => 'resources/lib/moment/lang/is.js',
+                       'it' => 'resources/lib/moment/lang/it.js',
+                       'ja' => 'resources/lib/moment/lang/ja.js',
+                       'ka' => 'resources/lib/moment/lang/ka.js',
+                       'ko' => 'resources/lib/moment/lang/ko.js',
+                       'lt' => 'resources/lib/moment/lang/lt.js',
+                       'lv' => 'resources/lib/moment/lang/lv.js',
+                       'mk' => 'resources/lib/moment/lang/mk.js',
+                       'ml' => 'resources/lib/moment/lang/ml.js',
+                       'mr' => 'resources/lib/moment/lang/mr.js',
+                       'ms-my' => 'resources/lib/moment/lang/ms-my.js',
+                       'nb' => 'resources/lib/moment/lang/nb.js',
+                       'ne' => 'resources/lib/moment/lang/ne.js',
+                       'nl' => 'resources/lib/moment/lang/nl.js',
+                       'nn' => 'resources/lib/moment/lang/nn.js',
+                       'pl' => 'resources/lib/moment/lang/pl.js',
+                       'pt-br' => 'resources/lib/moment/lang/pt-br.js',
+                       'pt' => 'resources/lib/moment/lang/pt.js',
+                       'ro' => 'resources/lib/moment/lang/ro.js',
+                       'rs' => 'resources/lib/moment/lang/rs.js',
+                       'ru' => 'resources/lib/moment/lang/ru.js',
+                       'sk' => 'resources/lib/moment/lang/sk.js',
+                       'sl' => 'resources/lib/moment/lang/sl.js',
+                       'sq' => 'resources/lib/moment/lang/sq.js',
+                       'sv' => 'resources/lib/moment/lang/sv.js',
+                       'ta' => 'resources/lib/moment/lang/ta.js',
+                       'th' => 'resources/lib/moment/lang/th.js',
+                       'tl-ph' => 'resources/lib/moment/lang/tl-ph.js',
+                       'tr' => 'resources/lib/moment/lang/tr.js',
+                       'tzm-la' => 'resources/lib/moment/lang/tzm-la.js',
+                       'tzm' => 'resources/lib/moment/lang/tzm.js',
+                       'uk' => 'resources/lib/moment/lang/uk.js',
+                       'uz' => 'resources/lib/moment/lang/uz.js',
+                       'vn' => 'resources/lib/moment/lang/vn.js',
+                       'zh-cn' => 'resources/lib/moment/lang/zh-cn.js',
+                       'zh-tw' => 'resources/lib/moment/lang/zh-tw.js',
                ),
        ),
 
        /* MediaWiki */
 
        'mediawiki' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.js',
-               'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.js',
+               'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
                'debugRaw' => false,
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.api' => array(
-               'scripts' => 'resources/mediawiki.api/mediawiki.api.js',
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.js',
                'dependencies' => 'mediawiki.util',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.api.category' => array(
-               'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js',
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.category.js',
                'dependencies' => array(
                        'mediawiki.api',
                        'mediawiki.Title',
                ),
        ),
        'mediawiki.api.edit' => array(
-               'scripts' => 'resources/mediawiki.api/mediawiki.api.edit.js',
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.edit.js',
                'dependencies' => array(
                        'mediawiki.api',
                        'mediawiki.Title',
@@ -742,17 +745,17 @@ return array(
                ),
        ),
        'mediawiki.api.login' => array(
-               'scripts' => 'resources/mediawiki.api/mediawiki.api.login.js',
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.login.js',
                'dependencies' => array(
                        'mediawiki.api',
                ),
        ),
        'mediawiki.api.parse' => array(
-               'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js',
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.parse.js',
                'dependencies' => 'mediawiki.api',
        ),
        'mediawiki.api.watch' => array(
-               'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js',
+               'scripts' => 'resources/src/mediawiki.api/mediawiki.api.watch.js',
                'dependencies' => array(
                        'mediawiki.api',
                        'user.tokens',
@@ -760,12 +763,12 @@ return array(
        ),
        'mediawiki.debug' => array(
                'scripts' => array(
-                       'resources/mediawiki/mediawiki.debug.js',
-                       'resources/mediawiki/mediawiki.debug.profile.js'
+                       'resources/src/mediawiki/mediawiki.debug.js',
+                       'resources/src/mediawiki/mediawiki.debug.profile.js'
                ),
                'styles' => array(
-                       'resources/mediawiki/mediawiki.debug.less',
-                       'resources/mediawiki/mediawiki.debug.profile.css'
+                       'resources/src/mediawiki/mediawiki.debug.less',
+                       'resources/src/mediawiki/mediawiki.debug.profile.css'
                ),
                'dependencies' => array(
                        'jquery.footHovzer',
@@ -774,15 +777,15 @@ return array(
                'position' => 'bottom',
        ),
        'mediawiki.debug.init' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.debug.init.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.debug.init.js',
                'dependencies' => 'mediawiki.debug',
                // Uses a custom mw.config variable that is set in debughtml,
                // must be loaded on the bottom
                'position' => 'bottom',
        ),
        'mediawiki.feedback' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
-               'styles' => 'resources/mediawiki/mediawiki.feedback.css',
+               'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js',
+               'styles' => 'resources/src/mediawiki/mediawiki.feedback.css',
                'dependencies' => array(
                        'mediawiki.api.edit',
                        'mediawiki.Title',
@@ -806,28 +809,28 @@ return array(
                ),
        ),
        'mediawiki.hidpi' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.hidpi.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
                'dependencies' => array(
                        'jquery.hidpi',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.hlist' => array(
-               'styles' => 'resources/mediawiki/mediawiki.hlist.css',
-               'scripts' => 'resources/mediawiki/mediawiki.hlist.js',
+               'styles' => 'resources/src/mediawiki/mediawiki.hlist.css',
+               'scripts' => 'resources/src/mediawiki/mediawiki.hlist.js',
                'dependencies' => array(
                        'jquery.client',
                ),
        ),
        'mediawiki.htmlform' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
                'messages' => array( 'htmlform-chosen-placeholder' ),
        ),
        'mediawiki.icon' => array(
-               'styles' => 'resources/mediawiki/mediawiki.icon.less',
+               'styles' => 'resources/src/mediawiki/mediawiki.icon.less',
        ),
        'mediawiki.inspect' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.inspect.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.inspect.js',
                'dependencies' => array(
                        'jquery.byteLength',
                        'jquery.json',
@@ -836,22 +839,23 @@ return array(
        ),
        'mediawiki.notification' => array(
                'styles' => array(
-                       'resources/mediawiki/mediawiki.notification.css',
-                       'resources/mediawiki/mediawiki.notification.hideForPrint.css' => array( 'media' => 'print' ),
+                       'resources/src/mediawiki/mediawiki.notification.css',
+                       'resources/src/mediawiki/mediawiki.notification.hideForPrint.css'
+                               => array( 'media' => 'print' ),
                ),
-               'scripts' => 'resources/mediawiki/mediawiki.notification.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
                'dependencies' => array(
                        'mediawiki.page.startup',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.notify' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.notify.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.notify.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.searchSuggest' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.searchSuggest.js',
-               'styles' => 'resources/mediawiki/mediawiki.searchSuggest.css',
+               'scripts' => 'resources/src/mediawiki/mediawiki.searchSuggest.js',
+               'styles' => 'resources/src/mediawiki/mediawiki.searchSuggest.css',
                'messages' => array(
                        'searchsuggest-search',
                        'searchsuggest-containing',
@@ -864,7 +868,7 @@ return array(
                ),
        ),
        'mediawiki.Title' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.Title.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.Title.js',
                'dependencies' => array(
                        'jquery.byteLength',
                        'mediawiki.util',
@@ -872,7 +876,7 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.toc' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.toc.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
                'dependencies' => array(
                        'jquery.cookie',
                ),
@@ -880,11 +884,11 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.Uri' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.Uri.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.user' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.user.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.user.js',
                'dependencies' => array(
                        'jquery.cookie',
                        'mediawiki.api',
@@ -894,7 +898,7 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.util' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.util.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.util.js',
                'dependencies' => array(
                        'jquery.client',
                        'jquery.mwExtension',
@@ -908,7 +912,7 @@ return array(
        /* MediaWiki Action */
 
        'mediawiki.action.edit' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
                        'mediawiki.action.edit.styles',
                        'jquery.textSelection',
@@ -917,12 +921,12 @@ return array(
                'position' => 'top',
        ),
        'mediawiki.action.edit.styles' => array(
-               'styles' => 'resources/mediawiki.action/mediawiki.action.edit.styles.css',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
                'position' => 'top',
        ),
        'mediawiki.action.edit.collapsibleFooter' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
-               'styles' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
                'dependencies' => array(
                        'jquery.makeCollapsible',
                        'jquery.cookie',
@@ -930,7 +934,7 @@ return array(
                ),
        ),
        'mediawiki.action.edit.preview' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.preview.js',
                'dependencies' => array(
                        'jquery.form',
                        'jquery.spinner',
@@ -938,31 +942,31 @@ return array(
                ),
        ),
        'mediawiki.action.history' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
                'group' => 'mediawiki.action.history',
        ),
        'mediawiki.action.history.diff' => array(
-               'styles' => 'resources/mediawiki.action/mediawiki.action.history.diff.css',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.diff.css',
                'group' => 'mediawiki.action.history',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.action.view.dblClickEdit' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
                'dependencies' => array(
                        'mediawiki.util',
                        'mediawiki.page.startup',
                ),
        ),
        'mediawiki.action.view.metadata' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.metadata.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.metadata.js',
                'messages' => array(
                        'metadata-expand',
                        'metadata-collapse',
                ),
        ),
        'mediawiki.action.view.postEdit' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.postEdit.js',
-               'styles' => 'resources/mediawiki.action/mediawiki.action.view.postEdit.css',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.js',
+               'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.css',
                'dependencies' => array(
                        'jquery.cookie',
                        'mediawiki.jqueryMsg'
@@ -972,17 +976,17 @@ return array(
                ),
        ),
        'mediawiki.action.view.redirectToFragment' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.redirectToFragment.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectToFragment.js',
                'dependencies' => array(
                        'jquery.client',
                ),
                'position' => 'top',
        ),
        'mediawiki.action.view.rightClickEdit' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
        ),
        'mediawiki.action.edit.editWarning' => array(
-               'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.editWarning.js',
+               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
                'dependencies' => array(
                        'mediawiki.jqueryMsg'
                ),
@@ -1000,23 +1004,23 @@ return array(
 
        'mediawiki.language' => array(
                'scripts' => array(
-                       'resources/mediawiki.language/mediawiki.language.js',
-                       'resources/mediawiki.language/mediawiki.language.numbers.js'
+                       'resources/src/mediawiki.language/mediawiki.language.js',
+                       'resources/src/mediawiki.language/mediawiki.language.numbers.js'
                ),
                'languageScripts' => array(
-                       'bs' => 'resources/mediawiki.language/languages/bs.js',
-                       'dsb' => 'resources/mediawiki.language/languages/dsb.js',
-                       'fi' => 'resources/mediawiki.language/languages/fi.js',
-                       'ga' => 'resources/mediawiki.language/languages/ga.js',
-                       'he' => 'resources/mediawiki.language/languages/he.js',
-                       'hsb' => 'resources/mediawiki.language/languages/hsb.js',
-                       'hu' => 'resources/mediawiki.language/languages/hu.js',
-                       'hy' => 'resources/mediawiki.language/languages/hy.js',
-                       'la' => 'resources/mediawiki.language/languages/la.js',
-                       'os' => 'resources/mediawiki.language/languages/os.js',
-                       'ru' => 'resources/mediawiki.language/languages/ru.js',
-                       'sl' => 'resources/mediawiki.language/languages/sl.js',
-                       'uk' => 'resources/mediawiki.language/languages/uk.js',
+                       'bs' => 'resources/src/mediawiki.language/languages/bs.js',
+                       'dsb' => 'resources/src/mediawiki.language/languages/dsb.js',
+                       'fi' => 'resources/src/mediawiki.language/languages/fi.js',
+                       'ga' => 'resources/src/mediawiki.language/languages/ga.js',
+                       'he' => 'resources/src/mediawiki.language/languages/he.js',
+                       'hsb' => 'resources/src/mediawiki.language/languages/hsb.js',
+                       'hu' => 'resources/src/mediawiki.language/languages/hu.js',
+                       'hy' => 'resources/src/mediawiki.language/languages/hy.js',
+                       'la' => 'resources/src/mediawiki.language/languages/la.js',
+                       'os' => 'resources/src/mediawiki.language/languages/os.js',
+                       'ru' => 'resources/src/mediawiki.language/languages/ru.js',
+                       'sl' => 'resources/src/mediawiki.language/languages/sl.js',
+                       'uk' => 'resources/src/mediawiki.language/languages/uk.js',
                ),
                'dependencies' => array(
                                'mediawiki.language.data',
@@ -1026,7 +1030,7 @@ return array(
        ),
 
        'mediawiki.cldr' => array(
-               'scripts' => 'resources/mediawiki.language/mediawiki.cldr.js',
+               'scripts' => 'resources/src/mediawiki.language/mediawiki.cldr.js',
                'dependencies' => array(
                        'mediawiki.libs.pluralruleparser',
                ),
@@ -1034,17 +1038,17 @@ return array(
        ),
 
        'mediawiki.libs.pluralruleparser' => array(
-               'scripts' => 'resources/mediawiki.libs/CLDRPluralRuleParser.js',
+               'scripts' => 'resources/src/mediawiki.libs/CLDRPluralRuleParser.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
 
        'mediawiki.language.init' => array(
-               'scripts' => 'resources/mediawiki.language/mediawiki.language.init.js',
+               'scripts' => 'resources/src/mediawiki.language/mediawiki.language.init.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
 
        'mediawiki.jqueryMsg' => array(
-               'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js',
+               'scripts' => 'resources/src/mediawiki/mediawiki.jqueryMsg.js',
                'dependencies' => array(
                        'mediawiki.util',
                        'mediawiki.language',
@@ -1053,7 +1057,7 @@ return array(
        ),
 
        'mediawiki.language.months' => array(
-               'scripts' => 'resources/mediawiki.language/mediawiki.language.months.js',
+               'scripts' => 'resources/src/mediawiki.language/mediawiki.language.months.js',
                'dependencies' => 'mediawiki.language',
                'messages' => array_merge(
                        Language::$mMonthMsgs,
@@ -1065,16 +1069,16 @@ return array(
        /* MediaWiki Libs */
 
        'mediawiki.libs.jpegmeta' => array(
-               'scripts' => 'resources/mediawiki.libs/mediawiki.libs.jpegmeta.js',
+               'scripts' => 'resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js',
        ),
 
        /* MediaWiki Page */
 
        'mediawiki.page.gallery' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.gallery.js',
+               'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js',
        ),
        'mediawiki.page.ready' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
+               'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
                        'jquery.checkboxShiftClick',
                        'jquery.makeCollapsible',
@@ -1085,7 +1089,7 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.page.startup' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js',
+               'scripts' => 'resources/src/mediawiki.page/mediawiki.page.startup.js',
                'dependencies' => array(
                        'mediawiki.util',
                ),
@@ -1093,7 +1097,7 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.page.patrol.ajax' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.patrol.ajax.js',
+               'scripts' => 'resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js',
                'dependencies' => array(
                        'mediawiki.page.startup',
                        'mediawiki.api',
@@ -1110,7 +1114,7 @@ return array(
                ),
        ),
        'mediawiki.page.watch.ajax' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.watch.ajax.js',
+               'scripts' => 'resources/src/mediawiki.page/mediawiki.page.watch.ajax.js',
                'dependencies' => array(
                        'mediawiki.page.startup',
                        'mediawiki.api.watch',
@@ -1129,29 +1133,29 @@ return array(
                ),
        ),
        'mediawiki.page.image.pagination' => array(
-               'scripts' => 'resources/mediawiki.page/mediawiki.page.image.pagination.js',
+               'scripts' => 'resources/src/mediawiki.page/mediawiki.page.image.pagination.js',
                'dependencies' => array( 'jquery.spinner' )
        ),
 
        /* MediaWiki Special pages */
 
        'mediawiki.special' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.js',
-               'styles' => 'resources/mediawiki.special/mediawiki.special.css',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.css',
                'skinStyles' => array(
                        'vector' => 'skins/vector/special.less',
                ),
        ),
        'mediawiki.special.block' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',
-               'styles' => 'resources/mediawiki.special/mediawiki.special.block.css',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
                'dependencies' => array(
                        'mediawiki.util',
                ),
        ),
        'mediawiki.special.changeemail' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.changeemail.js',
-               'styles' => 'resources/mediawiki.special/mediawiki.special.changeemail.css',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeemail.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeemail.css',
                'dependencies' => array(
                        'mediawiki.util',
                ),
@@ -1161,31 +1165,31 @@ return array(
                ),
        ),
        'mediawiki.special.changeslist' => array(
-               'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
        ),
        'mediawiki.special.changeslist.legend' => array(
-               'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.legend.css',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css',
        ),
        'mediawiki.special.changeslist.legend.js' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.changeslist.legend.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js',
                'dependencies' => array(
                        'jquery.makeCollapsible',
                        'jquery.cookie',
                ),
        ),
        'mediawiki.special.changeslist.enhanced' => array(
-               'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
        ),
        'mediawiki.special.movePage' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
                'dependencies' => 'jquery.byteLimit',
        ),
        'mediawiki.special.pagesWithProp' => array(
-               'styles' => 'resources/mediawiki.special/mediawiki.special.pagesWithProp.css',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
        ),
        'mediawiki.special.preferences' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
-               'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.preferences.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.css',
                'position' => 'top',
                'skinStyles' => array(
                        'vector' => 'skins/vector/special.preferences.less',
@@ -1198,13 +1202,13 @@ return array(
                ),
        ),
        'mediawiki.special.recentchanges' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
                'dependencies' => array( 'mediawiki.special' ),
                'position' => 'top',
        ),
        'mediawiki.special.search' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
-               'styles' => 'resources/mediawiki.special/mediawiki.special.search.css',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.css',
                'messages' => array(
                        'powersearch-togglelabel',
                        'powersearch-toggleall',
@@ -1212,11 +1216,11 @@ return array(
                ),
        ),
        'mediawiki.special.undelete' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ),
        'mediawiki.special.upload' => array(
                // @todo merge in remainder of mediawiki.legacy.upload
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
                'messages' => array(
                        'widthheight',
                        'size-bytes',
@@ -1232,25 +1236,25 @@ return array(
        ),
        'mediawiki.special.userlogin.common.styles' => array(
                'styles' => array(
-                       'resources/mediawiki.special/mediawiki.special.userlogin.common.css',
+                       'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
                ),
                'position' => 'top',
        ),
        'mediawiki.special.userlogin.signup.styles' => array(
                'styles' => array(
-                       'resources/mediawiki.special/mediawiki.special.userlogin.signup.css',
+                       'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
                ),
                'position' => 'top',
        ),
        'mediawiki.special.userlogin.login.styles' => array(
                'styles' => array(
-                       'resources/mediawiki.special/mediawiki.special.userlogin.login.css',
+                       'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
                ),
                'position' => 'top',
        ),
        'mediawiki.special.userlogin.common.js' => array(
                'scripts' => array(
-                       'resources/mediawiki.special/mediawiki.special.userlogin.common.js',
+                       'resources/src/mediawiki.special/mediawiki.special.userlogin.common.js',
                ),
                'messages' => array(
                        'createacct-captcha',
@@ -1258,7 +1262,7 @@ return array(
                ),
        ),
        'mediawiki.special.userlogin.signup.js' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.userlogin.signup.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
                'messages' => array(
                        'createacct-error',
                        'createacct-emailrequired',
@@ -1272,7 +1276,7 @@ return array(
                ),
        ),
        'mediawiki.special.javaScriptTest' => array(
-               'scripts' => 'resources/mediawiki.special/mediawiki.special.javaScriptTest.js',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js',
                'messages' => array_merge( Skin::getSkinNameMessages(), array(
                        'colon-separator',
                        'javascripttest-pagetext-skins',
@@ -1282,7 +1286,7 @@ return array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.special.version' => array(
-               'styles' => 'resources/mediawiki.special/mediawiki.special.version.css',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
        ),
 
        /* MediaWiki Legacy */
@@ -1355,8 +1359,8 @@ return array(
 
        'mediawiki.ui' => array(
                'skinStyles' => array(
-                       'default' => 'resources/mediawiki.ui/default.less',
-                       'vector' => 'resources/mediawiki.ui/vector.less',
+                       'default' => 'resources/src/mediawiki.ui/default.less',
+                       'vector' => 'resources/src/mediawiki.ui/vector.less',
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
@@ -1364,8 +1368,8 @@ return array(
        // Lightweight module for button styles
        'mediawiki.ui.button' => array(
                'skinStyles' => array(
-                       'default' => 'resources/mediawiki.ui/components/default/buttons.less',
-                       'vector' => 'resources/mediawiki.ui/components/vector/buttons.less',
+                       'default' => 'resources/src/mediawiki.ui/components/default/buttons.less',
+                       'vector' => 'resources/src/mediawiki.ui/components/vector/buttons.less',
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
@@ -1376,20 +1380,20 @@ return array(
        // WILL BREAK if loaded in browsers that don't support ES5
        'oojs' => array(
                'scripts' => array(
-                       'resources/oojs/oojs.js',
+                       'resources/lib/oojs/oojs.js',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'oojs-ui' => array(
                'scripts' => array(
-                       'resources/oojs-ui/oojs-ui.js',
+                       'resources/lib/oojs-ui/oojs-ui.js',
                ),
                'styles' => array(
-                       'resources/oojs-ui/oojs-ui.svg.css',
+                       'resources/lib/oojs-ui/oojs-ui.svg.css',
                ),
                'skinStyles' => array(
-                       'default' => 'resources/oojs-ui/oojs-ui-apex.css',
-                       'minerva' => 'resources/oojs-ui/oojs-ui-agora.css',
+                       'default' => 'resources/lib/oojs-ui/oojs-ui-apex.css',
+                       'minerva' => 'resources/lib/oojs-ui/oojs-ui-agora.css',
                ),
                'messages' => array(
                        'ooui-dialog-action-close',