Restructure JavaScript source tree.
Merge branch 'ui-tweaks' into js-source-restructure
Merge branch 'js-source-restructure' into ui-tweaks