| Index: metadata.chrome | 
| diff --git a/metadata.chrome b/metadata.chrome | 
| index 946e5d8bdc9f72791beaf95225dae1b403a05e29..ed189411c5287b9951ecfe61fe6abaafd6146036 100644 | 
| --- a/metadata.chrome | 
| +++ b/metadata.chrome | 
| @@ -17,8 +17,6 @@ backgroundScripts = polyfill.js | 
| lib/compat.js | 
| lib/publicSuffixList.js | 
| lib/adblockplus.js | 
| - messageResponder.js | 
| - background.js | 
| testScripts = polyfill.js | 
| ../ext/common.js | 
| ../ext/background.js | 
| @@ -42,7 +40,7 @@ chrome = 49.0 | 
| opera = 36.0 | 
| [contentScripts] | 
| -document_start = polyfill.js ext/common.js ext/content.js elemHideEmulation.js include.preload.js | 
| +document_start = polyfill.js ext/common.js ext/content.js include.preload.js | 
| document_end = include.postload.js | 
| [mapping] | 
| @@ -51,7 +49,6 @@ firstRun.html = adblockplusui/firstRun.html | 
| common.js = adblockplusui/common.js | 
| firstRun.js = adblockplusui/firstRun.js | 
| i18n.js = adblockplusui/i18n.js | 
| -messageResponder.js = adblockplusui/messageResponder.js | 
| icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png | 
| skin/common.css = adblockplusui/skin/common.css | 
| skin/firstRun.css = adblockplusui/skin/firstRun.css | 
| @@ -72,54 +69,22 @@ devtools-panel.html = adblockplusui/devtools-panel.html | 
| devtools-panel.js = adblockplusui/devtools-panel.js | 
| skin/devtools-panel.css = adblockplusui/skin/devtools-panel.css | 
| -[convert_js] | 
| +[bundles] | 
| lib/adblockplus.js = | 
| - lib/cssInjection.js | 
| - lib/filterComposer.js | 
| - lib/filterValidation.js | 
| - lib/icon.js | 
| - lib/io.js | 
| - lib/messaging.js | 
| - lib/notificationHelper.js | 
| - lib/options.js | 
| - lib/prefs.js | 
| - lib/punycode.js | 
| + adblockpluscore/lib/filterListener.js | 
| + adblockpluscore/lib/synchronizer.js | 
| lib/requestBlocker.js | 
| - lib/stats.js | 
| - lib/subscriptionInit.js | 
| - lib/tldjs.js | 
| - lib/url.js | 
| - lib/utils.js | 
| - lib/whitelisting.js | 
| - lib/devtools.js | 
| lib/popupBlocker.js | 
| + lib/subscriptionInit.js | 
| + lib/filterComposer.js | 
| + lib/stats.js | 
| lib/uninstall.js | 
| lib/csp.js | 
| - adblockpluscore/lib/coreUtils.js | 
| - adblockpluscore/lib/common.js | 
| - adblockpluscore/lib/downloader.js | 
| - adblockpluscore/lib/elemHide.js | 
| - adblockpluscore/lib/elemHideEmulation.js | 
| - adblockpluscore/lib/events.js | 
| - adblockpluscore/lib/filterClasses.js | 
| - adblockpluscore/lib/filterListener.js | 
| - adblockpluscore/lib/filterNotifier.js | 
| - adblockpluscore/lib/filterStorage.js | 
| - adblockpluscore/lib/jsbn.js | 
| - adblockpluscore/lib/matcher.js | 
| - adblockpluscore/lib/notification.js | 
| - adblockpluscore/lib/rsa.js | 
| - adblockpluscore/lib/rusha.js | 
| - adblockpluscore/lib/subscriptionClasses.js | 
| - adblockpluscore/lib/synchronizer.js | 
| - adblockplusui/lib/antiadblockInit.js | 
| -lib/adblockplus.js[module] = true | 
| -lib/adblockplus.js[injectinfomodule] = true | 
| -lib/adblockplus.js[autoload] = filterListener,synchronizer,requestBlocker,popupBlocker,subscriptionInit,filterComposer,stats,uninstall,csp,cssInjection,firefoxDataCleanup,options | 
| + lib/cssInjection.js | 
| + adblockplusui/messageResponder.js | 
| + background.js | 
| include.preload.js = include.preload.js inject.preload.js | 
| include.postload.js = subscriptionLink.postload.js composer.postload.js | 
| -elemHideEmulation.js = adblockpluscore/lib/common.js adblockpluscore/lib/content/elemHideEmulation.js | 
| -elemHideEmulation.js[module] = true | 
| [import_locales] | 
| adblockplusui/locale/*/firstRun.json = * |