Back out 8 changesets (bug 1223573) for Win7 PGO xperf unexpected access failures
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 27 Nov 2015 21:39:23 -0800
changeset 274657 c95f8e8955b0ee3a807d1d8f7887e6286580a0fa
parent 274656 40981d27ace0936a330890a7bd7bc9949d985a3c
child 274658 2e446ebafe6c037c7cab2b23ead25f8953b461ad
push id68637
push usercbook@mozilla.com
push dateMon, 30 Nov 2015 12:45:36 +0000
treeherdermozilla-inbound@5a8a532f97cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1223573
milestone45.0a1
backs out19876a153a009b457900c82f27efbc398ad19413
14251062e347b5109ec8c694e7cc6ef3d976d3c8
081b0af71d6e4fb7d3152a814b972861451a13d3
21ebe3534e582f99d5ddb7b69ecc915c48f6903c
d6754894897cbf3eafe0f15fb2f4389024a814dd
1b4d6308002e3c2eacdfa3aae296b39dd328c096
a13b3bba5529eaa853befa21cae4c8162c3dd565
f3ccccf5b6feffc318c2c04f1b0104d0b6dd9dd6
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 8 changesets (bug 1223573) for Win7 PGO xperf unexpected access failures CLOSED TREE Backed out changeset 19876a153a00 (bug 1223573) Backed out changeset 14251062e347 (bug 1223573) Backed out changeset 081b0af71d6e (bug 1223573) Backed out changeset 21ebe3534e58 (bug 1223573) Backed out changeset d6754894897c (bug 1223573) Backed out changeset 1b4d6308002e (bug 1223573) Backed out changeset a13b3bba5529 (bug 1223573) Backed out changeset f3ccccf5b6fe (bug 1223573)
.hgignore
browser/app/profile/firefox.js
browser/base/content/browser-loop.js
browser/base/content/browser.css
browser/base/content/browser.js
browser/components/about/AboutRedirector.cpp
browser/components/customizableui/CustomizableWidgets.jsm
browser/components/loop/.eslintignore
browser/components/loop/.eslintrc
browser/components/loop/.eslintrc-gecko
browser/components/loop/.gitignore
browser/components/loop/README.txt
browser/components/loop/build-jsx
browser/components/loop/content/conversation.html
browser/components/loop/content/css/panel.css
browser/components/loop/content/js/.eslintrc
browser/components/loop/content/js/conversation.js
browser/components/loop/content/js/conversation.jsx
browser/components/loop/content/js/conversationAppStore.js
browser/components/loop/content/js/feedbackViews.js
browser/components/loop/content/js/feedbackViews.jsx
browser/components/loop/content/js/otconfig.js
browser/components/loop/content/js/panel.js
browser/components/loop/content/js/panel.jsx
browser/components/loop/content/js/roomStore.js
browser/components/loop/content/js/roomViews.js
browser/components/loop/content/js/roomViews.jsx
browser/components/loop/content/libs/l10n.js
browser/components/loop/content/panel.html
browser/components/loop/content/shared/README.md
browser/components/loop/content/shared/css/common.css
browser/components/loop/content/shared/css/conversation.css
browser/components/loop/content/shared/css/reset.css
browser/components/loop/content/shared/img/02.png
browser/components/loop/content/shared/img/02@2x.png
browser/components/loop/content/shared/img/animated-spinner.svg
browser/components/loop/content/shared/img/audio-call-avatar.svg
browser/components/loop/content/shared/img/audio-default-16x16@1.5x.png
browser/components/loop/content/shared/img/audio-default-16x16@2x.png
browser/components/loop/content/shared/img/avatars.svg
browser/components/loop/content/shared/img/beta-ribbon.svg
browser/components/loop/content/shared/img/chatbubble-arrow-left.svg
browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
browser/components/loop/content/shared/img/check.svg
browser/components/loop/content/shared/img/ellipsis-v.svg
browser/components/loop/content/shared/img/empty_conversations.svg
browser/components/loop/content/shared/img/empty_search.svg
browser/components/loop/content/shared/img/facemute-14x14.png
browser/components/loop/content/shared/img/facemute-14x14@2x.png
browser/components/loop/content/shared/img/firefox-avatar.svg
browser/components/loop/content/shared/img/firefox-logo.png
browser/components/loop/content/shared/img/hangup-inverse-14x14.png
browser/components/loop/content/shared/img/hangup-inverse-14x14@2x.png
browser/components/loop/content/shared/img/happy.png
browser/components/loop/content/shared/img/hello_logo.svg
browser/components/loop/content/shared/img/helloicon.svg
browser/components/loop/content/shared/img/icon_32.png
browser/components/loop/content/shared/img/icon_64.png
browser/components/loop/content/shared/img/icons-10x10.svg
browser/components/loop/content/shared/img/icons-14x14.svg
browser/components/loop/content/shared/img/icons-16x16.svg
browser/components/loop/content/shared/img/movistar.png
browser/components/loop/content/shared/img/movistar@2x.png
browser/components/loop/content/shared/img/mute-inverse-14x14.png
browser/components/loop/content/shared/img/mute-inverse-14x14@2x.png
browser/components/loop/content/shared/img/pause-12x12.svg
browser/components/loop/content/shared/img/play-12x12.svg
browser/components/loop/content/shared/img/sad.png
browser/components/loop/content/shared/img/sad_hello_icon_64x64.svg
browser/components/loop/content/shared/img/spinner.png
browser/components/loop/content/shared/img/spinner.svg
browser/components/loop/content/shared/img/spinner@2x.png
browser/components/loop/content/shared/img/stop-12x12.svg
browser/components/loop/content/shared/img/svg/audio-hover.svg
browser/components/loop/content/shared/img/svg/audio-mute-hover.svg
browser/components/loop/content/shared/img/svg/audio-mute.svg
browser/components/loop/content/shared/img/svg/audio.svg
browser/components/loop/content/shared/img/svg/cam_audio-no.svg
browser/components/loop/content/shared/img/svg/cam_audio.svg
browser/components/loop/content/shared/img/svg/cam_audio_h.svg
browser/components/loop/content/shared/img/svg/exit.svg
browser/components/loop/content/shared/img/svg/glyph-email-16x16.svg
browser/components/loop/content/shared/img/svg/glyph-facebook-16x16.svg
browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg
browser/components/loop/content/shared/img/svg/glyph-link-16x16.svg
browser/components/loop/content/shared/img/svg/glyph-user-16x16.svg
browser/components/loop/content/shared/img/svg/media-group-left-hover.svg
browser/components/loop/content/shared/img/svg/media-group-right-hover.svg
browser/components/loop/content/shared/img/svg/media-group.svg
browser/components/loop/content/shared/img/svg/settings-hover.svg
browser/components/loop/content/shared/img/svg/settings.svg
browser/components/loop/content/shared/img/svg/sharing-active.svg
browser/components/loop/content/shared/img/svg/sharing-hover.svg
browser/components/loop/content/shared/img/svg/sharing-pending.svg
browser/components/loop/content/shared/img/svg/sharing.svg
browser/components/loop/content/shared/img/svg/video-hover.svg
browser/components/loop/content/shared/img/svg/video-mute-hover.svg
browser/components/loop/content/shared/img/svg/video-mute.svg
browser/components/loop/content/shared/img/svg/video.svg
browser/components/loop/content/shared/img/telefonica.png
browser/components/loop/content/shared/img/telefonica@2x.png
browser/components/loop/content/shared/img/vivo.png
browser/components/loop/content/shared/img/vivo@2x.png
browser/components/loop/content/shared/js/actions.js
browser/components/loop/content/shared/js/activeRoomStore.js
browser/components/loop/content/shared/js/crypto.js
browser/components/loop/content/shared/js/dispatcher.js
browser/components/loop/content/shared/js/linkifiedTextView.js
browser/components/loop/content/shared/js/linkifiedTextView.jsx
browser/components/loop/content/shared/js/loopapi-client.js
browser/components/loop/content/shared/js/mixins.js
browser/components/loop/content/shared/js/models.js
browser/components/loop/content/shared/js/otSdkDriver.js
browser/components/loop/content/shared/js/store.js
browser/components/loop/content/shared/js/textChatStore.js
browser/components/loop/content/shared/js/textChatView.js
browser/components/loop/content/shared/js/textChatView.jsx
browser/components/loop/content/shared/js/urlRegExps.js
browser/components/loop/content/shared/js/utils.js
browser/components/loop/content/shared/js/validate.js
browser/components/loop/content/shared/js/views.js
browser/components/loop/content/shared/js/views.jsx
browser/components/loop/content/shared/libs/backbone-1.2.1.js
browser/components/loop/content/shared/libs/classnames-2.2.0.js
browser/components/loop/content/shared/libs/lodash-3.9.3.js
browser/components/loop/content/shared/libs/react-0.13.3-prod.js
browser/components/loop/content/shared/libs/react-0.13.3.js
browser/components/loop/content/shared/libs/sdk-content/css/ot.css
browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/buttons.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/loader.gif
browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-off.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-on.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-off.png
browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-on.png
browser/components/loop/content/shared/libs/sdk-content/js/dynamic_config.min.js
browser/components/loop/content/shared/libs/sdk.js
browser/components/loop/content/shared/sounds/connected.ogg
browser/components/loop/content/shared/sounds/connecting.ogg
browser/components/loop/content/shared/sounds/failure.ogg
browser/components/loop/content/shared/sounds/message.ogg
browser/components/loop/content/shared/sounds/ringtone.ogg
browser/components/loop/content/shared/sounds/room-joined-in.ogg
browser/components/loop/content/shared/sounds/room-joined.ogg
browser/components/loop/content/shared/sounds/room-left.ogg
browser/components/loop/content/shared/sounds/terminated.ogg
browser/components/loop/jar.mn
browser/components/loop/manifest.ini
browser/components/loop/modules/.eslintrc
browser/components/loop/modules/LoopRooms.jsm
browser/components/loop/modules/LoopRoomsCache.jsm
browser/components/loop/modules/MozLoopAPI.jsm
browser/components/loop/modules/MozLoopPushHandler.jsm
browser/components/loop/modules/MozLoopService.jsm
browser/components/loop/modules/MozLoopWorker.js
browser/components/loop/moz.build
browser/components/loop/run-all-loop-tests.sh
browser/components/loop/standalone/.gitignore
browser/components/loop/standalone/Makefile
browser/components/loop/standalone/README.md
browser/components/loop/standalone/content/css/webapp.css
browser/components/loop/standalone/content/favicon.ico
browser/components/loop/standalone/content/img/gum-chrome.svg
browser/components/loop/standalone/content/img/gum-firefox.svg
browser/components/loop/standalone/content/img/gum-opera.svg
browser/components/loop/standalone/content/img/gum-others.svg
browser/components/loop/standalone/content/img/hello-logo-text.svg
browser/components/loop/standalone/content/img/logo.png
browser/components/loop/standalone/content/img/mozilla-logo.svg
browser/components/loop/standalone/content/index.html
browser/components/loop/standalone/content/js/standaloneAppStore.js
browser/components/loop/standalone/content/js/standaloneMetricsStore.js
browser/components/loop/standalone/content/js/standaloneMozLoop.js
browser/components/loop/standalone/content/js/standaloneRoomViews.js
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
browser/components/loop/standalone/content/js/webapp.js
browser/components/loop/standalone/content/js/webapp.jsx
browser/components/loop/standalone/content/l10n/en-US/loop.properties
browser/components/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
browser/components/loop/standalone/content/libs/l10n-gaia-upstream.txt
browser/components/loop/standalone/content/robots.txt
browser/components/loop/standalone/content/webappEntryPoint.js
browser/components/loop/standalone/package.json
browser/components/loop/standalone/server.js
browser/components/loop/standalone/webpack.config.js
browser/components/loop/test/.eslintrc
browser/components/loop/test/coverage/index.html
browser/components/loop/test/desktop-local/.eslintrc
browser/components/loop/test/desktop-local/README.md
browser/components/loop/test/desktop-local/conversationAppStore_test.js
browser/components/loop/test/desktop-local/conversation_test.js
browser/components/loop/test/desktop-local/feedbackViews_test.js
browser/components/loop/test/desktop-local/index.html
browser/components/loop/test/desktop-local/l10n_test.js
browser/components/loop/test/desktop-local/panel_test.js
browser/components/loop/test/desktop-local/roomStore_test.js
browser/components/loop/test/desktop-local/roomViews_test.js
browser/components/loop/test/desktop-local/test_desktop_all.py
browser/components/loop/test/functional/config.py
browser/components/loop/test/functional/hanging_threads.py
browser/components/loop/test/functional/manifest.ini
browser/components/loop/test/functional/serversetup.py
browser/components/loop/test/functional/test_1_browser_call.py
browser/components/loop/test/index.html
browser/components/loop/test/karma/head.js
browser/components/loop/test/karma/karma.conf.base.js
browser/components/loop/test/karma/karma.coverage.desktop.js
browser/components/loop/test/karma/karma.coverage.shared_standalone.js
browser/components/loop/test/mochitest/.eslintrc
browser/components/loop/test/mochitest/browser.ini
browser/components/loop/test/mochitest/browser_LoopRooms_channel.js
browser/components/loop/test/mochitest/browser_fxa_login.js
browser/components/loop/test/mochitest/browser_loop_fxa_server.js
browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
browser/components/loop/test/mochitest/browser_mozLoop_chat.js
browser/components/loop/test/mochitest/browser_mozLoop_context.js
browser/components/loop/test/mochitest/browser_mozLoop_sharingListeners.js
browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
browser/components/loop/test/mochitest/browser_toolbarbutton.js
browser/components/loop/test/mochitest/head.js
browser/components/loop/test/mochitest/loop_fxa.sjs
browser/components/loop/test/mochitest/test_loopLinkClicker_channel.html
browser/components/loop/test/package.json
browser/components/loop/test/shared/activeRoomStore_test.js
browser/components/loop/test/shared/crypto_test.js
browser/components/loop/test/shared/dispatcher_test.js
browser/components/loop/test/shared/frontend_tester.py
browser/components/loop/test/shared/index.html
browser/components/loop/test/shared/linkifiedTextView_test.js
browser/components/loop/test/shared/loop_mocha_utils.js
browser/components/loop/test/shared/loopapi-client_test.js
browser/components/loop/test/shared/mixins_test.js
browser/components/loop/test/shared/models_test.js
browser/components/loop/test/shared/otSdkDriver_test.js
browser/components/loop/test/shared/sdk_mock.js
browser/components/loop/test/shared/store_test.js
browser/components/loop/test/shared/test_shared_all.py
browser/components/loop/test/shared/textChatStore_test.js
browser/components/loop/test/shared/textChatView_test.js
browser/components/loop/test/shared/utils_test.js
browser/components/loop/test/shared/validate_test.js
browser/components/loop/test/shared/vendor/chai-3.0.0.js
browser/components/loop/test/shared/vendor/chai-as-promised-5.1.0.js
browser/components/loop/test/shared/vendor/mocha-2.2.5.css
browser/components/loop/test/shared/vendor/mocha-2.2.5.js
browser/components/loop/test/shared/vendor/sinon-1.16.1.js
browser/components/loop/test/shared/views_test.js
browser/components/loop/test/standalone/index.html
browser/components/loop/test/standalone/standaloneAppStore_test.js
browser/components/loop/test/standalone/standaloneMetricsStore_test.js
browser/components/loop/test/standalone/standaloneMozLoop_test.js
browser/components/loop/test/standalone/standaloneRoomViews_test.js
browser/components/loop/test/standalone/test_standalone_all.py
browser/components/loop/test/standalone/webapp_test.js
browser/components/loop/test/ui-showcase/test_ui-showcase.py
browser/components/loop/test/visual-regression/README.md
browser/components/loop/test/visual-regression/screenshot
browser/components/loop/test/xpcshell/.eslintrc
browser/components/loop/test/xpcshell/head.js
browser/components/loop/test/xpcshell/test_loopapi_doNotDisturb.js
browser/components/loop/test/xpcshell/test_loopapi_internal.js
browser/components/loop/test/xpcshell/test_loopapi_prefs.js
browser/components/loop/test/xpcshell/test_looppush_initialize.js
browser/components/loop/test/xpcshell/test_looprooms.js
browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
browser/components/loop/test/xpcshell/test_looprooms_first_notification.js
browser/components/loop/test/xpcshell/test_looprooms_getall.js
browser/components/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
browser/components/loop/test/xpcshell/test_loopservice_dnd.js
browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js
browser/components/loop/test/xpcshell/test_loopservice_hawk_request.js
browser/components/loop/test/xpcshell/test_loopservice_initialize.js
browser/components/loop/test/xpcshell/test_loopservice_locales.js
browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
browser/components/loop/test/xpcshell/test_loopservice_registration.js
browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
browser/components/loop/test/xpcshell/test_loopservice_restart.js
browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
browser/components/loop/test/xpcshell/test_loopservice_token_save.js
browser/components/loop/test/xpcshell/test_loopservice_token_send.js
browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
browser/components/loop/test/xpcshell/xpcshell.ini
browser/components/loop/ui/README.md
browser/components/loop/ui/fake-l10n.js
browser/components/loop/ui/fake-mozLoop.js
browser/components/loop/ui/index.html
browser/components/loop/ui/react-frame-component.js
browser/components/loop/ui/sample-img/video-screen-local.png
browser/components/loop/ui/sample-img/video-screen-remote.png
browser/components/loop/ui/sample-img/video-screen-terminal.png
browser/components/loop/ui/ui-showcase.css
browser/components/loop/ui/ui-showcase.js
browser/components/loop/ui/ui-showcase.jsx
browser/components/moz.build
browser/components/uitour/test/browser_UITour_loop.js
browser/extensions/loop/.eslintignore
browser/extensions/loop/.eslintrc
browser/extensions/loop/.eslintrc-gecko
browser/extensions/loop/.gitignore
browser/extensions/loop/README.txt
browser/extensions/loop/bootstrap.js
browser/extensions/loop/build-jsx
browser/extensions/loop/content/modules/.eslintrc
browser/extensions/loop/content/modules/LoopRooms.jsm
browser/extensions/loop/content/modules/LoopRoomsCache.jsm
browser/extensions/loop/content/modules/MozLoopAPI.jsm
browser/extensions/loop/content/modules/MozLoopPushHandler.jsm
browser/extensions/loop/content/modules/MozLoopService.jsm
browser/extensions/loop/content/modules/MozLoopWorker.js
browser/extensions/loop/content/panels/conversation.html
browser/extensions/loop/content/panels/css/panel.css
browser/extensions/loop/content/panels/js/.eslintrc
browser/extensions/loop/content/panels/js/conversation.js
browser/extensions/loop/content/panels/js/conversation.jsx
browser/extensions/loop/content/panels/js/conversationAppStore.js
browser/extensions/loop/content/panels/js/feedbackViews.js
browser/extensions/loop/content/panels/js/feedbackViews.jsx
browser/extensions/loop/content/panels/js/otconfig.js
browser/extensions/loop/content/panels/js/panel.js
browser/extensions/loop/content/panels/js/panel.jsx
browser/extensions/loop/content/panels/js/roomStore.js
browser/extensions/loop/content/panels/js/roomViews.js
browser/extensions/loop/content/panels/js/roomViews.jsx
browser/extensions/loop/content/panels/panel.html
browser/extensions/loop/content/panels/vendor/l10n.js
browser/extensions/loop/content/preferences/prefs.js
browser/extensions/loop/content/shared/README.md
browser/extensions/loop/content/shared/css/common.css
browser/extensions/loop/content/shared/css/conversation.css
browser/extensions/loop/content/shared/css/reset.css
browser/extensions/loop/content/shared/img/02.png
browser/extensions/loop/content/shared/img/02@2x.png
browser/extensions/loop/content/shared/img/animated-spinner.svg
browser/extensions/loop/content/shared/img/audio-call-avatar.svg
browser/extensions/loop/content/shared/img/audio-default-16x16@1.5x.png
browser/extensions/loop/content/shared/img/audio-default-16x16@2x.png
browser/extensions/loop/content/shared/img/audio-hover.svg
browser/extensions/loop/content/shared/img/audio-mute-hover.svg
browser/extensions/loop/content/shared/img/audio-mute.svg
browser/extensions/loop/content/shared/img/audio.svg
browser/extensions/loop/content/shared/img/avatars.svg
browser/extensions/loop/content/shared/img/beta-ribbon.svg
browser/extensions/loop/content/shared/img/cam_audio-no.svg
browser/extensions/loop/content/shared/img/cam_audio.svg
browser/extensions/loop/content/shared/img/cam_audio_h.svg
browser/extensions/loop/content/shared/img/chatbubble-arrow-left.svg
browser/extensions/loop/content/shared/img/chatbubble-arrow-right.svg
browser/extensions/loop/content/shared/img/check.svg
browser/extensions/loop/content/shared/img/ellipsis-v.svg
browser/extensions/loop/content/shared/img/empty_conversations.svg
browser/extensions/loop/content/shared/img/empty_search.svg
browser/extensions/loop/content/shared/img/exit.svg
browser/extensions/loop/content/shared/img/facemute-14x14.png
browser/extensions/loop/content/shared/img/facemute-14x14@2x.png
browser/extensions/loop/content/shared/img/firefox-avatar.svg
browser/extensions/loop/content/shared/img/firefox-logo.png
browser/extensions/loop/content/shared/img/glyph-email-16x16.svg
browser/extensions/loop/content/shared/img/glyph-facebook-16x16.svg
browser/extensions/loop/content/shared/img/glyph-help-16x16.svg
browser/extensions/loop/content/shared/img/glyph-link-16x16.svg
browser/extensions/loop/content/shared/img/glyph-user-16x16.svg
browser/extensions/loop/content/shared/img/hangup-inverse-14x14.png
browser/extensions/loop/content/shared/img/hangup-inverse-14x14@2x.png
browser/extensions/loop/content/shared/img/happy.png
browser/extensions/loop/content/shared/img/hello_logo.svg
browser/extensions/loop/content/shared/img/helloicon.svg
browser/extensions/loop/content/shared/img/icon_32.png
browser/extensions/loop/content/shared/img/icon_64.png
browser/extensions/loop/content/shared/img/icons-10x10.svg
browser/extensions/loop/content/shared/img/icons-14x14.svg
browser/extensions/loop/content/shared/img/icons-16x16.svg
browser/extensions/loop/content/shared/img/media-group-left-hover.svg
browser/extensions/loop/content/shared/img/media-group-right-hover.svg
browser/extensions/loop/content/shared/img/media-group.svg
browser/extensions/loop/content/shared/img/movistar.png
browser/extensions/loop/content/shared/img/movistar@2x.png
browser/extensions/loop/content/shared/img/mute-inverse-14x14.png
browser/extensions/loop/content/shared/img/mute-inverse-14x14@2x.png
browser/extensions/loop/content/shared/img/pause-12x12.svg
browser/extensions/loop/content/shared/img/play-12x12.svg
browser/extensions/loop/content/shared/img/sad.png
browser/extensions/loop/content/shared/img/sad_hello_icon_64x64.svg
browser/extensions/loop/content/shared/img/settings-hover.svg
browser/extensions/loop/content/shared/img/settings.svg
browser/extensions/loop/content/shared/img/sharing-active.svg
browser/extensions/loop/content/shared/img/sharing-hover.svg
browser/extensions/loop/content/shared/img/sharing-pending.svg
browser/extensions/loop/content/shared/img/sharing.svg
browser/extensions/loop/content/shared/img/spinner.png
browser/extensions/loop/content/shared/img/spinner.svg
browser/extensions/loop/content/shared/img/spinner@2x.png
browser/extensions/loop/content/shared/img/stop-12x12.svg
browser/extensions/loop/content/shared/img/telefonica.png
browser/extensions/loop/content/shared/img/telefonica@2x.png
browser/extensions/loop/content/shared/img/video-hover.svg
browser/extensions/loop/content/shared/img/video-mute-hover.svg
browser/extensions/loop/content/shared/img/video-mute.svg
browser/extensions/loop/content/shared/img/video.svg
browser/extensions/loop/content/shared/img/vivo.png
browser/extensions/loop/content/shared/img/vivo@2x.png
browser/extensions/loop/content/shared/js/actions.js
browser/extensions/loop/content/shared/js/activeRoomStore.js
browser/extensions/loop/content/shared/js/crypto.js
browser/extensions/loop/content/shared/js/dispatcher.js
browser/extensions/loop/content/shared/js/linkifiedTextView.js
browser/extensions/loop/content/shared/js/linkifiedTextView.jsx
browser/extensions/loop/content/shared/js/loopapi-client.js
browser/extensions/loop/content/shared/js/mixins.js
browser/extensions/loop/content/shared/js/models.js
browser/extensions/loop/content/shared/js/otSdkDriver.js
browser/extensions/loop/content/shared/js/store.js
browser/extensions/loop/content/shared/js/textChatStore.js
browser/extensions/loop/content/shared/js/textChatView.js
browser/extensions/loop/content/shared/js/textChatView.jsx
browser/extensions/loop/content/shared/js/urlRegExps.js
browser/extensions/loop/content/shared/js/utils.js
browser/extensions/loop/content/shared/js/validate.js
browser/extensions/loop/content/shared/js/views.js
browser/extensions/loop/content/shared/js/views.jsx
browser/extensions/loop/content/shared/sounds/connected.ogg
browser/extensions/loop/content/shared/sounds/connecting.ogg
browser/extensions/loop/content/shared/sounds/failure.ogg
browser/extensions/loop/content/shared/sounds/message.ogg
browser/extensions/loop/content/shared/sounds/ringtone.ogg
browser/extensions/loop/content/shared/sounds/room-joined-in.ogg
browser/extensions/loop/content/shared/sounds/room-joined.ogg
browser/extensions/loop/content/shared/sounds/room-left.ogg
browser/extensions/loop/content/shared/sounds/terminated.ogg
browser/extensions/loop/content/shared/vendor/backbone-1.2.1.js
browser/extensions/loop/content/shared/vendor/classnames-2.2.0.js
browser/extensions/loop/content/shared/vendor/lodash-3.9.3.js
browser/extensions/loop/content/shared/vendor/react-0.13.3-prod.js
browser/extensions/loop/content/shared/vendor/react-0.13.3.js
browser/extensions/loop/content/shared/vendor/sdk-content/css/ot.css
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-chrome.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-copy-firefox.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-firefox.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-predenied-chrome.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-prompt-chrome.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-publisher.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-subscriber.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/buttons.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/loader.gif
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-off.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-on.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-off.png
browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-on.png
browser/extensions/loop/content/shared/vendor/sdk-content/js/dynamic_config.min.js
browser/extensions/loop/content/shared/vendor/sdk.js
browser/extensions/loop/install.rdf.in
browser/extensions/loop/jar.mn
browser/extensions/loop/manifest.ini
browser/extensions/loop/moz.build
browser/extensions/loop/run-all-loop-tests.sh
browser/extensions/loop/skin/linux/menuPanel.png
browser/extensions/loop/skin/linux/menuPanel@2x.png
browser/extensions/loop/skin/linux/toolbar-inverted.png
browser/extensions/loop/skin/linux/toolbar-inverted@2x.png
browser/extensions/loop/skin/linux/toolbar.png
browser/extensions/loop/skin/linux/toolbar@2x.png
browser/extensions/loop/skin/osx/menuPanel-yosemite.png
browser/extensions/loop/skin/osx/menuPanel-yosemite@2x.png
browser/extensions/loop/skin/osx/menuPanel.png
browser/extensions/loop/skin/osx/menuPanel@2x.png
browser/extensions/loop/skin/osx/platform.css
browser/extensions/loop/skin/osx/toolbar-inverted.png
browser/extensions/loop/skin/osx/toolbar-inverted@2x.png
browser/extensions/loop/skin/osx/toolbar-yosemite.png
browser/extensions/loop/skin/osx/toolbar-yosemite@2x.png
browser/extensions/loop/skin/osx/toolbar.png
browser/extensions/loop/skin/osx/toolbar@2x.png
browser/extensions/loop/skin/shared/loop.css
browser/extensions/loop/skin/windows/menuPanel-aero.png
browser/extensions/loop/skin/windows/menuPanel-aero@2x.png
browser/extensions/loop/skin/windows/menuPanel.png
browser/extensions/loop/skin/windows/menuPanel@2x.png
browser/extensions/loop/skin/windows/platform.css
browser/extensions/loop/skin/windows/toolbar-XP.png
browser/extensions/loop/skin/windows/toolbar-XP@2x.png
browser/extensions/loop/skin/windows/toolbar-aero.png
browser/extensions/loop/skin/windows/toolbar-aero@2x.png
browser/extensions/loop/skin/windows/toolbar-inverted.png
browser/extensions/loop/skin/windows/toolbar-inverted@2x.png
browser/extensions/loop/skin/windows/toolbar-lunaSilver.png
browser/extensions/loop/skin/windows/toolbar-lunaSilver@2x.png
browser/extensions/loop/skin/windows/toolbar-win8.png
browser/extensions/loop/skin/windows/toolbar-win8@2x.png
browser/extensions/loop/skin/windows/toolbar.png
browser/extensions/loop/skin/windows/toolbar@2x.png
browser/extensions/loop/standalone/.gitignore
browser/extensions/loop/standalone/Makefile
browser/extensions/loop/standalone/README.md
browser/extensions/loop/standalone/content/css/webapp.css
browser/extensions/loop/standalone/content/favicon.ico
browser/extensions/loop/standalone/content/img/gum-chrome.svg
browser/extensions/loop/standalone/content/img/gum-firefox.svg
browser/extensions/loop/standalone/content/img/gum-opera.svg
browser/extensions/loop/standalone/content/img/gum-others.svg
browser/extensions/loop/standalone/content/img/hello-logo-text.svg
browser/extensions/loop/standalone/content/img/logo.png
browser/extensions/loop/standalone/content/img/mozilla-logo.svg
browser/extensions/loop/standalone/content/index.html
browser/extensions/loop/standalone/content/js/standaloneAppStore.js
browser/extensions/loop/standalone/content/js/standaloneMetricsStore.js
browser/extensions/loop/standalone/content/js/standaloneMozLoop.js
browser/extensions/loop/standalone/content/js/standaloneRoomViews.js
browser/extensions/loop/standalone/content/js/standaloneRoomViews.jsx
browser/extensions/loop/standalone/content/js/webapp.js
browser/extensions/loop/standalone/content/js/webapp.jsx
browser/extensions/loop/standalone/content/l10n/en-US/loop.properties
browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt
browser/extensions/loop/standalone/content/robots.txt
browser/extensions/loop/standalone/content/webappEntryPoint.js
browser/extensions/loop/standalone/package.json
browser/extensions/loop/standalone/server.js
browser/extensions/loop/standalone/webpack.config.js
browser/extensions/loop/test/.eslintrc
browser/extensions/loop/test/coverage/index.html
browser/extensions/loop/test/desktop-local/.eslintrc
browser/extensions/loop/test/desktop-local/README.md
browser/extensions/loop/test/desktop-local/conversationAppStore_test.js
browser/extensions/loop/test/desktop-local/conversation_test.js
browser/extensions/loop/test/desktop-local/feedbackViews_test.js
browser/extensions/loop/test/desktop-local/index.html
browser/extensions/loop/test/desktop-local/l10n_test.js
browser/extensions/loop/test/desktop-local/panel_test.js
browser/extensions/loop/test/desktop-local/roomStore_test.js
browser/extensions/loop/test/desktop-local/roomViews_test.js
browser/extensions/loop/test/desktop-local/test_desktop_all.py
browser/extensions/loop/test/functional/config.py
browser/extensions/loop/test/functional/hanging_threads.py
browser/extensions/loop/test/functional/manifest.ini
browser/extensions/loop/test/functional/serversetup.py
browser/extensions/loop/test/functional/test_1_browser_call.py
browser/extensions/loop/test/index.html
browser/extensions/loop/test/karma/head.js
browser/extensions/loop/test/karma/karma.conf.base.js
browser/extensions/loop/test/karma/karma.coverage.desktop.js
browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
browser/extensions/loop/test/mochitest/.eslintrc
browser/extensions/loop/test/mochitest/browser.ini
browser/extensions/loop/test/mochitest/browser_LoopRooms_channel.js
browser/extensions/loop/test/mochitest/browser_fxa_login.js
browser/extensions/loop/test/mochitest/browser_loop_fxa_server.js
browser/extensions/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
browser/extensions/loop/test/mochitest/browser_mozLoop_chat.js
browser/extensions/loop/test/mochitest/browser_mozLoop_context.js
browser/extensions/loop/test/mochitest/browser_mozLoop_sharingListeners.js
browser/extensions/loop/test/mochitest/browser_mozLoop_socialShare.js
browser/extensions/loop/test/mochitest/browser_mozLoop_telemetry.js
browser/extensions/loop/test/mochitest/browser_toolbarbutton.js
browser/extensions/loop/test/mochitest/head.js
browser/extensions/loop/test/mochitest/loop_fxa.sjs
browser/extensions/loop/test/mochitest/test_loopLinkClicker_channel.html
browser/extensions/loop/test/package.json
browser/extensions/loop/test/shared/activeRoomStore_test.js
browser/extensions/loop/test/shared/crypto_test.js
browser/extensions/loop/test/shared/dispatcher_test.js
browser/extensions/loop/test/shared/frontend_tester.py
browser/extensions/loop/test/shared/index.html
browser/extensions/loop/test/shared/linkifiedTextView_test.js
browser/extensions/loop/test/shared/loop_mocha_utils.js
browser/extensions/loop/test/shared/loopapi-client_test.js
browser/extensions/loop/test/shared/mixins_test.js
browser/extensions/loop/test/shared/models_test.js
browser/extensions/loop/test/shared/otSdkDriver_test.js
browser/extensions/loop/test/shared/sdk_mock.js
browser/extensions/loop/test/shared/store_test.js
browser/extensions/loop/test/shared/test_shared_all.py
browser/extensions/loop/test/shared/textChatStore_test.js
browser/extensions/loop/test/shared/textChatView_test.js
browser/extensions/loop/test/shared/utils_test.js
browser/extensions/loop/test/shared/validate_test.js
browser/extensions/loop/test/shared/vendor/chai-3.0.0.js
browser/extensions/loop/test/shared/vendor/chai-as-promised-5.1.0.js
browser/extensions/loop/test/shared/vendor/mocha-2.2.5.css
browser/extensions/loop/test/shared/vendor/mocha-2.2.5.js
browser/extensions/loop/test/shared/vendor/sinon-1.16.1.js
browser/extensions/loop/test/shared/views_test.js
browser/extensions/loop/test/standalone/index.html
browser/extensions/loop/test/standalone/standaloneAppStore_test.js
browser/extensions/loop/test/standalone/standaloneMetricsStore_test.js
browser/extensions/loop/test/standalone/standaloneMozLoop_test.js
browser/extensions/loop/test/standalone/standaloneRoomViews_test.js
browser/extensions/loop/test/standalone/test_standalone_all.py
browser/extensions/loop/test/standalone/webapp_test.js
browser/extensions/loop/test/ui-showcase/test_ui-showcase.py
browser/extensions/loop/test/visual-regression/README.md
browser/extensions/loop/test/visual-regression/screenshot
browser/extensions/loop/test/xpcshell/.eslintrc
browser/extensions/loop/test/xpcshell/head.js
browser/extensions/loop/test/xpcshell/test_loopapi_doNotDisturb.js
browser/extensions/loop/test/xpcshell/test_loopapi_internal.js
browser/extensions/loop/test/xpcshell/test_loopapi_prefs.js
browser/extensions/loop/test/xpcshell/test_looppush_initialize.js
browser/extensions/loop/test/xpcshell/test_looprooms.js
browser/extensions/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
browser/extensions/loop/test/xpcshell/test_looprooms_first_notification.js
browser/extensions/loop/test/xpcshell/test_looprooms_getall.js
browser/extensions/loop/test/xpcshell/test_looprooms_upgrade_to_encryption.js
browser/extensions/loop/test/xpcshell/test_loopservice_dnd.js
browser/extensions/loop/test/xpcshell/test_loopservice_encryptionkey.js
browser/extensions/loop/test/xpcshell/test_loopservice_hawk_errors.js
browser/extensions/loop/test/xpcshell/test_loopservice_hawk_request.js
browser/extensions/loop/test/xpcshell/test_loopservice_initialize.js
browser/extensions/loop/test/xpcshell/test_loopservice_locales.js
browser/extensions/loop/test/xpcshell/test_loopservice_loop_prefs.js
browser/extensions/loop/test/xpcshell/test_loopservice_registration.js
browser/extensions/loop/test/xpcshell/test_loopservice_registration_retry.js
browser/extensions/loop/test/xpcshell/test_loopservice_restart.js
browser/extensions/loop/test/xpcshell/test_loopservice_token_invalid.js
browser/extensions/loop/test/xpcshell/test_loopservice_token_save.js
browser/extensions/loop/test/xpcshell/test_loopservice_token_send.js
browser/extensions/loop/test/xpcshell/test_loopservice_token_validation.js
browser/extensions/loop/test/xpcshell/xpcshell.ini
browser/extensions/loop/ui/README.md
browser/extensions/loop/ui/fake-l10n.js
browser/extensions/loop/ui/fake-mozLoop.js
browser/extensions/loop/ui/index.html
browser/extensions/loop/ui/react-frame-component.js
browser/extensions/loop/ui/sample-img/video-screen-local.png
browser/extensions/loop/ui/sample-img/video-screen-remote.png
browser/extensions/loop/ui/sample-img/video-screen-terminal.png
browser/extensions/loop/ui/ui-showcase.css
browser/extensions/loop/ui/ui-showcase.js
browser/extensions/loop/ui/ui-showcase.jsx
browser/extensions/moz.build
browser/installer/package-manifest.in
browser/themes/linux/jar.mn
browser/themes/linux/loop/menuPanel.png
browser/themes/linux/loop/menuPanel@2x.png
browser/themes/linux/loop/toolbar-inverted.png
browser/themes/linux/loop/toolbar-inverted@2x.png
browser/themes/linux/loop/toolbar.png
browser/themes/linux/loop/toolbar@2x.png
browser/themes/osx/browser.css
browser/themes/osx/jar.mn
browser/themes/osx/loop/menuPanel-yosemite.png
browser/themes/osx/loop/menuPanel-yosemite@2x.png
browser/themes/osx/loop/menuPanel.png
browser/themes/osx/loop/menuPanel@2x.png
browser/themes/osx/loop/toolbar-inverted.png
browser/themes/osx/loop/toolbar-inverted@2x.png
browser/themes/osx/loop/toolbar-yosemite.png
browser/themes/osx/loop/toolbar-yosemite@2x.png
browser/themes/osx/loop/toolbar.png
browser/themes/osx/loop/toolbar@2x.png
browser/themes/shared/browser.inc
browser/themes/shared/menupanel.inc.css
browser/themes/shared/notification-icons.inc.css
browser/themes/shared/social/chat.inc.css
browser/themes/shared/toolbarbuttons.inc.css
browser/themes/windows/browser.css
browser/themes/windows/jar.mn
browser/themes/windows/loop/menuPanel-aero.png
browser/themes/windows/loop/menuPanel-aero@2x.png
browser/themes/windows/loop/menuPanel.png
browser/themes/windows/loop/menuPanel@2x.png
browser/themes/windows/loop/toolbar-XP.png
browser/themes/windows/loop/toolbar-XP@2x.png
browser/themes/windows/loop/toolbar-aero.png
browser/themes/windows/loop/toolbar-aero@2x.png
browser/themes/windows/loop/toolbar-inverted.png
browser/themes/windows/loop/toolbar-inverted@2x.png
browser/themes/windows/loop/toolbar-lunaSilver.png
browser/themes/windows/loop/toolbar-lunaSilver@2x.png
browser/themes/windows/loop/toolbar-win8.png
browser/themes/windows/loop/toolbar-win8@2x.png
browser/themes/windows/loop/toolbar.png
browser/themes/windows/loop/toolbar@2x.png
testing/marionette/client/marionette/tests/unit-tests.ini
testing/profiles/prefs_general.js
--- a/.hgignore
+++ b/.hgignore
@@ -75,25 +75,19 @@
 ^media/libstagefright/android$
 
 # Tag files generated by GNU Global
 GTAGS
 GRTAGS
 GSYMS
 GPATH
 
-# Various items for Loop
+# Unit tests for Loop
 ^browser/components/loop/standalone/content/config\.js$
-^browser/extensions/loop/.*/node_modules/
-^browser/extensions/loop/.*\.module-cache
-^browser/extensions/loop/test/coverage/desktop
-^browser/extensions/loop/test/coverage/shared_standalone
-^browser/extensions/loop/test/visual-regression/diff
-^browser/extensions/loop/test/visual-regression/new
-^browser/extensions/loop/test/visual-regression/refs
+^browser/components/loop/standalone/node_modules/
 
 # Git clone directory for updating web-platform-tests
 ^testing/web-platform/sync/
 
 # Android Gradle artifacts.
 ^mobile/android/gradle/.gradle
 
 # XCode project cruft
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1371,16 +1371,52 @@ pref("pdfjs.previousHandler.alwaysAskBef
 pref("shumway.disabled", true);
 #endif
 
 // The maximum amount of decoded image data we'll willingly keep around (we
 // might keep around more than this, but we'll try to get down to this value).
 // (This is intentionally on the high side; see bug 746055.)
 pref("image.mem.max_decoded_image_kb", 256000);
 
+pref("loop.enabled", true);
+pref("loop.textChat.enabled", true);
+pref("loop.server", "https://loop.services.mozilla.com/v0");
+pref("loop.linkClicker.url", "https://hello.firefox.com/");
+pref("loop.gettingStarted.seen", false);
+pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start/");
+pref("loop.gettingStarted.resumeOnFirstJoin", false);
+pref("loop.learnMoreUrl", "https://www.firefox.com/hello/");
+pref("loop.legal.ToS_url", "https://www.mozilla.org/about/legal/terms/firefox-hello/");
+pref("loop.legal.privacy_url", "https://www.mozilla.org/privacy/firefox-hello/");
+pref("loop.do_not_disturb", false);
+pref("loop.ringtone", "chrome://browser/content/loop/shared/sounds/ringtone.ogg");
+pref("loop.retry_delay.start", 60000);
+pref("loop.retry_delay.limit", 300000);
+pref("loop.ping.interval", 1800000);
+pref("loop.ping.timeout", 10000);
+pref("loop.feedback.baseUrl", "https://input.mozilla.org/api/v1/feedback");
+pref("loop.feedback.product", "Loop");
+pref("loop.debug.loglevel", "Error");
+pref("loop.debug.dispatcher", false);
+pref("loop.debug.sdk", false);
+pref("loop.debug.twoWayMediaTelemetry", false);
+pref("loop.feedback.dateLastSeenSec", 0);
+pref("loop.feedback.periodSec", 15770000); // 6 months.
+pref("loop.feedback.formURL", "https://www.mozilla.org/firefox/hello/npssurvey/");
+pref("loop.feedback.manualFormURL", "https://www.mozilla.org/firefox/hello/feedbacksurvey/");
+#ifdef DEBUG
+pref("loop.CSP", "default-src 'self' about: file: chrome: http://localhost:*; img-src * data:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net http://localhost:* ws://localhost:*; media-src blob:");
+#else
+pref("loop.CSP", "default-src 'self' about: file: chrome:; img-src * data:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net; media-src blob:");
+#endif
+pref("loop.fxa_oauth.tokendata", "");
+pref("loop.fxa_oauth.profile", "");
+pref("loop.support_url", "https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc");
+pref("loop.browserSharing.showInfoBar", true);
+
 pref("social.sidebar.unload_timeout_ms", 10000);
 
 // Activation from inside of share panel is possible if activationPanelEnabled
 // is true. Pref'd off for release while usage testing is done through beta.
 pref("social.share.activationPanelEnabled", true);
 pref("social.shareDirectory", "https://activations.cdn.mozilla.net/sharePanel.html");
 
 pref("dom.identity.enabled", false);
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-loop.js
@@ -0,0 +1,613 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// the "exported" symbols
+var LoopUI;
+
+(function() {
+  const kNSXUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+  const kBrowserSharingNotificationId = "loop-sharing-notification";
+  const kPrefBrowserSharingInfoBar = "browserSharing.showInfoBar";
+
+  LoopUI = {
+    /**
+     * @var {XULWidgetSingleWrapper} toolbarButton Getter for the Loop toolbarbutton
+     *                                             instance for this window.
+     */
+    get toolbarButton() {
+      delete this.toolbarButton;
+      return this.toolbarButton = CustomizableUI.getWidget("loop-button").forWindow(window);
+    },
+
+    /**
+     * @var {XULElement} panel Getter for the Loop panel element.
+     */
+    get panel() {
+      delete this.panel;
+      return this.panel = document.getElementById("loop-notification-panel");
+    },
+
+    /**
+     * @var {XULElement|null} browser Getter for the Loop panel browser element.
+     *                                Will be NULL if the panel hasn't loaded yet.
+     */
+    get browser() {
+      let browser = document.querySelector("#loop-notification-panel > #loop-panel-iframe");
+      if (browser) {
+        delete this.browser;
+        this.browser = browser;
+      }
+      return browser;
+    },
+
+    /**
+     * @var {String|null} selectedTab Getter for the name of the currently selected
+     *                                tab inside the Loop panel. Will be NULL if
+     *                                the panel hasn't loaded yet.
+     */
+    get selectedTab() {
+      if (!this.browser) {
+        return null;
+      }
+
+      let selectedTab = this.browser.contentDocument.querySelector(".tab-view > .selected");
+      return selectedTab && selectedTab.getAttribute("data-tab-name");
+    },
+
+    /**
+     * @return {Promise}
+     */
+    promiseDocumentVisible(aDocument) {
+      if (!aDocument.hidden) {
+        return Promise.resolve(aDocument);
+      }
+
+      return new Promise((resolve) => {
+        aDocument.addEventListener("visibilitychange", function onVisibilityChanged() {
+          aDocument.removeEventListener("visibilitychange", onVisibilityChanged);
+          resolve(aDocument);
+        });
+      });
+    },
+
+    /**
+     * Toggle between opening or hiding the Loop panel.
+     *
+     * @param {DOMEvent} [event] Optional event that triggered the call to this
+     *                           function.
+     * @param {String}   [tabId] Optional name of the tab to select after the panel
+     *                           has opened. Does nothing when the panel is hidden.
+     * @return {Promise}
+     */
+    togglePanel: function(event, tabId = null) {
+      if (!this.panel) {
+        // We're on the hidden window! What fun!
+        let obs = win => {
+          Services.obs.removeObserver(obs, "browser-delayed-startup-finished");
+          win.LoopUI.togglePanel(event, tabId);
+        };
+        Services.obs.addObserver(obs, "browser-delayed-startup-finished", false);
+        return OpenBrowserWindow();
+      }
+      if (this.panel.state == "open") {
+        return new Promise(resolve => {
+          this.panel.hidePopup();
+          resolve();
+        });
+      }
+
+      return this.openCallPanel(event, tabId).then(doc => {
+        let fm = Services.focus;
+        fm.moveFocus(doc.defaultView, null, fm.MOVEFOCUS_FIRST, fm.FLAG_NOSCROLL);
+      }).catch(err => {
+        Cu.reportError(x);
+      });
+    },
+
+    /**
+     * Opens the panel for Loop and sizes it appropriately.
+     *
+     * @param {event}  event   The event opening the panel, used to anchor
+     *                         the panel to the button which triggers it.
+     * @param {String} [tabId] Identifier of the tab to select when the panel is
+     *                         opened. Example: 'rooms', 'contacts', etc.
+     * @return {Promise}
+     */
+    openCallPanel: function(event, tabId = null) {
+      return new Promise((resolve) => {
+        let callback = iframe => {
+          // Helper function to show a specific tab view in the panel.
+          function showTab() {
+            if (!tabId) {
+              resolve(LoopUI.promiseDocumentVisible(iframe.contentDocument));
+              return;
+            }
+
+            let win = iframe.contentWindow;
+            let ev = new win.CustomEvent("UIAction", Cu.cloneInto({
+              detail: {
+                action: "selectTab",
+                tab: tabId
+              }
+            }, win));
+            win.dispatchEvent(ev);
+            resolve(LoopUI.promiseDocumentVisible(iframe.contentDocument));
+          }
+
+          // If the panel has been opened and initialized before, we can skip waiting
+          // for the content to load - because it's already there.
+          if (("contentWindow" in iframe) && iframe.contentWindow.document.readyState == "complete") {
+            showTab();
+            return;
+          }
+
+          let documentDOMLoaded = () => {
+            iframe.removeEventListener("DOMContentLoaded", documentDOMLoaded, true);
+            // Handle window.close correctly on the panel.
+            this.hookWindowCloseForPanelClose(iframe.contentWindow);
+            iframe.contentWindow.addEventListener("loopPanelInitialized", function loopPanelInitialized() {
+              iframe.contentWindow.removeEventListener("loopPanelInitialized",
+                loopPanelInitialized);
+              showTab();
+            });
+          };
+          iframe.addEventListener("DOMContentLoaded", documentDOMLoaded, true);
+        };
+
+        // Used to clear the temporary "login" state from the button.
+        Services.obs.notifyObservers(null, "loop-status-changed", null);
+
+        this.shouldResumeTour().then((resume) => {
+          if (resume) {
+            // Assume the conversation with the visitor wasn't open since we would
+            // have resumed the tour as soon as the visitor joined if it was (and
+            // the pref would have been set to false already.
+            this.MozLoopService.resumeTour("waiting");
+            resolve();
+            return;
+          }
+
+          this.LoopAPI.initialize();
+
+          let anchor = event ? event.target : this.toolbarButton.anchor;
+          let setHeight = 410;
+          if (gBrowser.selectedBrowser.getAttribute("remote") === "true") {
+            setHeight = 262;
+          }
+          this.PanelFrame.showPopup(window, anchor,
+            "loop", null, "about:looppanel",
+            // Loop wants a fixed size for the panel. This also stops it dynamically resizing.
+            { width: 330, height: setHeight },
+            callback);
+        });
+      });
+    },
+
+    /**
+     * Method to know whether actions to open the panel should instead resume the tour.
+     *
+     * We need the panel to be opened via UITour so that it gets @noautohide.
+     *
+     * @return {Promise} resolving with a {Boolean} of whether the tour should be resumed instead of
+     *                   opening the panel.
+     */
+    shouldResumeTour: Task.async(function* () {
+      // Resume the FTU tour if this is the first time a room was joined by
+      // someone else since the tour.
+      if (!Services.prefs.getBoolPref("loop.gettingStarted.resumeOnFirstJoin")) {
+        return false;
+      }
+
+      if (!this.LoopRooms.participantsCount) {
+        // Nobody is in the rooms
+        return false;
+      }
+
+      let roomsWithNonOwners = yield this.roomsWithNonOwners();
+      if (!roomsWithNonOwners.length) {
+        // We were the only one in a room but we want to know about someone else joining.
+        return false;
+      }
+
+      return true;
+    }),
+
+    /**
+     * @return {Promise} resolved with an array of Rooms with participants (excluding owners)
+     */
+    roomsWithNonOwners: function() {
+      return new Promise(resolve => {
+        this.LoopRooms.getAll((error, rooms) => {
+          let roomsWithNonOwners = [];
+          for (let room of rooms) {
+            if (!("participants" in room)) {
+              continue;
+            }
+            let numNonOwners = room.participants.filter(participant => !participant.owner).length;
+            if (!numNonOwners) {
+              continue;
+            }
+            roomsWithNonOwners.push(room);
+          }
+          resolve(roomsWithNonOwners);
+        });
+      });
+    },
+
+    /**
+     * Triggers the initialization of the loop service.  Called by
+     * delayedStartup.
+     */
+    init: function() {
+      // Add observer notifications before the service is initialized
+      Services.obs.addObserver(this, "loop-status-changed", false);
+
+      // This is a promise for test purposes, but we don't want to be logging
+      // expected errors to the console, so we catch them here.
+      this.MozLoopService.initialize().catch(ex => {
+        if (!ex.message ||
+            (!ex.message.contains("not enabled") &&
+             !ex.message.contains("not needed"))) {
+          console.error(ex);
+        }
+      });
+      this.updateToolbarState();
+    },
+
+    uninit: function() {
+      Services.obs.removeObserver(this, "loop-status-changed");
+    },
+
+    // Implements nsIObserver
+    observe: function(subject, topic, data) {
+      if (topic != "loop-status-changed") {
+        return;
+      }
+      this.updateToolbarState(data);
+    },
+
+    /**
+     * Updates the toolbar/menu-button state to reflect Loop status.
+     *
+     * @param {string} [aReason] Some states are only shown if
+     *                           a related reason is provided.
+     *
+     *                 aReason="login": Used after a login is completed
+     *                   successfully. This is used so the state can be
+     *                   temporarily shown until the next state change.
+     */
+    updateToolbarState: function(aReason = null) {
+      if (!this.toolbarButton.node) {
+        return;
+      }
+      let state = "";
+      let mozL10nId = "loop-call-button3";
+      let suffix = ".tooltiptext";
+      if (this.MozLoopService.errors.size) {
+        state = "error";
+        mozL10nId += "-error";
+      } else if (this.MozLoopService.screenShareActive) {
+        state = "action";
+        mozL10nId += "-screensharing";
+      } else if (aReason == "login" && this.MozLoopService.userProfile) {
+        state = "active";
+        mozL10nId += "-active";
+        suffix += "2";
+      } else if (this.MozLoopService.doNotDisturb) {
+        state = "disabled";
+        mozL10nId += "-donotdisturb";
+      } else if (this.MozLoopService.roomsParticipantsCount > 0) {
+        state = "active";
+        this.roomsWithNonOwners().then(roomsWithNonOwners => {
+          if (roomsWithNonOwners.length > 0) {
+            mozL10nId += "-participantswaiting";
+          } else {
+            mozL10nId += "-active";
+          }
+
+          suffix += "2";
+          this.updateTooltiptext(mozL10nId + suffix);
+          this.toolbarButton.node.setAttribute("state", state);
+        });
+        return;
+      } else {
+        suffix += "2";
+      }
+
+      this.toolbarButton.node.setAttribute("state", state);
+      this.updateTooltiptext(mozL10nId + suffix);
+    },
+
+    /**
+     * Updates the tootltiptext to reflect Loop status.
+     *
+     * @param {string} [mozL10nId] l10n ID that refelct the current
+     *                           Loop status.
+     */
+    updateTooltiptext: function(mozL10nId) {
+      this.toolbarButton.node.setAttribute("tooltiptext", mozL10nId);
+      var tooltiptext = CustomizableUI.getLocalizedProperty(this.toolbarButton, "tooltiptext");
+      this.toolbarButton.node.setAttribute("tooltiptext", tooltiptext);
+    },
+
+    /**
+     * Show a desktop notification when 'do not disturb' isn't enabled.
+     *
+     * @param {Object} options Set of options that may tweak the appearance and
+     *                         behavior of the notification.
+     *                         Option params:
+     *                         - {String}   title       Notification title message
+     *                         - {String}   [message]   Notification body text
+     *                         - {String}   [icon]      Notification icon
+     *                         - {String}   [sound]     Sound to play
+     *                         - {String}   [selectTab] Tab to select when the panel
+     *                                                  opens
+     *                         - {Function} [onclick]   Callback to invoke when
+     *                                                  the notification is clicked.
+     *                                                  Opens the panel by default.
+     */
+    showNotification: function(options) {
+      if (this.MozLoopService.doNotDisturb) {
+        return;
+      }
+
+      if (!options.title) {
+        throw new Error("Missing title, can not display notification");
+      }
+
+      let notificationOptions = {
+        body: options.message || ""
+      };
+      if (options.icon) {
+        notificationOptions.icon = options.icon;
+      }
+      if (options.sound) {
+        // This will not do anything, until bug bug 1105222 is resolved.
+        notificationOptions.mozbehavior = {
+          soundFile: ""
+        };
+        this.playSound(options.sound);
+      }
+
+      let notification = new window.Notification(options.title, notificationOptions);
+      notification.addEventListener("click", e => {
+        if (window.closed) {
+          return;
+        }
+
+        try {
+          window.focus();
+        } catch (ex) {}
+
+        // We need a setTimeout here, otherwise the panel won't show after the
+        // window received focus.
+        window.setTimeout(() => {
+          if (typeof options.onclick == "function") {
+            options.onclick();
+          } else {
+            // Open the Loop panel as a default action.
+            this.openCallPanel(null, options.selectTab || null);
+          }
+        }, 0);
+      });
+    },
+
+    /**
+     * Play a sound in this window IF there's no sound playing yet.
+     *
+     * @param {String} name Name of the sound, like 'ringtone' or 'room-joined'
+     */
+    playSound: function(name) {
+      if (this.ActiveSound || this.MozLoopService.doNotDisturb) {
+        return;
+      }
+
+      this.activeSound = new window.Audio();
+      this.activeSound.src = `chrome://browser/content/loop/shared/sounds/${name}.ogg`;
+      this.activeSound.load();
+      this.activeSound.play();
+
+      this.activeSound.addEventListener("ended", () => this.activeSound = undefined, false);
+    },
+
+    /**
+     * Start listening to selected tab changes and notify any content page that's
+     * listening to 'BrowserSwitch' push messages.
+     *
+     * Push message parameters:
+     * - {Integer} windowId  The new windowId for the browser.
+     */
+    startBrowserSharing: function() {
+      if (!this._listeningToTabSelect) {
+        gBrowser.tabContainer.addEventListener("TabSelect", this);
+        this._listeningToTabSelect = true;
+      }
+
+      this._maybeShowBrowserSharingInfoBar();
+
+      // Get the first window Id for the listener.
+      this.LoopAPI.broadcastPushMessage("BrowserSwitch",
+        gBrowser.selectedBrowser.outerWindowID);
+    },
+
+    /**
+     * Stop listening to selected tab changes.
+     */
+    stopBrowserSharing: function() {
+      if (!this._listeningToTabSelect) {
+        return;
+      }
+
+      this._hideBrowserSharingInfoBar();
+      gBrowser.tabContainer.removeEventListener("TabSelect", this);
+      this._listeningToTabSelect = false;
+    },
+
+    /**
+     * Helper function to fetch a localized string via the MozLoopService API.
+     * It's currently inconveniently wrapped inside a string of stringified JSON.
+     *
+     * @param  {String} key The element id to get strings for.
+     * @return {String}
+     */
+    _getString: function(key) {
+      let str = this.MozLoopService.getStrings(key);
+      if (str) {
+        str = JSON.parse(str).textContent;
+      }
+      return str;
+    },
+
+    /**
+     * Shows an infobar notification at the top of the browser window that warns
+     * the user that their browser tabs are being broadcasted through the current
+     * conversation.
+     */
+    _maybeShowBrowserSharingInfoBar: function() {
+      this._hideBrowserSharingInfoBar();
+
+      // Don't show the infobar if it's been permanently disabled from the menu.
+      if (!this.MozLoopService.getLoopPref(kPrefBrowserSharingInfoBar)) {
+        return;
+      }
+
+      let box = gBrowser.getNotificationBox();
+      let paused = false;
+      let bar = box.appendNotification(
+        this._getString("infobar_screenshare_browser_message"),
+        kBrowserSharingNotificationId,
+        // Icon is defined in browser theme CSS.
+        null,
+        box.PRIORITY_WARNING_LOW,
+        [{
+          label: this._getString("infobar_button_pause_label"),
+          accessKey: this._getString("infobar_button_pause_accesskey"),
+          isDefault: false,
+          callback: (event, buttonInfo, buttonNode) => {
+            paused = !paused;
+            bar.label = paused ? this._getString("infobar_screenshare_paused_browser_message") :
+              this._getString("infobar_screenshare_browser_message");
+            bar.classList.toggle("paused", paused);
+            buttonNode.label = paused ? this._getString("infobar_button_resume_label") :
+              this._getString("infobar_button_pause_label");
+            buttonNode.accessKey = paused ? this._getString("infobar_button_resume_accesskey") :
+              this._getString("infobar_button_pause_accesskey");
+            return true;
+          }
+        },
+        {
+          label: this._getString("infobar_button_stop_label"),
+          accessKey: this._getString("infobar_button_stop_accesskey"),
+          isDefault: true,
+          callback: () => {
+            this._hideBrowserSharingInfoBar();
+            LoopUI.MozLoopService.hangupAllChatWindows();
+          }
+        }]
+      );
+
+      // Keep showing the notification bar until the user explicitly closes it.
+      bar.persistence = -1;
+    },
+
+    /**
+     * Hides the infobar, permanantly if requested.
+     *
+     * @param {Boolean} permanently Flag that determines if the infobar will never
+     *                              been shown again. Defaults to `false`.
+     * @return {Boolean} |true| if the infobar was hidden here.
+     */
+    _hideBrowserSharingInfoBar: function(permanently = false, browser) {
+      browser = browser || gBrowser.selectedBrowser;
+      let box = gBrowser.getNotificationBox(browser);
+      let notification = box.getNotificationWithValue(kBrowserSharingNotificationId);
+      let removed = false;
+      if (notification) {
+        box.removeNotification(notification);
+        removed = true;
+      }
+
+      if (permanently) {
+        this.MozLoopService.setLoopPref(kPrefBrowserSharingInfoBar, false);
+      }
+
+      return removed;
+    },
+
+    /**
+     * Handles events from gBrowser.
+     */
+    handleEvent: function(event) {
+      // We only should get "select" events.
+      if (event.type != "TabSelect") {
+        return;
+      }
+
+      let wasVisible = false;
+      // Hide the infobar from the previous tab.
+      if (event.detail.previousTab) {
+        wasVisible = this._hideBrowserSharingInfoBar(false,
+          event.detail.previousTab.linkedBrowser);
+      }
+
+      // We've changed the tab, so get the new window id.
+      this.LoopAPI.broadcastPushMessage("BrowserSwitch",
+        gBrowser.selectedBrowser.outerWindowID);
+
+      if (wasVisible) {
+        // If the infobar was visible before, we should show it again after the
+        // switch.
+        this._maybeShowBrowserSharingInfoBar();
+      }
+    },
+
+    /**
+     * Fetch the favicon of the currently selected tab in the format of a data-uri.
+     *
+     * @param  {Function} callback Function to be invoked with an error object as
+     *                             its first argument when an error occurred or
+     *                             a string as second argument when the favicon
+     *                             has been fetched.
+     */
+    getFavicon: function(callback) {
+      let pageURI = gBrowser.selectedTab.linkedBrowser.currentURI.spec;
+      // If the tab page’s url starts with http(s), fetch icon.
+      if (!/^https?:/.test(pageURI)) {
+        callback();
+        return;
+      }
+
+      this.PlacesUtils.promiseFaviconLinkUrl(pageURI).then(uri => {
+        // We XHR the favicon to get a File object, which we can pass to the FileReader
+        // object. The FileReader turns the File object into a data-uri.
+        let xhr = new XMLHttpRequest();
+        xhr.open("get", uri.spec, true);
+        xhr.responseType = "blob";
+        xhr.overrideMimeType("image/x-icon");
+        xhr.onload = () => {
+          if (xhr.status != 200) {
+            callback(new Error("Invalid status code received for favicon XHR: " + xhr.status));
+            return;
+          }
+
+          let reader = new FileReader();
+          reader.onload = reader.onload = () => callback(null, reader.result);
+          reader.onerror = callback;
+          reader.readAsDataURL(xhr.response);
+        };
+        xhr.onerror = callback;
+        xhr.send();
+      }).catch(err => {
+        callback(err || new Error("No favicon found"));
+      });
+    }
+  };
+})();
+
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "hookWindowCloseForPanelClose", "resource://gre/modules/MozSocialAPI.jsm");
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "LoopAPI", "resource:///modules/loop/MozLoopAPI.jsm");
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "LoopRooms", "resource:///modules/loop/LoopRooms.jsm");
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "MozLoopService", "resource:///modules/loop/MozLoopService.jsm");
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "PanelFrame", "resource:///modules/PanelFrame.jsm");
+XPCOMUtils.defineLazyModuleGetter(LoopUI, "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -897,16 +897,21 @@ panelview > .social-panel-frame {
   height: auto;
 }
 
 /* Translation */
 notification[value="translation"] {
   -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar");
 }
 
+/* Loop/ Hello */
+notification[value="loop-sharing-notification"] .close-icon {
+  display: none;
+}
+
 /* Social */
 /* Note the chatbox 'width' values are duplicated in socialchat.xml */
 chatbox {
   -moz-binding: url("chrome://browser/content/socialchat.xml#chatbox");
   transition: height 150ms ease-out, width 150ms ease-out;
   height: 290px;
   width: 300px; /* CHAT_WIDTH_OPEN in socialchat.xml */
 }
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -269,16 +269,17 @@ var gInitialPages = [
 #include browser-ctrlTab.js
 #include browser-customization.js
 #include browser-devedition.js
 #include browser-eme.js
 #include browser-feeds.js
 #include browser-fullScreen.js
 #include browser-fullZoom.js
 #include browser-gestureSupport.js
+#include browser-loop.js
 #include browser-places.js
 #include browser-plugins.js
 #include browser-safebrowsing.js
 #include browser-sidebar.js
 #include browser-social.js
 #include browser-syncui.js
 #include browser-tabview.js
 #include browser-thumbnails.js
@@ -1351,16 +1352,18 @@ var gBrowserInit = {
     // initialize the sync UI
     gSyncUI.init();
     gFxAccounts.init();
 
 #ifdef MOZ_DATA_REPORTING
     gDataNotificationInfoBar.init();
 #endif
 
+    LoopUI.init();
+
     gBrowserThumbnails.init();
 
     // Add Devtools menuitems and listeners
     gDevToolsBrowser.registerBrowserWindow(window);
 
     gMenuButtonBadgeManager.init();
 
     gMenuButtonUpdateBadge.init();
@@ -1532,16 +1535,17 @@ var gBrowserInit = {
       if (Win7Features)
         Win7Features.onCloseWindow();
 
       gPrefService.removeObserver(ctrlTab.prefName, ctrlTab);
       ctrlTab.uninit();
       TabView.uninit();
       SocialUI.uninit();
       gBrowserThumbnails.uninit();
+      LoopUI.uninit();
       FullZoom.destroy();
 
       Services.obs.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
       Services.obs.removeObserver(gXPInstallObserver, "addon-install-disabled");
       Services.obs.removeObserver(gXPInstallObserver, "addon-install-started");
       Services.obs.removeObserver(gXPInstallObserver, "addon-install-blocked");
       Services.obs.removeObserver(gXPInstallObserver, "addon-install-origin-blocked");
       Services.obs.removeObserver(gXPInstallObserver, "addon-install-failed");
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -103,22 +103,22 @@ static RedirEntry kRedirMap[] = {
 #endif
   { "accounts", "chrome://browser/content/aboutaccounts/aboutaccounts.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
   { "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xul",
     nsIAboutModule::ALLOW_SCRIPT },
   {
     "debugging", "chrome://devtools/content/aboutdebugging/aboutdebugging.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
-  { "loopconversation", "chrome://loop/content/panels/conversation.html",
+  { "loopconversation", "chrome://browser/content/loop/conversation.html",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT |
     nsIAboutModule::HIDE_FROM_ABOUTABOUT |
     nsIAboutModule::ENABLE_INDEXED_DB },
-  { "looppanel", "chrome://loop/content/panels/panel.html",
+  { "looppanel", "chrome://browser/content/loop/panel.html",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT |
     nsIAboutModule::HIDE_FROM_ABOUTABOUT |
     nsIAboutModule::ENABLE_INDEXED_DB,
     // Shares an IndexedDB origin with about:loopconversation.
     "loopconversation" },
   { "reader", "chrome://global/content/reader/aboutReader.html",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -946,16 +946,52 @@ const CustomizableWidgets = [
   }, {
     id: "email-link-button",
     tooltiptext: "email-link-button.tooltiptext3",
     onCommand: function(aEvent) {
       let win = aEvent.view;
       win.MailIntegration.sendLinkForBrowser(win.gBrowser.selectedBrowser)
     }
   }, {
+    id: "loop-button",
+    type: "custom",
+    label: "loop-call-button3.label",
+    tooltiptext: "loop-call-button3.tooltiptext2",
+    privateBrowsingTooltiptext: "loop-call-button3-pb.tooltiptext",
+    defaultArea: CustomizableUI.AREA_NAVBAR,
+    introducedInVersion: 4,
+    onBuild: function(aDocument) {
+      // If we're not supposed to see the button, return zip.
+      if (!Services.prefs.getBoolPref("loop.enabled")) {
+        return null;
+      }
+
+      let isWindowPrivate = PrivateBrowsingUtils.isWindowPrivate(aDocument.defaultView);
+
+      let node = aDocument.createElementNS(kNSXUL, "toolbarbutton");
+      node.setAttribute("id", this.id);
+      node.classList.add("toolbarbutton-1");
+      node.classList.add("chromeclass-toolbar-additional");
+      node.classList.add("badged-button");
+      node.setAttribute("label", CustomizableUI.getLocalizedProperty(this, "label"));
+      if (isWindowPrivate)
+        node.setAttribute("disabled", "true");
+      let tooltiptext = isWindowPrivate ?
+        CustomizableUI.getLocalizedProperty(this, "privateBrowsingTooltiptext",
+          [CustomizableUI.getLocalizedProperty(this, "label")]) :
+        CustomizableUI.getLocalizedProperty(this, "tooltiptext");
+      node.setAttribute("tooltiptext", tooltiptext);
+      node.setAttribute("removable", "true");
+      node.addEventListener("command", function(event) {
+        aDocument.defaultView.LoopUI.togglePanel(event);
+      });
+
+      return node;
+    }
+  }, {
     id: "web-apps-button",
     label: "web-apps-button.label",
     tooltiptext: "web-apps-button.tooltiptext",
     onCommand: function(aEvent) {
       let win = aEvent.target &&
                 aEvent.target.ownerDocument &&
                 aEvent.target.ownerDocument.defaultView;
       if (win && typeof win.BrowserOpenApps == "function") {
rename from browser/extensions/loop/.eslintignore
rename to browser/components/loop/.eslintignore
--- a/browser/extensions/loop/.eslintignore
+++ b/browser/components/loop/.eslintignore
@@ -1,34 +1,30 @@
 # This file currently uses a non-standard (and not on a standards track)
 # if statement within catch.
-content/modules/MozLoopWorker.js
+modules/MozLoopWorker.js
 # This file currently uses es7 features eslint issue:
 # https://github.com/eslint/espree/issues/125
-content/modules/MozLoopAPI.jsm
-# Need to fix the configuration for this.
-bootstrap.js
-# Need to drop the preprocessing (bug 1212428)
-content/preferences/prefs.js
+modules/MozLoopAPI.jsm
 # Libs we don't need to check
-content/panels/vendor
-content/shared/vendor
+content/libs
+content/shared/libs
 standalone/content/libs
 standalone/node_modules
 # Libs we don't need to check
 test/shared/vendor
 # Coverage files
 test/coverage
 test/node_modules
 # These are generated react files that we don't need to check
-content/panels/js/conversation.js
-content/panels/js/conversationViews.js
-content/panels/js/panel.js
-content/panels/js/roomViews.js
-content/panels/js/feedbackViews.js
+content/js/conversation.js
+content/js/conversationViews.js
+content/js/panel.js
+content/js/roomViews.js
+content/js/feedbackViews.js
 content/shared/js/textChatView.js
 content/shared/js/linkifiedTextView.js
 content/shared/js/views.js
 standalone/content/js/standaloneRoomViews.js
 standalone/content/js/webapp.js
 ui/ui-showcase.js
 # Don't need to check the built tree
 standalone/dist
rename from browser/extensions/loop/.eslintrc
rename to browser/components/loop/.eslintrc
rename from browser/extensions/loop/.eslintrc-gecko
rename to browser/components/loop/.eslintrc-gecko
--- a/browser/extensions/loop/.eslintrc-gecko
+++ b/browser/components/loop/.eslintrc-gecko
@@ -2,20 +2,19 @@
 // This is applied on top of the basic .eslintrc for gecko specific directories
 // e.g. the modules directory.
 {
   "ecmaFeatures": {
     "arrowFunctions": true,
     "blockBindings": true,
     "destructuring": true,
     "generators": true,
-    "objectLiteralShorthandMethods": true,
     "restParams": true,
     "spread": true,
-    "templateStrings": true,
+    "objectLiteralShorthandMethods": true,
   },
   "globals": {
     // Gecko + Loop Globals.
     "Chat": false,
     "ChromeWorker": false,
     "CommonUtils": false,
     "Components": false,
     "convertToRTCStatsReport": false,
@@ -37,17 +36,16 @@
     "LoopAPI": true,
     "LoopCalls": true,
     "loopCrypto": false,
     "LoopRooms": true,
     "LoopRoomsCache": true,
     "MozLoopPushHandler": true,
     "MozLoopService": true,
     "OS": false,
-    "PrivateBrowsingUtils": false,
     "roomsPushNotification": true,
     "Services": false,
     "Social": false,
     "SocialShare": false,
     "Task": false,
     "UITour": false,
     "WebChannel": false,
     "XPCOMUtils": false,
rename from browser/extensions/loop/.gitignore
rename to browser/components/loop/.gitignore
rename from browser/extensions/loop/README.txt
rename to browser/components/loop/README.txt
--- a/browser/extensions/loop/README.txt
+++ b/browser/components/loop/README.txt
@@ -17,47 +17,47 @@ Working with React JSX files
 
 Our views use [React](http://facebook.github.io/react/) written in JSX files
 and transpiled to JS before we commit. You need to install the JSX compiler
 using npm in order to compile the .jsx files into regular .js ones:
 
     npm install -g react-tools@0.12.2
 
 Once installed, run build-jsx with the --watch option from
-browser/extensions/loop, eg.:
+browser/components/loop, eg.:
 
-    cd browser/extensions/loop
+    cd browser/components/loop
     ./build-jsx --watch
 
 build-jsx can also be do a one-time compile pass instead of watching if
 the --watch argument is omitted.  Be sure to commit any transpiled files
 at the same time as changes to their sources.
 
 
 Hacking
 =======
 Please be sure to execute
 
-  browser/extensions/loop/run-all-loop-tests.sh
+  browser/components/loop/run-all-loop-tests.sh
 
 from the top level before requesting review on a patch.
 
 Linting
 =======
 run-all-loop-tests.sh will take care of this for you automatically, after
 you've installed the dependencies by typing:
 
   ( cd standalone ; make install )
 
 If you install eslint and the react plugin globally:
 
   npm install -g eslint
   npm install -g eslint-plugin-react
 
-You can also run it by hand in the browser/extensions/loop directory:
+You can also run it by hand in the browser/components/loop directory:
 
   eslint --ext .js --ext .jsx --ext .jsm .
 
 Test coverage
 =============
 Initial setup
   cd test
   npm install
@@ -83,17 +83,17 @@ You can run these as part of the run-all
 Functional Tests
 ================
 These are currently a work in progress, but it's already possible to run a test
 if you have a [loop-server](https://github.com/mozilla-services/loop-server)
 install that is properly configured.  From the top-level gecko directory,
 execute:
 
   export LOOP_SERVER=/Users/larry/src/loop-server
-  ./mach marionette-test browser/extensions/loop/test/functional/manifest.ini
+  ./mach marionette-test browser/components/loop/test/functional/manifest.ini
 
 Once the automation is complete, we'll include this in run-all-loop-tests.sh
 as well.
 
 
 UI-Showcase
 ===========
 This is a tool giving the layouts for all the frontend views of Loop, allowing debugging and testing of css layouts and local component behavior.
rename from browser/extensions/loop/build-jsx
rename to browser/components/loop/build-jsx
--- a/browser/extensions/loop/build-jsx
+++ b/browser/components/loop/build-jsx
@@ -69,17 +69,17 @@ def find_react_command():
 
     # This is what node really wants to run.
     jsx_path = os.path.join(jsx_path,
                             "node_modules", "react-tools", "bin", "jsx")
 
     return [node, jsx_path]
 
 
-SHARED_LIBS_DIR=os.path.join(os.path.dirname(__file__), "content", "shared", "vendor")
+SHARED_LIBS_DIR=os.path.join(os.path.dirname(__file__), "content", "shared", "libs")
 REACT_VERSION=find_react_version(SHARED_LIBS_DIR)
 
 src_files = []  # files to be compiled
 
 run_command = find_react_command()
 
 if sys.platform == 'win32':
     print 'Please ensure you are running react-tools version %s' % REACT_VERSION
@@ -94,17 +94,17 @@ else:
     if not info == REACT_VERSION:
         print 'You have the wrong version of react-tools installed'
         print 'Please use version %s' % REACT_VERSION
         exit(1)
 
 # parse the CLI arguments
 description = 'Loop build tool for JSX files. ' + \
               'Will scan entire loop directory and compile them in place. ' + \
-              'Must be executed from browser/extensions/loop directory.'
+              'Must be executed from browser/components/loop directory.'
 
 parser = argparse.ArgumentParser(description=description)
 parser.add_argument('--watch', '-w', action='store_true', help='continuous' +
                     'build based on file changes (optional)')
 args = parser.parse_args()
 
 # loop through all tuples and get unique dirs only
 unique_jsx_dirs = []
rename from browser/extensions/loop/content/panels/conversation.html
rename to browser/components/loop/content/conversation.html
--- a/browser/extensions/loop/content/panels/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -2,48 +2,47 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
   <head>
     <meta charset="utf-8">
     <!-- Title is set in conversation.js -->
     <title></title>
-    <base href="chrome://loop/content">
-    <link rel="stylesheet" type="text/css" href="shared/css/reset.css">
-    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
-    <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/reset.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/conversation.css">
  </head>
   <body class="fx-embedded">
 
     <div id="messages"></div>
 
     <div id="main"></div>
 
-    <script type="text/javascript" src="panels/vendor/l10n.js"></script>
-    <script type="text/javascript" src="panels/js/otconfig.js"></script>
-    <script type="text/javascript" src="shared/vendor/sdk.js"></script>
-    <script type="text/javascript" src="shared/vendor/react-0.13.3.js"></script>
-    <script type="text/javascript" src="shared/vendor/lodash-3.9.3.js"></script>
-    <script type="text/javascript" src="shared/vendor/backbone-1.2.1.js"></script>
-    <script type="text/javascript" src="shared/vendor/classnames-2.2.0.js"></script>
+    <script type="text/javascript" src="loop/libs/l10n.js"></script>
+    <script type="text/javascript" src="loop/js/otconfig.js"></script>
+    <script type="text/javascript" src="loop/libs/sdk.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/react-0.13.3.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/lodash-3.9.3.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/backbone-1.2.1.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/classnames-2.2.0.js"></script>
 
-    <script type="text/javascript" src="shared/js/loopapi-client.js"></script>
-    <script type="text/javascript" src="shared/js/utils.js"></script>
-    <script type="text/javascript" src="shared/js/mixins.js"></script>
-    <script type="text/javascript" src="shared/js/actions.js"></script>
-    <script type="text/javascript" src="shared/js/validate.js"></script>
-    <script type="text/javascript" src="shared/js/dispatcher.js"></script>
-    <script type="text/javascript" src="shared/js/otSdkDriver.js"></script>
-    <script type="text/javascript" src="shared/js/store.js"></script>
-    <script type="text/javascript" src="shared/js/activeRoomStore.js"></script>
-    <script type="text/javascript" src="shared/js/views.js"></script>
-    <script type="text/javascript" src="shared/js/textChatStore.js"></script>
-    <script type="text/javascript" src="shared/js/textChatView.js"></script>
-    <script type="text/javascript" src="shared/js/linkifiedTextView.js"></script>
-    <script type="text/javascript" src="shared/js/urlRegExps.js"></script>
-    <script type="text/javascript" src="panels/js/conversationAppStore.js"></script>
-    <script type="text/javascript" src="panels/js/feedbackViews.js"></script>
-    <script type="text/javascript" src="panels/js/roomStore.js"></script>
-    <script type="text/javascript" src="panels/js/roomViews.js"></script>
-    <script type="text/javascript" src="panels/js/conversation.js"></script>
+    <script type="text/javascript" src="loop/shared/js/loopapi-client.js"></script>
+    <script type="text/javascript" src="loop/shared/js/utils.js"></script>
+    <script type="text/javascript" src="loop/shared/js/mixins.js"></script>
+    <script type="text/javascript" src="loop/shared/js/actions.js"></script>
+    <script type="text/javascript" src="loop/shared/js/validate.js"></script>
+    <script type="text/javascript" src="loop/shared/js/dispatcher.js"></script>
+    <script type="text/javascript" src="loop/shared/js/otSdkDriver.js"></script>
+    <script type="text/javascript" src="loop/shared/js/store.js"></script>
+    <script type="text/javascript" src="loop/shared/js/activeRoomStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/views.js"></script>
+    <script type="text/javascript" src="loop/js/feedbackViews.js"></script>
+    <script type="text/javascript" src="loop/shared/js/textChatStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/textChatView.js"></script>
+    <script type="text/javascript" src="loop/shared/js/linkifiedTextView.js"></script>
+    <script type="text/javascript" src="loop/shared/js/urlRegExps.js"></script>
+    <script type="text/javascript" src="loop/js/conversationAppStore.js"></script>
+    <script type="text/javascript" src="loop/js/roomStore.js"></script>
+    <script type="text/javascript" src="loop/js/roomViews.js"></script>
+    <script type="text/javascript" src="loop/js/conversation.js"></script>
   </body>
 </html>
rename from browser/extensions/loop/content/panels/css/panel.css
rename to browser/components/loop/content/css/panel.css
--- a/browser/extensions/loop/content/panels/css/panel.css
+++ b/browser/components/loop/content/css/panel.css
@@ -7,17 +7,17 @@ html {
 }
 
 body {
   background: none;
 }
 
 /* Beta Ribbon */
 .beta-ribbon {
-  background: url("../../shared/img/beta-ribbon.svg") no-repeat;
+  background: url("../shared/img/beta-ribbon.svg") no-repeat;
   background-size: 30px;
   width: 30px;
   height: 30px;
 }
 
 /* Panel styles */
 
 .panel {
@@ -153,17 +153,17 @@ body {
   text-align: center;
   color: #4a4a4a;
   font-weight: lighter;
   position: relative;
   top: 50%;
   transform: translateY(-50%);
   padding-top: 11rem;
   padding-bottom: 1rem;
-  background-image: url("../../shared/img/empty_conversations.svg");
+  background-image: url("../shared/img/empty_conversations.svg");
   background-repeat: no-repeat;
   background-position: top center;
 }
 
 .panel-text-medium,
 .panel-text-large {
   margin: 3px 0;
 }
@@ -319,31 +319,31 @@ body {
 }
 
 .room-list > .room-entry:hover > h2 > button {
   animation: drop-and-fade-in 0.250s;
   animation-fill-mode: forwards;
 }
 
 .room-list > .room-entry:hover > h2 > .copy-link {
-  background-image: url(../../shared/img/icons-16x16.svg#copy);
+  background-image: url(../shared/img/icons-16x16.svg#copy);
 }
 
 .room-list > .room-entry:hover > h2 > .delete-link {
-  background-image: url(../../shared/img/icons-16x16.svg#trash);
+  background-image: url(../shared/img/icons-16x16.svg#trash);
 }
 
 /* scale this up to 1.1x and then back to the original size */
 @keyframes pulse {
   0%, 100% { transform: scale(1.0); }
   50%      { transform: scale(1.1); }
 }
 
 .room-list > .room-entry > h2 > .copy-link.checked {
-  background: transparent url(../../shared/img/icons-16x16.svg#checkmark);
+  background: transparent url(../shared/img/icons-16x16.svg#checkmark);
   animation: pulse .150s;
   animation-timing-function: ease-in-out;
   top: 0;
 }
 
 /* keep the various room-entry row pieces aligned with each other */
 .room-list > .room-entry > h2 > button,
 .room-list > .room-entry > h2 > span {
@@ -357,17 +357,17 @@ body {
 }
 
 .room-entry:hover .room-entry-context-actions {
   display: inline-block;
 }
 
 /* Room entry edit button */
 .room-entry-context-edit-btn {
-  background-image: url("../../shared/img/icons-10x10.svg#edit-darkgrey");
+  background-image: url("../shared/img/icons-10x10.svg#edit-darkgrey");
   background-position: center;
   background-repeat: no-repeat;
   background-size: 12px;
   cursor: pointer;
   display: inline-block;
   height: 24px;
   vertical-align: middle;
   width: 16px;
@@ -394,17 +394,17 @@ html[dir="rtl"] .room-entry-context-acti
 
 .room-entry-context-item > img,
 .room-entry-context-item > a > img {
   width: 16px;
 }
 
 .button-close {
   background-color: transparent;
-  background-image: url(../../shared/img/icons-10x10.svg#close);
+  background-image: url(../shared/img/icons-10x10.svg#close);
   background-repeat: no-repeat;
   background-size: 8px 8px;
   border: none;
   padding: 0;
   height: 8px;
   width: 8px;
 }
 
@@ -423,26 +423,26 @@ html[dir="rtl"] .room-entry-context-acti
 .spinner {
   width: 16px;
   height: 16px;
   background-repeat: no-repeat;
   background-size: 16px 16px;
 }
 
 .spinner.busy {
-  background-image: url(../../shared/img/spinner.png);
+  background-image: url(../shared/img/spinner.png);
   animation-name: spinnerRotate;
   animation-duration: 1s;
   animation-timing-function: linear;
   animation-iteration-count: infinite;
 }
 
 @media (min-resolution: 2dppx) {
   .spinner.busy {
-    background-image: url(../../shared/img/spinner@2x.png);
+    background-image: url(../shared/img/spinner@2x.png);
   }
 }
 
 /* Share tab */
 
 .generate-url-stack {
   margin: 14px 0;
   position: relative;
@@ -497,60 +497,60 @@ html[dir="rtl"] .generate-url-spinner {
   margin-top: 0;
 }
 
 #powered-by-logo {
   display: inline-block;
   margin-left: 10px;
   margin-right: 10px;
   vertical-align: middle;
-  background-image: url("../../shared/img/telefonica.png");
+  background-image: url("../shared/img/telefonica.png");
   background-size: 72px 20px;
   width: 72px;
   height: 20px;
 }
 
 #powered-by-logo.en-GB,
 #powered-by-logo.de {
-  background-image: url("../../shared/img/02.png");
+  background-image: url("../shared/img/02.png");
   background-size: 21px 20px;
   width: 21px;
   height: 20px;
 }
 
 #powered-by-logo.pt-BR {
-  background-image: url("../../shared/img/vivo.png");
+  background-image: url("../shared/img/vivo.png");
   background-size: 53px 26px;
   width: 53px;
   height: 26px;
 }
 
 #powered-by-logo[class^="es-"] {
-  background-image: url("../../shared/img/movistar.png");
+  background-image: url("../shared/img/movistar.png");
   background-size: 92px 20px;
   width: 92px;
   height: 20px;
 }
 
 @media (min-resolution: 2dppx) {
   #powered-by-logo {
-    background-image: url("../../shared/img/telefonica@2x.png");
+    background-image: url("../shared/img/telefonica@2x.png");
   }
 
   #powered-by-logo.en-GB,
   #powered-by-logo.de {
-    background-image: url("../../shared/img/02@2x.png");
+    background-image: url("../shared/img/02@2x.png");
   }
 
   #powered-by-logo.pt-BR {
-    background-image: url("../../shared/img/vivo@2x.png");
+    background-image: url("../shared/img/vivo@2x.png");
   }
 
   #powered-by-logo[class^="es-"] {
-    background-image: url("../../shared/img/movistar@2x.png");
+    background-image: url("../shared/img/movistar@2x.png");
   }
 }
 
 .terms-service {
   padding-left: 5rem;
   padding-right: 5rem;
   padding-bottom: 1rem;
   text-align: center;
@@ -589,17 +589,17 @@ html[dir="rtl"] .generate-url-spinner {
 .button-settings {
   width: 10px;
   height: 10px;
   margin: 0;
   padding: 0;
   border: none;
   cursor: pointer;
   vertical-align: middle;
-  background: transparent url("../../shared/img/icons-10x10.svg#settings-cog");
+  background: transparent url("../shared/img/icons-10x10.svg#settings-cog");
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
   -moz-margin-start: .5em;
 }
 
 .user-details .dropdown-menu {
   bottom: 1.3rem; /* Just above the text. */
rename from browser/extensions/loop/content/panels/js/.eslintrc
rename to browser/components/loop/content/js/.eslintrc
rename from browser/extensions/loop/content/panels/js/conversation.js
rename to browser/components/loop/content/js/conversation.js
rename from browser/extensions/loop/content/panels/js/conversation.jsx
rename to browser/components/loop/content/js/conversation.jsx
rename from browser/extensions/loop/content/panels/js/conversationAppStore.js
rename to browser/components/loop/content/js/conversationAppStore.js
rename from browser/extensions/loop/content/panels/js/feedbackViews.js
rename to browser/components/loop/content/js/feedbackViews.js
rename from browser/extensions/loop/content/panels/js/feedbackViews.jsx
rename to browser/components/loop/content/js/feedbackViews.jsx
rename from browser/extensions/loop/content/panels/js/otconfig.js
rename to browser/components/loop/content/js/otconfig.js
rename from browser/extensions/loop/content/panels/js/panel.js
rename to browser/components/loop/content/js/panel.js
--- a/browser/extensions/loop/content/panels/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -24,17 +24,17 @@ loop.panel = (function(_, mozL10n) {
       window.dispatchEvent(event);
       this.closeWindow();
     },
 
     render: function() {
       return (
         React.createElement("div", {className: "fte-get-started-content"}, 
           React.createElement("header", {className: "fte-title"}, 
-            React.createElement("img", {src: "shared/img/hello_logo.svg"}), 
+            React.createElement("img", {src: "loop/shared/img/hello_logo.svg"}), 
             React.createElement("div", {className: "fte-subheader"}, 
               mozL10n.get("first_time_experience_subheading")
             )
           ), 
           React.createElement(Button, {additionalClass: "fte-get-started-button", 
                   caption: mozL10n.get("first_time_experience_button_label"), 
                   htmlId: "fte-button", 
                   onClick: this.handleButtonClick})
@@ -374,28 +374,28 @@ loop.panel = (function(_, mozL10n) {
         loop.request("OpenURL", event.currentTarget.href);
         this.closeWindow();
       }
     },
 
     _renderDefaultIcon: function() {
       return (
         React.createElement("div", {className: "room-entry-context-item"}, 
-          React.createElement("img", {src: "shared/img/icons-16x16.svg#globe"})
+          React.createElement("img", {src: "loop/shared/img/icons-16x16.svg#globe"})
         )
       );
     },
 
     _renderIcon: function(roomUrl) {
       return (
         React.createElement("div", {className: "room-entry-context-item"}, 
           React.createElement("a", {href: roomUrl.location, 
             onClick: this.handleClick, 
             title: roomUrl.description}, 
-            React.createElement("img", {src: roomUrl.thumbnail || "shared/img/icons-16x16.svg#globe"})
+            React.createElement("img", {src: roomUrl.thumbnail || "loop/shared/img/icons-16x16.svg#globe"})
           )
         )
       );
     },
 
     render: function() {
       var roomUrl = this.props.roomUrls && this.props.roomUrls[0];
       if (roomUrl && roomUrl.location) {
@@ -712,17 +712,17 @@ loop.panel = (function(_, mozL10n) {
      * Let the user know we're loading rooms
      * @returns {Object} React render
      */
     _renderLoadingRoomsView: function() {
       return (
         React.createElement("div", {className: "room-list"}, 
           this._renderNewRoomButton(), 
           React.createElement("div", {className: "room-list-loading"}, 
-            React.createElement("img", {src: "shared/img/animated-spinner.svg"})
+            React.createElement("img", {src: "loop/shared/img/animated-spinner.svg"})
           )
         )
       );
     },
 
     _renderNoRoomsView: function() {
       return (
         React.createElement("div", {className: "rooms"}, 
@@ -879,17 +879,17 @@ loop.panel = (function(_, mozL10n) {
     propTypes: {
       onClick: React.PropTypes.func.isRequired
     },
 
     render: function() {
       return (
         React.createElement("div", {className: "error-content"}, 
           React.createElement("header", {className: "error-title"}, 
-            React.createElement("img", {src: "shared/img/sad_hello_icon_64x64.svg"}), 
+            React.createElement("img", {src: "loop/shared/img/sad_hello_icon_64x64.svg"}), 
             React.createElement("p", {className: "error-subheader"}, 
               mozL10n.get("e10s_not_supported_subheading", {
                 brandShortname: mozL10n.get("clientShortname2")
               })
             )
           ), 
           React.createElement(Button, {additionalClass: "e10s-not-supported-button", 
                   caption: mozL10n.get("e10s_not_supported_button_label"), 
rename from browser/extensions/loop/content/panels/js/panel.jsx
rename to browser/components/loop/content/js/panel.jsx
--- a/browser/extensions/loop/content/panels/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -24,17 +24,17 @@ loop.panel = (function(_, mozL10n) {
       window.dispatchEvent(event);
       this.closeWindow();
     },
 
     render: function() {
       return (
         <div className="fte-get-started-content">
           <header className="fte-title">
-            <img src="shared/img/hello_logo.svg" />
+            <img src="loop/shared/img/hello_logo.svg" />
             <div className="fte-subheader">
               {mozL10n.get("first_time_experience_subheading")}
             </div>
           </header>
           <Button additionalClass="fte-get-started-button"
                   caption={mozL10n.get("first_time_experience_button_label")}
                   htmlId="fte-button"
                   onClick={this.handleButtonClick} />
@@ -374,28 +374,28 @@ loop.panel = (function(_, mozL10n) {
         loop.request("OpenURL", event.currentTarget.href);
         this.closeWindow();
       }
     },
 
     _renderDefaultIcon: function() {
       return (
         <div className="room-entry-context-item">
-          <img src="shared/img/icons-16x16.svg#globe" />
+          <img src="loop/shared/img/icons-16x16.svg#globe" />
         </div>
       );
     },
 
     _renderIcon: function(roomUrl) {
       return (
         <div className="room-entry-context-item">
           <a href={roomUrl.location}
             onClick={this.handleClick}
             title={roomUrl.description}>
-            <img src={roomUrl.thumbnail || "shared/img/icons-16x16.svg#globe"} />
+            <img src={roomUrl.thumbnail || "loop/shared/img/icons-16x16.svg#globe"} />
           </a>
         </div>
       );
     },
 
     render: function() {
       var roomUrl = this.props.roomUrls && this.props.roomUrls[0];
       if (roomUrl && roomUrl.location) {
@@ -712,17 +712,17 @@ loop.panel = (function(_, mozL10n) {
      * Let the user know we're loading rooms
      * @returns {Object} React render
      */
     _renderLoadingRoomsView: function() {
       return (
         <div className="room-list">
           {this._renderNewRoomButton()}
           <div className="room-list-loading">
-            <img src="shared/img/animated-spinner.svg" />
+            <img src="loop/shared/img/animated-spinner.svg" />
           </div>
         </div>
       );
     },
 
     _renderNoRoomsView: function() {
       return (
         <div className="rooms">
@@ -879,17 +879,17 @@ loop.panel = (function(_, mozL10n) {
     propTypes: {
       onClick: React.PropTypes.func.isRequired
     },
 
     render: function() {
       return (
         <div className="error-content">
           <header className="error-title">
-            <img src="shared/img/sad_hello_icon_64x64.svg" />
+            <img src="loop/shared/img/sad_hello_icon_64x64.svg" />
             <p className="error-subheader">
               {mozL10n.get("e10s_not_supported_subheading", {
                 brandShortname: mozL10n.get("clientShortname2")
               })}
             </p>
           </header>
           <Button additionalClass="e10s-not-supported-button"
                   caption={mozL10n.get("e10s_not_supported_button_label")}
rename from browser/extensions/loop/content/panels/js/roomStore.js
rename to browser/components/loop/content/js/roomStore.js
rename from browser/extensions/loop/content/panels/js/roomViews.js
rename to browser/components/loop/content/js/roomViews.js
--- a/browser/extensions/loop/content/panels/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -341,24 +341,24 @@ loop.roomViews = (function(mozL10n) {
             hide: this.props.showEditContext
           })}, 
             React.createElement("div", {className: cx({
                 "btn-copy": true,
                 "invite-button": true,
                 "triggered": this.state.copiedUrl
               }), 
               onClick: this.handleCopyButtonClick}, 
-              React.createElement("img", {src: "shared/img/glyph-link-16x16.svg"}), 
+              React.createElement("img", {src: "loop/shared/img/svg/glyph-link-16x16.svg"}), 
               React.createElement("p", null, mozL10n.get(this.state.copiedUrl ?
                 "invite_copied_link_button" : "invite_copy_link_button"))
             ), 
             React.createElement("div", {className: "btn-email invite-button", 
               onClick: this.handleEmailButtonClick, 
               onMouseOver: this.resetTriggeredButtons}, 
-              React.createElement("img", {src: "shared/img/glyph-email-16x16.svg"}), 
+              React.createElement("img", {src: "loop/shared/img/svg/glyph-email-16x16.svg"}), 
               React.createElement("p", null, mozL10n.get("invite_email_link_button"))
             )
           ), 
           React.createElement(SocialShareDropdown, {
             dispatcher: this.props.dispatcher, 
             ref: "menu", 
             roomUrl: this.props.roomData.roomUrl, 
             show: this.state.showMenu, 
@@ -531,17 +531,17 @@ loop.roomViews = (function(mozL10n) {
     },
 
     render: function() {
       if (!this.state.show) {
         return null;
       }
 
       var url = this._getURL();
-      var thumbnail = url && url.thumbnail || "shared/img/icons-16x16.svg#globe";
+      var thumbnail = url && url.thumbnail || "loop/shared/img/icons-16x16.svg#globe";
       var urlDescription = url && url.description || "";
       var location = url && url.location || "";
 
       var cx = classNames;
       var availableContext = this.state.availableContext;
       return (
         React.createElement("div", {className: "room-context"}, 
           React.createElement("p", {className: cx({ "error": !!this.props.error,
rename from browser/extensions/loop/content/panels/js/roomViews.jsx
rename to browser/components/loop/content/js/roomViews.jsx
--- a/browser/extensions/loop/content/panels/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -341,24 +341,24 @@ loop.roomViews = (function(mozL10n) {
             hide: this.props.showEditContext
           })}>
             <div className={cx({
                 "btn-copy": true,
                 "invite-button": true,
                 "triggered": this.state.copiedUrl
               })}
               onClick={this.handleCopyButtonClick}>
-              <img src="shared/img/glyph-link-16x16.svg" />
+              <img src="loop/shared/img/svg/glyph-link-16x16.svg" />
               <p>{mozL10n.get(this.state.copiedUrl ?
                 "invite_copied_link_button" : "invite_copy_link_button")}</p>
             </div>
             <div className="btn-email invite-button"
               onClick={this.handleEmailButtonClick}
               onMouseOver={this.resetTriggeredButtons}>
-              <img src="shared/img/glyph-email-16x16.svg" />
+              <img src="loop/shared/img/svg/glyph-email-16x16.svg" />
               <p>{mozL10n.get("invite_email_link_button")}</p>
             </div>
           </div>
           <SocialShareDropdown
             dispatcher={this.props.dispatcher}
             ref="menu"
             roomUrl={this.props.roomData.roomUrl}
             show={this.state.showMenu}
@@ -531,17 +531,17 @@ loop.roomViews = (function(mozL10n) {
     },
 
     render: function() {
       if (!this.state.show) {
         return null;
       }
 
       var url = this._getURL();
-      var thumbnail = url && url.thumbnail || "shared/img/icons-16x16.svg#globe";
+      var thumbnail = url && url.thumbnail || "loop/shared/img/icons-16x16.svg#globe";
       var urlDescription = url && url.description || "";
       var location = url && url.location || "";
 
       var cx = classNames;
       var availableContext = this.state.availableContext;
       return (
         <div className="room-context">
           <p className={cx({ "error": !!this.props.error,
rename from browser/extensions/loop/content/panels/vendor/l10n.js
rename to browser/components/loop/content/libs/l10n.js
rename from browser/extensions/loop/content/panels/panel.html
rename to browser/components/loop/content/panel.html
--- a/browser/extensions/loop/content/panels/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -1,36 +1,35 @@
 <!DOCTYPE html>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <html>
   <head>
     <meta charset="utf-8">
-    <base href="chrome://loop/content">
-    <link rel="stylesheet" type="text/css" href="shared/css/reset.css">
-    <link rel="stylesheet" type="text/css" href="shared/css/common.css">
-    <link rel="stylesheet" type="text/css" href="panels/css/panel.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/reset.css">
+    <link rel="stylesheet" type="text/css" href="loop/shared/css/common.css">
+    <link rel="stylesheet" type="text/css" href="loop/css/panel.css">
   </head>
   <body class="panel">
 
     <div id="main"></div>
 
-    <script type="text/javascript" src="panels/vendor/l10n.js"></script>
-    <script type="text/javascript" src="shared/vendor/react-0.13.3.js"></script>
-    <script type="text/javascript" src="shared/vendor/lodash-3.9.3.js"></script>
-    <script type="text/javascript" src="shared/vendor/backbone-1.2.1.js"></script>
-    <script type="text/javascript" src="shared/vendor/classnames-2.2.0.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/react-0.13.3.js"></script>
+    <script type="text/javascript" src="loop/libs/l10n.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/lodash-3.9.3.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/backbone-1.2.1.js"></script>
+    <script type="text/javascript" src="loop/shared/libs/classnames-2.2.0.js"></script>
 
-    <script type="text/javascript" src="shared/js/loopapi-client.js"></script>
-    <script type="text/javascript" src="shared/js/utils.js"></script>
-    <script type="text/javascript" src="shared/js/models.js"></script>
-    <script type="text/javascript" src="shared/js/mixins.js"></script>
-    <script type="text/javascript" src="shared/js/views.js"></script>
-    <script type="text/javascript" src="shared/js/validate.js"></script>
-    <script type="text/javascript" src="shared/js/actions.js"></script>
-    <script type="text/javascript" src="shared/js/dispatcher.js"></script>
-    <script type="text/javascript" src="shared/js/store.js"></script>
-    <script type="text/javascript" src="shared/js/activeRoomStore.js"></script>
-    <script type="text/javascript" src="panels/js/roomStore.js"></script>
-    <script type="text/javascript" src="panels/js/panel.js"></script>
+    <script type="text/javascript" src="loop/shared/js/loopapi-client.js"></script>
+    <script type="text/javascript" src="loop/shared/js/utils.js"></script>
+    <script type="text/javascript" src="loop/shared/js/models.js"></script>
+    <script type="text/javascript" src="loop/shared/js/mixins.js"></script>
+    <script type="text/javascript" src="loop/shared/js/views.js"></script>
+    <script type="text/javascript" src="loop/shared/js/validate.js"></script>
+    <script type="text/javascript" src="loop/shared/js/actions.js"></script>
+    <script type="text/javascript" src="loop/shared/js/dispatcher.js"></script>
+    <script type="text/javascript" src="loop/shared/js/store.js"></script>
+    <script type="text/javascript" src="loop/shared/js/activeRoomStore.js"></script>
+    <script type="text/javascript" src="loop/js/roomStore.js"></script>
+    <script type="text/javascript" src="loop/js/panel.js"></script>
  </body>
 </html>
rename from browser/extensions/loop/content/shared/README.md
rename to browser/components/loop/content/shared/README.md
rename from browser/extensions/loop/content/shared/css/common.css
rename to browser/components/loop/content/shared/css/common.css
rename from browser/extensions/loop/content/shared/css/conversation.css
rename to browser/components/loop/content/shared/css/conversation.css
--- a/browser/extensions/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -60,127 +60,127 @@ html[dir="rtl"] .conversation-toolbar > 
      extra gap which appears to push the toolbar in further than necessary */
   width: 28px;
 }
 
 .conversation-toolbar-media-btn-group-box {
   background-position: center;
   background-repeat: no-repeat;
   background-color: transparent;
-  background-image: url("../img/media-group.svg");
+  background-image: url("../img/svg/media-group.svg");
   background-size: cover;
   height: 28px;
   width: 67px;
 }
 
 .conversation-toolbar-media-btn-group-box > button:last-child:active,
 .conversation-toolbar-media-btn-group-box > button:last-child:hover {
-  background-image: url("../img/media-group-right-hover.svg");
+  background-image: url("../img/svg/media-group-right-hover.svg");
   background-size: cover;
 }
 
 html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:last-child:active,
 html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:last-child:hover {
-  background-image: url("../img/media-group-left-hover.svg");
+  background-image: url("../img/svg/media-group-left-hover.svg");
   background-size: cover;
 }
 
 .conversation-toolbar-media-btn-group-box > button:first-child:active,
 .conversation-toolbar-media-btn-group-box > button:first-child:hover {
-  background-image: url("../img/media-group-left-hover.svg");
+  background-image: url("../img/svg/media-group-left-hover.svg");
   background-size: cover;
 }
 
 html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:first-child:active,
 html[dir="rtl"] .conversation-toolbar-media-btn-group-box > button:first-child:hover {
-  background-image: url("../img/media-group-right-hover.svg");
+  background-image: url("../img/svg/media-group-right-hover.svg");
   background-size: cover;
 }
 
 .conversation-toolbar-btn-box.btn-edit-entry {
   float: right;
 }
 
 html[dir="rtl"] .conversation-toolbar-btn-box.btn-edit-entry {
   float: left;
 }
 
 /* conversationViews.jsx */
 
 .conversation-toolbar .btn-hangup {
-  background-image: url("../img/exit.svg");
+  background-image: url("../img/svg/exit.svg");
   border: 0;
 }
 
 /* Audio mute button */
 .btn-mute-audio:after {
-  content: url("../img/audio.svg");
+  content: url("../img/svg/audio.svg");
 }
 
 .btn-mute-audio.muted:after {
-  content: url("../img/audio-mute.svg");
+  content: url("../img/svg/audio-mute.svg");
 }
 .btn-mute-audio:hover:after,
 .btn-mute-audio:active:after {
-  content: url("../img/audio-hover.svg");
+  content: url("../img/svg/audio-hover.svg");
 }
 
 .btn-mute-audio.muted:hover:after,
 .btn-mute-audio.muted:active:after {
-  content: url("../img/audio-mute-hover.svg");
+  content: url("../img/svg/audio-mute-hover.svg");
 }
 
 /* Video mute button */
 .btn-mute-video:after {
-  content: url("../img/video.svg");
+  content: url("../img/svg/video.svg");
 }
 
 .btn-mute-video:active:after,
 .btn-mute-video:hover:after {
-  content: url("../img/video-hover.svg");
+  content: url("../img/svg/video-hover.svg");
 }
 
 .btn-mute-video.muted:after {
-  content: url("../img/video-mute.svg");
+  content: url("../img/svg/video-mute.svg");
 }
 
 .btn-mute-video.muted:hover:after,
 .btn-mute-video.muted:active:after {
-  content: url("../img/video-mute-hover.svg");
+  content: url("../img/svg/video-mute-hover.svg");
 }
 
 .btn-settings {
   width: 28px;
   height: 28px;
   background-size: 28px;
-  background-image: url("../img/settings.svg");
+  background-image: url("../img/svg/settings.svg");
   background-color: transparent;
 }
 
 .btn-settings:hover,
 .btn-settings:active {
-  background-image: url("../img/settings-hover.svg");
+  background-image: url("../img/svg/settings-hover.svg");
 }
 
 .btn-screen-share {
-  background-image: url("../img/sharing.svg");
+  background-image: url("../img/svg/sharing.svg");
 }
 
 .btn-screen-share:hover,
 .btn-screen-share:active {
-  background-image: url("../img/sharing-hover.svg");
+  background-image: url("../img/svg/sharing-hover.svg");
 }
 
 .btn-screen-share.active {
-  background-image: url("../img/sharing-active.svg");
+  background-image: url("../img/svg/sharing-active.svg");
 }
 
 .btn-screen-share.disabled {
   /* The screen share button is in its pending state when its disabled. */
-  background-image: url("../img/sharing-pending.svg");
+  background-image: url("../img/svg/sharing-pending.svg");
 }
 
 /* General Call (incoming or outgoing). */
 
 .call-action-group {
   display: flex;
   padding: 0 4px;
   width: 100%;
rename from browser/extensions/loop/content/shared/css/reset.css
rename to browser/components/loop/content/shared/css/reset.css
rename from browser/extensions/loop/content/shared/img/02.png
rename to browser/components/loop/content/shared/img/02.png
rename from browser/extensions/loop/content/shared/img/02@2x.png
rename to browser/components/loop/content/shared/img/02@2x.png
rename from browser/extensions/loop/content/shared/img/animated-spinner.svg
rename to browser/components/loop/content/shared/img/animated-spinner.svg
rename from browser/extensions/loop/content/shared/img/audio-call-avatar.svg
rename to browser/components/loop/content/shared/img/audio-call-avatar.svg
rename from browser/extensions/loop/content/shared/img/audio-default-16x16@1.5x.png
rename to browser/components/loop/content/shared/img/audio-default-16x16@1.5x.png
rename from browser/extensions/loop/content/shared/img/audio-default-16x16@2x.png
rename to browser/components/loop/content/shared/img/audio-default-16x16@2x.png
rename from browser/extensions/loop/content/shared/img/avatars.svg
rename to browser/components/loop/content/shared/img/avatars.svg
rename from browser/extensions/loop/content/shared/img/beta-ribbon.svg
rename to browser/components/loop/content/shared/img/beta-ribbon.svg
rename from browser/extensions/loop/content/shared/img/chatbubble-arrow-left.svg
rename to browser/components/loop/content/shared/img/chatbubble-arrow-left.svg
rename from browser/extensions/loop/content/shared/img/chatbubble-arrow-right.svg
rename to browser/components/loop/content/shared/img/chatbubble-arrow-right.svg
rename from browser/extensions/loop/content/shared/img/check.svg
rename to browser/components/loop/content/shared/img/check.svg
rename from browser/extensions/loop/content/shared/img/ellipsis-v.svg
rename to browser/components/loop/content/shared/img/ellipsis-v.svg
rename from browser/extensions/loop/content/shared/img/empty_conversations.svg
rename to browser/components/loop/content/shared/img/empty_conversations.svg
rename from browser/extensions/loop/content/shared/img/empty_search.svg
rename to browser/components/loop/content/shared/img/empty_search.svg
rename from browser/extensions/loop/content/shared/img/facemute-14x14.png
rename to browser/components/loop/content/shared/img/facemute-14x14.png
rename from browser/extensions/loop/content/shared/img/facemute-14x14@2x.png
rename to browser/components/loop/content/shared/img/facemute-14x14@2x.png
rename from browser/extensions/loop/content/shared/img/firefox-avatar.svg
rename to browser/components/loop/content/shared/img/firefox-avatar.svg
rename from browser/extensions/loop/content/shared/img/firefox-logo.png
rename to browser/components/loop/content/shared/img/firefox-logo.png
rename from browser/extensions/loop/content/shared/img/hangup-inverse-14x14.png
rename to browser/components/loop/content/shared/img/hangup-inverse-14x14.png
rename from browser/extensions/loop/content/shared/img/hangup-inverse-14x14@2x.png
rename to browser/components/loop/content/shared/img/hangup-inverse-14x14@2x.png
rename from browser/extensions/loop/content/shared/img/happy.png
rename to browser/components/loop/content/shared/img/happy.png
rename from browser/extensions/loop/content/shared/img/hello_logo.svg
rename to browser/components/loop/content/shared/img/hello_logo.svg
rename from browser/extensions/loop/content/shared/img/helloicon.svg
rename to browser/components/loop/content/shared/img/helloicon.svg
rename from browser/extensions/loop/content/shared/img/icon_32.png
rename to browser/components/loop/content/shared/img/icon_32.png
rename from browser/extensions/loop/content/shared/img/icon_64.png
rename to browser/components/loop/content/shared/img/icon_64.png
rename from browser/extensions/loop/content/shared/img/icons-10x10.svg
rename to browser/components/loop/content/shared/img/icons-10x10.svg
rename from browser/extensions/loop/content/shared/img/icons-14x14.svg
rename to browser/components/loop/content/shared/img/icons-14x14.svg
rename from browser/extensions/loop/content/shared/img/icons-16x16.svg
rename to browser/components/loop/content/shared/img/icons-16x16.svg
rename from browser/extensions/loop/content/shared/img/movistar.png
rename to browser/components/loop/content/shared/img/movistar.png
rename from browser/extensions/loop/content/shared/img/movistar@2x.png
rename to browser/components/loop/content/shared/img/movistar@2x.png
rename from browser/extensions/loop/content/shared/img/mute-inverse-14x14.png
rename to browser/components/loop/content/shared/img/mute-inverse-14x14.png
rename from browser/extensions/loop/content/shared/img/mute-inverse-14x14@2x.png
rename to browser/components/loop/content/shared/img/mute-inverse-14x14@2x.png
rename from browser/extensions/loop/content/shared/img/pause-12x12.svg
rename to browser/components/loop/content/shared/img/pause-12x12.svg
rename from browser/extensions/loop/content/shared/img/play-12x12.svg
rename to browser/components/loop/content/shared/img/play-12x12.svg
rename from browser/extensions/loop/content/shared/img/sad.png
rename to browser/components/loop/content/shared/img/sad.png
rename from browser/extensions/loop/content/shared/img/sad_hello_icon_64x64.svg
rename to browser/components/loop/content/shared/img/sad_hello_icon_64x64.svg
rename from browser/extensions/loop/content/shared/img/spinner.png
rename to browser/components/loop/content/shared/img/spinner.png
rename from browser/extensions/loop/content/shared/img/spinner.svg
rename to browser/components/loop/content/shared/img/spinner.svg
rename from browser/extensions/loop/content/shared/img/spinner@2x.png
rename to browser/components/loop/content/shared/img/spinner@2x.png
rename from browser/extensions/loop/content/shared/img/stop-12x12.svg
rename to browser/components/loop/content/shared/img/stop-12x12.svg
rename from browser/extensions/loop/content/shared/img/audio-hover.svg
rename to browser/components/loop/content/shared/img/svg/audio-hover.svg
rename from browser/extensions/loop/content/shared/img/audio-mute-hover.svg
rename to browser/components/loop/content/shared/img/svg/audio-mute-hover.svg
rename from browser/extensions/loop/content/shared/img/audio-mute.svg
rename to browser/components/loop/content/shared/img/svg/audio-mute.svg
rename from browser/extensions/loop/content/shared/img/audio.svg
rename to browser/components/loop/content/shared/img/svg/audio.svg
rename from browser/extensions/loop/content/shared/img/cam_audio-no.svg
rename to browser/components/loop/content/shared/img/svg/cam_audio-no.svg
rename from browser/extensions/loop/content/shared/img/cam_audio.svg
rename to browser/components/loop/content/shared/img/svg/cam_audio.svg
rename from browser/extensions/loop/content/shared/img/cam_audio_h.svg
rename to browser/components/loop/content/shared/img/svg/cam_audio_h.svg
rename from browser/extensions/loop/content/shared/img/exit.svg
rename to browser/components/loop/content/shared/img/svg/exit.svg
rename from browser/extensions/loop/content/shared/img/glyph-email-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-email-16x16.svg
rename from browser/extensions/loop/content/shared/img/glyph-facebook-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-facebook-16x16.svg
rename from browser/extensions/loop/content/shared/img/glyph-help-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg
rename from browser/extensions/loop/content/shared/img/glyph-link-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-link-16x16.svg
rename from browser/extensions/loop/content/shared/img/glyph-user-16x16.svg
rename to browser/components/loop/content/shared/img/svg/glyph-user-16x16.svg
rename from browser/extensions/loop/content/shared/img/media-group-left-hover.svg
rename to browser/components/loop/content/shared/img/svg/media-group-left-hover.svg
rename from browser/extensions/loop/content/shared/img/media-group-right-hover.svg
rename to browser/components/loop/content/shared/img/svg/media-group-right-hover.svg
rename from browser/extensions/loop/content/shared/img/media-group.svg
rename to browser/components/loop/content/shared/img/svg/media-group.svg
rename from browser/extensions/loop/content/shared/img/settings-hover.svg
rename to browser/components/loop/content/shared/img/svg/settings-hover.svg
rename from browser/extensions/loop/content/shared/img/settings.svg
rename to browser/components/loop/content/shared/img/svg/settings.svg
rename from browser/extensions/loop/content/shared/img/sharing-active.svg
rename to browser/components/loop/content/shared/img/svg/sharing-active.svg
rename from browser/extensions/loop/content/shared/img/sharing-hover.svg
rename to browser/components/loop/content/shared/img/svg/sharing-hover.svg
rename from browser/extensions/loop/content/shared/img/sharing-pending.svg
rename to browser/components/loop/content/shared/img/svg/sharing-pending.svg
rename from browser/extensions/loop/content/shared/img/sharing.svg
rename to browser/components/loop/content/shared/img/svg/sharing.svg
rename from browser/extensions/loop/content/shared/img/video-hover.svg
rename to browser/components/loop/content/shared/img/svg/video-hover.svg
rename from browser/extensions/loop/content/shared/img/video-mute-hover.svg
rename to browser/components/loop/content/shared/img/svg/video-mute-hover.svg
rename from browser/extensions/loop/content/shared/img/video-mute.svg
rename to browser/components/loop/content/shared/img/svg/video-mute.svg
rename from browser/extensions/loop/content/shared/img/video.svg
rename to browser/components/loop/content/shared/img/svg/video.svg
rename from browser/extensions/loop/content/shared/img/telefonica.png
rename to browser/components/loop/content/shared/img/telefonica.png
rename from browser/extensions/loop/content/shared/img/telefonica@2x.png
rename to browser/components/loop/content/shared/img/telefonica@2x.png
rename from browser/extensions/loop/content/shared/img/vivo.png
rename to browser/components/loop/content/shared/img/vivo.png
rename from browser/extensions/loop/content/shared/img/vivo@2x.png
rename to browser/components/loop/content/shared/img/vivo@2x.png
rename from browser/extensions/loop/content/shared/js/actions.js
rename to browser/components/loop/content/shared/js/actions.js
rename from browser/extensions/loop/content/shared/js/activeRoomStore.js
rename to browser/components/loop/content/shared/js/activeRoomStore.js
rename from browser/extensions/loop/content/shared/js/crypto.js
rename to browser/components/loop/content/shared/js/crypto.js
--- a/browser/extensions/loop/content/shared/js/crypto.js
+++ b/browser/components/loop/content/shared/js/crypto.js
@@ -13,17 +13,17 @@ var inChrome = typeof Components != "und
   var sharedUtils;
   if (inChrome) {
     this.EXPORTED_SYMBOLS = ["LoopCrypto"];
     var Cu = Components.utils;
     Cu.importGlobalProperties(["crypto"]);
     rootObject = {
       crypto: crypto
     };
-    sharedUtils = Cu.import("chrome://loop/content/shared/js/utils.js", {}).utils;
+    sharedUtils = Cu.import("resource:///modules/loop/utils.js", {}).utils;
   } else {
     sharedUtils = this.shared.utils;
   }
 
   var ALGORITHM = "AES-GCM";
   var KEY_LENGTH = 128;
   // We use JSON web key formats for the generated keys.
   // https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
rename from browser/extensions/loop/content/shared/js/dispatcher.js
rename to browser/components/loop/content/shared/js/dispatcher.js
rename from browser/extensions/loop/content/shared/js/linkifiedTextView.js
rename to browser/components/loop/content/shared/js/linkifiedTextView.js
rename from browser/extensions/loop/content/shared/js/linkifiedTextView.jsx
rename to browser/components/loop/content/shared/js/linkifiedTextView.jsx
rename from browser/extensions/loop/content/shared/js/loopapi-client.js
rename to browser/components/loop/content/shared/js/loopapi-client.js
rename from browser/extensions/loop/content/shared/js/mixins.js
rename to browser/components/loop/content/shared/js/mixins.js
rename from browser/extensions/loop/content/shared/js/models.js
rename to browser/components/loop/content/shared/js/models.js
rename from browser/extensions/loop/content/shared/js/otSdkDriver.js
rename to browser/components/loop/content/shared/js/otSdkDriver.js
rename from browser/extensions/loop/content/shared/js/store.js
rename to browser/components/loop/content/shared/js/store.js
rename from browser/extensions/loop/content/shared/js/textChatStore.js
rename to browser/components/loop/content/shared/js/textChatStore.js
rename from browser/extensions/loop/content/shared/js/textChatView.js
rename to browser/components/loop/content/shared/js/textChatView.js
rename from browser/extensions/loop/content/shared/js/textChatView.jsx
rename to browser/components/loop/content/shared/js/textChatView.jsx
rename from browser/extensions/loop/content/shared/js/urlRegExps.js
rename to browser/components/loop/content/shared/js/urlRegExps.js
rename from browser/extensions/loop/content/shared/js/utils.js
rename to browser/components/loop/content/shared/js/utils.js
rename from browser/extensions/loop/content/shared/js/validate.js
rename to browser/components/loop/content/shared/js/validate.js
rename from browser/extensions/loop/content/shared/js/views.js
rename to browser/components/loop/content/shared/js/views.js
--- a/browser/extensions/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -849,17 +849,17 @@ loop.shared.views = (function(_, mozL10n
       } catch (ex) {
         return null;
       }
 
       var thumbnail = this.props.thumbnail;
 
       if (!thumbnail) {
         thumbnail = this.props.useDesktopPaths ?
-          "shared/img/icons-16x16.svg#globe" :
+          "loop/shared/img/icons-16x16.svg#globe" :
           "shared/img/icons-16x16.svg#globe";
       }
 
       var wrapperClasses = classNames({
         "context-wrapper": true,
         "clicks-allowed": this.props.allowClick
       });
 
rename from browser/extensions/loop/content/shared/js/views.jsx
rename to browser/components/loop/content/shared/js/views.jsx
--- a/browser/extensions/loop/content/shared/js/views.jsx
+++ b/browser/components/loop/content/shared/js/views.jsx
@@ -849,17 +849,17 @@ loop.shared.views = (function(_, mozL10n
       } catch (ex) {
         return null;
       }
 
       var thumbnail = this.props.thumbnail;
 
       if (!thumbnail) {
         thumbnail = this.props.useDesktopPaths ?
-          "shared/img/icons-16x16.svg#globe" :
+          "loop/shared/img/icons-16x16.svg#globe" :
           "shared/img/icons-16x16.svg#globe";
       }
 
       var wrapperClasses = classNames({
         "context-wrapper": true,
         "clicks-allowed": this.props.allowClick
       });
 
rename from browser/extensions/loop/content/shared/vendor/backbone-1.2.1.js
rename to browser/components/loop/content/shared/libs/backbone-1.2.1.js
rename from browser/extensions/loop/content/shared/vendor/classnames-2.2.0.js
rename to browser/components/loop/content/shared/libs/classnames-2.2.0.js
rename from browser/extensions/loop/content/shared/vendor/lodash-3.9.3.js
rename to browser/components/loop/content/shared/libs/lodash-3.9.3.js
rename from browser/extensions/loop/content/shared/vendor/react-0.13.3-prod.js
rename to browser/components/loop/content/shared/libs/react-0.13.3-prod.js
rename from browser/extensions/loop/content/shared/vendor/react-0.13.3.js
rename to browser/components/loop/content/shared/libs/react-0.13.3.js
rename from browser/extensions/loop/content/shared/vendor/sdk-content/css/ot.css
rename to browser/components/loop/content/shared/libs/sdk-content/css/ot.css
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-chrome.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-chrome.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-copy-firefox.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-denied-firefox.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-denied-firefox.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-predenied-chrome.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/access-prompt-chrome.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-publisher.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-publisher.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/audioonly-subscriber.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/buttons.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/buttons.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/loader.gif
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/loader.gif
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-off.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-off.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/mic-on.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/mic-on.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-off.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-off.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/images/rtc/speaker-on.png
rename to browser/components/loop/content/shared/libs/sdk-content/images/rtc/speaker-on.png
rename from browser/extensions/loop/content/shared/vendor/sdk-content/js/dynamic_config.min.js
rename to browser/components/loop/content/shared/libs/sdk-content/js/dynamic_config.min.js
rename from browser/extensions/loop/content/shared/vendor/sdk.js
rename to browser/components/loop/content/shared/libs/sdk.js
rename from browser/extensions/loop/content/shared/sounds/connected.ogg
rename to browser/components/loop/content/shared/sounds/connected.ogg
rename from browser/extensions/loop/content/shared/sounds/connecting.ogg
rename to browser/components/loop/content/shared/sounds/connecting.ogg
rename from browser/extensions/loop/content/shared/sounds/failure.ogg
rename to browser/components/loop/content/shared/sounds/failure.ogg
rename from browser/extensions/loop/content/shared/sounds/message.ogg
rename to browser/components/loop/content/shared/sounds/message.ogg
rename from browser/extensions/loop/content/shared/sounds/ringtone.ogg
rename to browser/components/loop/content/shared/sounds/ringtone.ogg
rename from browser/extensions/loop/content/shared/sounds/room-joined-in.ogg
rename to browser/components/loop/content/shared/sounds/room-joined-in.ogg
rename from browser/extensions/loop/content/shared/sounds/room-joined.ogg
rename to browser/components/loop/content/shared/sounds/room-joined.ogg
rename from browser/extensions/loop/content/shared/sounds/room-left.ogg
rename to browser/components/loop/content/shared/sounds/room-left.ogg
rename from browser/extensions/loop/content/shared/sounds/terminated.ogg
rename to browser/components/loop/content/shared/sounds/terminated.ogg
rename from browser/extensions/loop/jar.mn
rename to browser/components/loop/jar.mn
--- a/browser/extensions/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -1,164 +1,136 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-[.] chrome.jar:
-% content loop %content/ contentaccessible=yes
-% skin loop classic/1.0 %skin/linux/ os=Linux
-% skin loop classic/1.0 %skin/osx/ os=Darwin
-% skin loop classic/1.0 %skin/windows/ os=WINNT
-% skin loop-shared classic/1.0 %skin/shared/
-% override chrome://loop/skin/menuPanel.png       chrome://loop/skin/menuPanel-yosemite.png       os=Darwin osversion>=10.10
-% override chrome://loop/skin/menuPanel@2x.png    chrome://loop/skin/menuPanel-yosemite@2x.png    os=Darwin osversion>=10.10
-% override chrome://loop/skin/toolbar.png         chrome://loop/skin/toolbar-yosemite.png         os=Darwin osversion>=10.10
-% override chrome://loop/skin/toolbar@2x.png      chrome://loop/skin/toolbar-yosemite@2x.png      os=Darwin osversion>=10.10
-% override chrome://loop/skin/menuPanel.png       chrome://loop/skin/menuPanel-aero.png           os=WINNT osversion=6
-% override chrome://loop/skin/menuPanel.png       chrome://loop/skin/menuPanel-aero.png           os=WINNT osversion=6.1
-% override chrome://loop/skin/menuPanel@2x.png    chrome://loop/skin/menuPanel-aero@2x.png        os=WINNT osversion=6
-% override chrome://loop/skin/menuPanel@2x.png    chrome://loop/skin/menuPanel-aero@2x.png        os=WINNT osversion=6.1
-% override chrome://loop/skin/toolbar.png         chrome://loop/skin/toolbar-XP.png               os=WINNT osversion<6
-% override chrome://loop/skin/toolbar.png         chrome://loop/skin/toolbar-aero.png             os=WINNT osversion=6
-% override chrome://loop/skin/toolbar.png         chrome://loop/skin/toolbar-aero.png             os=WINNT osversion=6.1
-% override chrome://loop/skin/toolbar.png         chrome://loop/skin/toolbar-win8.png             os=WINNT osversion=6.2
-% override chrome://loop/skin/toolbar.png         chrome://loop/skin/toolbar-win8.png             os=WINNT osversion=6.3
-% override chrome://loop/skin/toolbar@2x.png      chrome://loop/skin/toolbar-XP@2x.png            os=WINNT osversion<6
-% override chrome://loop/skin/toolbar@2x.png      chrome://loop/skin/toolbar-aero@2x.png          os=WINNT osversion=6
-% override chrome://loop/skin/toolbar@2x.png      chrome://loop/skin/toolbar-aero@2x.png          os=WINNT osversion=6.1
-% override chrome://loop/skin/toolbar@2x.png      chrome://loop/skin/toolbar-win8@2x.png          os=WINNT osversion=6.2
-% override chrome://loop/skin/toolbar@2x.png      chrome://loop/skin/toolbar-win8@2x.png          os=WINNT osversion=6.3
-  skin/  (skin/*)
-  content/modules/ (content/modules/*)
-* content/preferences/prefs.js (content/preferences/prefs.js)
+browser.jar:
+  # Desktop html files
+  content/browser/loop/conversation.html            (content/conversation.html)
+  content/browser/loop/panel.html                   (content/panel.html)
 
-  # Desktop html files
-  content/panels/conversation.html                 (content/panels/conversation.html)
-  content/panels/panel.html                        (content/panels/panel.html)
-
-  # Desktop vendor (see bottom of this file for TokBox sdk assets)
-  content/panels/vendor/l10n.js                    (content/panels/vendor/l10n.js)
+  # Desktop libs (see bottom of this file for TokBox sdk assets)
+  content/browser/loop/libs/l10n.js                 (content/libs/l10n.js)
 
   # Desktop script
-  content/panels/js/conversation.js                (content/panels/js/conversation.js)
-  content/panels/js/conversationAppStore.js        (content/panels/js/conversationAppStore.js)
-  content/panels/js/otconfig.js                    (content/panels/js/otconfig.js)
-  content/panels/js/panel.js                       (content/panels/js/panel.js)
-  content/panels/js/roomStore.js                   (content/panels/js/roomStore.js)
-  content/panels/js/roomViews.js                   (content/panels/js/roomViews.js)
-  content/panels/js/feedbackViews.js               (content/panels/js/feedbackViews.js)
+  content/browser/loop/js/conversation.js           (content/js/conversation.js)
+  content/browser/loop/js/conversationAppStore.js   (content/js/conversationAppStore.js)
+  content/browser/loop/js/otconfig.js               (content/js/otconfig.js)
+  content/browser/loop/js/panel.js                  (content/js/panel.js)
+  content/browser/loop/js/roomStore.js              (content/js/roomStore.js)
+  content/browser/loop/js/roomViews.js              (content/js/roomViews.js)
+  content/browser/loop/js/feedbackViews.js          (content/js/feedbackViews.js)
 
   # Desktop styles
-  content/panels/css/panel.css                     (content/panels/css/panel.css)
+  content/browser/loop/css/panel.css                (content/css/panel.css)
 
   # Shared styles
-  content/shared/css/reset.css                     (content/shared/css/reset.css)
-  content/shared/css/common.css                    (content/shared/css/common.css)
-  content/shared/css/conversation.css              (content/shared/css/conversation.css)
+  content/browser/loop/shared/css/reset.css         (content/shared/css/reset.css)
+  content/browser/loop/shared/css/common.css        (content/shared/css/common.css)
+  content/browser/loop/shared/css/conversation.css  (content/shared/css/conversation.css)
 
   # Shared images
-  content/shared/img/helloicon.svg                 (content/shared/img/helloicon.svg)
-  content/shared/img/icon_32.png                   (content/shared/img/icon_32.png)
-  content/shared/img/icon_64.png                   (content/shared/img/icon_64.png)
-  content/shared/img/spinner.svg                   (content/shared/img/spinner.svg)
+  content/browser/loop/shared/img/helloicon.svg                 (content/shared/img/helloicon.svg)
+  content/browser/loop/shared/img/icon_32.png                   (content/shared/img/icon_32.png)
+  content/browser/loop/shared/img/icon_64.png                   (content/shared/img/icon_64.png)
+  content/browser/loop/shared/img/spinner.svg                   (content/shared/img/spinner.svg)
   # XXX could get rid of the png spinner usages and replace them with the svg
   # one?
-  content/shared/img/spinner.png                   (content/shared/img/spinner.png)
-  content/shared/img/spinner@2x.png                (content/shared/img/spinner@2x.png)
-  content/shared/img/sad_hello_icon_64x64.svg      (content/shared/img/sad_hello_icon_64x64.svg)
-  content/shared/img/chatbubble-arrow-left.svg     (content/shared/img/chatbubble-arrow-left.svg)
-  content/shared/img/chatbubble-arrow-right.svg    (content/shared/img/chatbubble-arrow-right.svg)
-  content/shared/img/facemute-14x14.png            (content/shared/img/facemute-14x14.png)
-  content/shared/img/facemute-14x14@2x.png         (content/shared/img/facemute-14x14@2x.png)
-  content/shared/img/hangup-inverse-14x14.png      (content/shared/img/hangup-inverse-14x14.png)
-  content/shared/img/hangup-inverse-14x14@2x.png   (content/shared/img/hangup-inverse-14x14@2x.png)
-  content/shared/img/mute-inverse-14x14.png        (content/shared/img/mute-inverse-14x14.png)
-  content/shared/img/mute-inverse-14x14@2x.png     (content/shared/img/mute-inverse-14x14@2x.png)
-  content/shared/img/glyph-email-16x16.svg         (content/shared/img/glyph-email-16x16.svg)
-  content/shared/img/glyph-facebook-16x16.svg      (content/shared/img/glyph-facebook-16x16.svg)
-  content/shared/img/glyph-help-16x16.svg          (content/shared/img/glyph-help-16x16.svg)
-  content/shared/img/glyph-link-16x16.svg          (content/shared/img/glyph-link-16x16.svg)
-  content/shared/img/glyph-user-16x16.svg          (content/shared/img/glyph-user-16x16.svg)
-  content/shared/img/exit.svg                      (content/shared/img/exit.svg)
-  content/shared/img/audio.svg                     (content/shared/img/audio.svg)
-  content/shared/img/audio-hover.svg               (content/shared/img/audio-hover.svg)
-  content/shared/img/audio-mute.svg                (content/shared/img/audio-mute.svg)
-  content/shared/img/audio-mute-hover.svg          (content/shared/img/audio-mute-hover.svg)
-  content/shared/img/video.svg                     (content/shared/img/video.svg)
-  content/shared/img/video-hover.svg               (content/shared/img/video-hover.svg)
-  content/shared/img/video-mute.svg                (content/shared/img/video-mute.svg)
-  content/shared/img/video-mute-hover.svg          (content/shared/img/video-mute-hover.svg)
-  content/shared/img/settings.svg                  (content/shared/img/settings.svg)
-  content/shared/img/settings-hover.svg            (content/shared/img/settings-hover.svg)
-  content/shared/img/sharing.svg                   (content/shared/img/sharing.svg)
-  content/shared/img/sharing-active.svg            (content/shared/img/sharing-active.svg)
-  content/shared/img/sharing-pending.svg           (content/shared/img/sharing-pending.svg)
-  content/shared/img/sharing-hover.svg             (content/shared/img/sharing-hover.svg)
-  content/shared/img/media-group.svg               (content/shared/img/media-group.svg)
-  content/shared/img/media-group-left-hover.svg    (content/shared/img/media-group-left-hover.svg)
-  content/shared/img/media-group-right-hover.svg   (content/shared/img/media-group-right-hover.svg)
-  content/shared/img/audio-call-avatar.svg         (content/shared/img/audio-call-avatar.svg)
-  content/shared/img/beta-ribbon.svg               (content/shared/img/beta-ribbon.svg)
-  content/shared/img/check.svg                     (content/shared/img/check.svg)
-  content/shared/img/icons-10x10.svg               (content/shared/img/icons-10x10.svg)
-  content/shared/img/icons-14x14.svg               (content/shared/img/icons-14x14.svg)
-  content/shared/img/icons-16x16.svg               (content/shared/img/icons-16x16.svg)
-  content/shared/img/movistar.png                  (content/shared/img/movistar.png)
-  content/shared/img/movistar@2x.png               (content/shared/img/movistar@2x.png)
-  content/shared/img/vivo.png                      (content/shared/img/vivo.png)
-  content/shared/img/vivo@2x.png                   (content/shared/img/vivo@2x.png)
-  content/shared/img/02.png                        (content/shared/img/02.png)
-  content/shared/img/02@2x.png                     (content/shared/img/02@2x.png)
-  content/shared/img/telefonica.png                (content/shared/img/telefonica.png)
-  content/shared/img/hello_logo.svg                (content/shared/img/hello_logo.svg)
-  content/shared/img/telefonica@2x.png             (content/shared/img/telefonica@2x.png)
-  content/shared/img/ellipsis-v.svg                (content/shared/img/ellipsis-v.svg)
-  content/shared/img/empty_conversations.svg       (content/shared/img/empty_conversations.svg)
-  content/shared/img/empty_search.svg              (content/shared/img/empty_search.svg)
-  content/shared/img/animated-spinner.svg          (content/shared/img/animated-spinner.svg)
-  content/shared/img/avatars.svg                   (content/shared/img/avatars.svg)
-  content/shared/img/firefox-avatar.svg            (content/shared/img/firefox-avatar.svg)
-  content/shared/img/pause-12x12.svg               (content/shared/img/pause-12x12.svg)
-  content/shared/img/play-12x12.svg                (content/shared/img/play-12x12.svg)
-  content/shared/img/stop-12x12.svg                (content/shared/img/stop-12x12.svg)
+  content/browser/loop/shared/img/spinner.png                   (content/shared/img/spinner.png)
+  content/browser/loop/shared/img/spinner@2x.png                (content/shared/img/spinner@2x.png)
+  content/browser/loop/shared/img/sad_hello_icon_64x64.svg      (content/shared/img/sad_hello_icon_64x64.svg)
+  content/browser/loop/shared/img/chatbubble-arrow-left.svg     (content/shared/img/chatbubble-arrow-left.svg)
+  content/browser/loop/shared/img/chatbubble-arrow-right.svg    (content/shared/img/chatbubble-arrow-right.svg)
+  content/browser/loop/shared/img/facemute-14x14.png            (content/shared/img/facemute-14x14.png)
+  content/browser/loop/shared/img/facemute-14x14@2x.png         (content/shared/img/facemute-14x14@2x.png)
+  content/browser/loop/shared/img/hangup-inverse-14x14.png      (content/shared/img/hangup-inverse-14x14.png)
+  content/browser/loop/shared/img/hangup-inverse-14x14@2x.png   (content/shared/img/hangup-inverse-14x14@2x.png)
+  content/browser/loop/shared/img/mute-inverse-14x14.png        (content/shared/img/mute-inverse-14x14.png)
+  content/browser/loop/shared/img/mute-inverse-14x14@2x.png     (content/shared/img/mute-inverse-14x14@2x.png)
+  content/browser/loop/shared/img/svg/glyph-email-16x16.svg     (content/shared/img/svg/glyph-email-16x16.svg)
+  content/browser/loop/shared/img/svg/glyph-facebook-16x16.svg  (content/shared/img/svg/glyph-facebook-16x16.svg)
+  content/browser/loop/shared/img/svg/glyph-help-16x16.svg      (content/shared/img/svg/glyph-help-16x16.svg)
+  content/browser/loop/shared/img/svg/glyph-link-16x16.svg      (content/shared/img/svg/glyph-link-16x16.svg)
+  content/browser/loop/shared/img/svg/glyph-user-16x16.svg      (content/shared/img/svg/glyph-user-16x16.svg)
+  content/browser/loop/shared/img/svg/exit.svg                  (content/shared/img/svg/exit.svg)
+  content/browser/loop/shared/img/svg/audio.svg                 (content/shared/img/svg/audio.svg)
+  content/browser/loop/shared/img/svg/audio-hover.svg           (content/shared/img/svg/audio-hover.svg)
+  content/browser/loop/shared/img/svg/audio-mute.svg            (content/shared/img/svg/audio-mute.svg)
+  content/browser/loop/shared/img/svg/audio-mute-hover.svg      (content/shared/img/svg/audio-mute-hover.svg)
+  content/browser/loop/shared/img/svg/video.svg                 (content/shared/img/svg/video.svg)
+  content/browser/loop/shared/img/svg/video-hover.svg           (content/shared/img/svg/video-hover.svg)
+  content/browser/loop/shared/img/svg/video-mute.svg            (content/shared/img/svg/video-mute.svg)
+  content/browser/loop/shared/img/svg/video-mute-hover.svg      (content/shared/img/svg/video-mute-hover.svg)
+  content/browser/loop/shared/img/svg/settings.svg              (content/shared/img/svg/settings.svg)
+  content/browser/loop/shared/img/svg/settings-hover.svg        (content/shared/img/svg/settings-hover.svg)
+  content/browser/loop/shared/img/svg/sharing.svg               (content/shared/img/svg/sharing.svg)
+  content/browser/loop/shared/img/svg/sharing-active.svg        (content/shared/img/svg/sharing-active.svg)
+  content/browser/loop/shared/img/svg/sharing-pending.svg       (content/shared/img/svg/sharing-pending.svg)
+  content/browser/loop/shared/img/svg/sharing-hover.svg         (content/shared/img/svg/sharing-hover.svg)
+  content/browser/loop/shared/img/svg/media-group.svg           (content/shared/img/svg/media-group.svg)
+  content/browser/loop/shared/img/svg/media-group-left-hover.svg (content/shared/img/svg/media-group-left-hover.svg)
+  content/browser/loop/shared/img/svg/media-group-right-hover.svg (content/shared/img/svg/media-group-right-hover.svg)
+  content/browser/loop/shared/img/audio-call-avatar.svg         (content/shared/img/audio-call-avatar.svg)
+  content/browser/loop/shared/img/beta-ribbon.svg               (content/shared/img/beta-ribbon.svg)
+  content/browser/loop/shared/img/check.svg                     (content/shared/img/check.svg)
+  content/browser/loop/shared/img/icons-10x10.svg               (content/shared/img/icons-10x10.svg)
+  content/browser/loop/shared/img/icons-14x14.svg               (content/shared/img/icons-14x14.svg)
+  content/browser/loop/shared/img/icons-16x16.svg               (content/shared/img/icons-16x16.svg)
+  content/browser/loop/shared/img/movistar.png                  (content/shared/img/movistar.png)
+  content/browser/loop/shared/img/movistar@2x.png               (content/shared/img/movistar@2x.png)
+  content/browser/loop/shared/img/vivo.png                      (content/shared/img/vivo.png)
+  content/browser/loop/shared/img/vivo@2x.png                   (content/shared/img/vivo@2x.png)
+  content/browser/loop/shared/img/02.png                        (content/shared/img/02.png)
+  content/browser/loop/shared/img/02@2x.png                     (content/shared/img/02@2x.png)
+  content/browser/loop/shared/img/telefonica.png                (content/shared/img/telefonica.png)
+  content/browser/loop/shared/img/hello_logo.svg                (content/shared/img/hello_logo.svg)
+  content/browser/loop/shared/img/telefonica@2x.png             (content/shared/img/telefonica@2x.png)
+  content/browser/loop/shared/img/ellipsis-v.svg                (content/shared/img/ellipsis-v.svg)
+  content/browser/loop/shared/img/empty_conversations.svg       (content/shared/img/empty_conversations.svg)
+  content/browser/loop/shared/img/empty_search.svg              (content/shared/img/empty_search.svg)
+  content/browser/loop/shared/img/animated-spinner.svg          (content/shared/img/animated-spinner.svg)
+  content/browser/loop/shared/img/avatars.svg                   (content/shared/img/avatars.svg)
+  content/browser/loop/shared/img/firefox-avatar.svg            (content/shared/img/firefox-avatar.svg)
+  content/browser/loop/shared/img/pause-12x12.svg               (content/shared/img/pause-12x12.svg)
+  content/browser/loop/shared/img/play-12x12.svg                (content/shared/img/play-12x12.svg)
+  content/browser/loop/shared/img/stop-12x12.svg                (content/shared/img/stop-12x12.svg)
 
   # Shared scripts
-  content/shared/js/actions.js                     (content/shared/js/actions.js)
-  content/shared/js/crypto.js                      (content/shared/js/crypto.js)
-  content/shared/js/store.js                       (content/shared/js/store.js)
-  content/shared/js/activeRoomStore.js             (content/shared/js/activeRoomStore.js)
-  content/shared/js/dispatcher.js                  (content/shared/js/dispatcher.js)
-  content/shared/js/linkifiedTextView.js           (content/shared/js/linkifiedTextView.js)
-  content/shared/js/loopapi-client.js              (content/shared/js/loopapi-client.js)
-  content/shared/js/models.js                      (content/shared/js/models.js)
-  content/shared/js/mixins.js                      (content/shared/js/mixins.js)
-  content/shared/js/otSdkDriver.js                 (content/shared/js/otSdkDriver.js)
-  content/shared/js/views.js                       (content/shared/js/views.js)
-  content/shared/js/textChatStore.js               (content/shared/js/textChatStore.js)
-  content/shared/js/textChatView.js                (content/shared/js/textChatView.js)
-  content/shared/js/urlRegExps.js                  (content/shared/js/urlRegExps.js)
-  content/shared/js/utils.js                       (content/shared/js/utils.js)
-  content/shared/js/validate.js                    (content/shared/js/validate.js)
+  content/browser/loop/shared/js/actions.js             (content/shared/js/actions.js)
+  content/browser/loop/shared/js/store.js               (content/shared/js/store.js)
+  content/browser/loop/shared/js/activeRoomStore.js     (content/shared/js/activeRoomStore.js)
+  content/browser/loop/shared/js/dispatcher.js          (content/shared/js/dispatcher.js)
+  content/browser/loop/shared/js/linkifiedTextView.js   (content/shared/js/linkifiedTextView.js)
+  content/browser/loop/shared/js/loopapi-client.js      (content/shared/js/loopapi-client.js)
+  content/browser/loop/shared/js/models.js              (content/shared/js/models.js)
+  content/browser/loop/shared/js/mixins.js              (content/shared/js/mixins.js)
+  content/browser/loop/shared/js/otSdkDriver.js         (content/shared/js/otSdkDriver.js)
+  content/browser/loop/shared/js/views.js               (content/shared/js/views.js)
+  content/browser/loop/shared/js/textChatStore.js       (content/shared/js/textChatStore.js)
+  content/browser/loop/shared/js/textChatView.js        (content/shared/js/textChatView.js)
+  content/browser/loop/shared/js/urlRegExps.js          (content/shared/js/urlRegExps.js)
+  content/browser/loop/shared/js/utils.js               (content/shared/js/utils.js)
+  content/browser/loop/shared/js/validate.js            (content/shared/js/validate.js)
 
   # Shared libs
 #ifdef DEBUG
-  content/shared/vendor/react-0.13.3.js            (content/shared/vendor/react-0.13.3.js)
+  content/browser/loop/shared/libs/react-0.13.3.js    (content/shared/libs/react-0.13.3.js)
 #else
-  content/shared/vendor/react-0.13.3.js            (content/shared/vendor/react-0.13.3-prod.js)
+  content/browser/loop/shared/libs/react-0.13.3.js    (content/shared/libs/react-0.13.3-prod.js)
 #endif
-  content/shared/vendor/lodash-3.9.3.js            (content/shared/vendor/lodash-3.9.3.js)
-  content/shared/vendor/backbone-1.2.1.js          (content/shared/vendor/backbone-1.2.1.js)
-  content/shared/vendor/classnames-2.2.0.js        (content/shared/vendor/classnames-2.2.0.js)
+  content/browser/loop/shared/libs/lodash-3.9.3.js    (content/shared/libs/lodash-3.9.3.js)
+  content/browser/loop/shared/libs/backbone-1.2.1.js  (content/shared/libs/backbone-1.2.1.js)
+  content/browser/loop/shared/libs/classnames-2.2.0.js      (content/shared/libs/classnames-2.2.0.js)
 
   # Shared sounds
-  content/shared/sounds/ringtone.ogg               (content/shared/sounds/ringtone.ogg)
-  content/shared/sounds/connecting.ogg             (content/shared/sounds/connecting.ogg)
-  content/shared/sounds/connected.ogg              (content/shared/sounds/connected.ogg)
-  content/shared/sounds/terminated.ogg             (content/shared/sounds/terminated.ogg)
-  content/shared/sounds/room-joined.ogg            (content/shared/sounds/room-joined.ogg)
-  content/shared/sounds/room-joined-in.ogg         (content/shared/sounds/room-joined-in.ogg)
-  content/shared/sounds/room-left.ogg              (content/shared/sounds/room-left.ogg)
-  content/shared/sounds/failure.ogg                (content/shared/sounds/failure.ogg)
-  content/shared/sounds/message.ogg                (content/shared/sounds/message.ogg)
+  content/browser/loop/shared/sounds/ringtone.ogg       (content/shared/sounds/ringtone.ogg)
+  content/browser/loop/shared/sounds/connecting.ogg     (content/shared/sounds/connecting.ogg)
+  content/browser/loop/shared/sounds/connected.ogg      (content/shared/sounds/connected.ogg)
+  content/browser/loop/shared/sounds/terminated.ogg     (content/shared/sounds/terminated.ogg)
+  content/browser/loop/shared/sounds/room-joined.ogg    (content/shared/sounds/room-joined.ogg)
+  content/browser/loop/shared/sounds/room-joined-in.ogg (content/shared/sounds/room-joined-in.ogg)
+  content/browser/loop/shared/sounds/room-left.ogg      (content/shared/sounds/room-left.ogg)
+  content/browser/loop/shared/sounds/failure.ogg        (content/shared/sounds/failure.ogg)
+  content/browser/loop/shared/sounds/message.ogg        (content/shared/sounds/message.ogg)
 
   # Partner SDK assets
-  content/shared/vendor/sdk.js                     (content/shared/vendor/sdk.js)
-  content/sdk-content/js/dynamic_config.min.js     (content/shared/vendor/sdk-content/js/dynamic_config.min.js)
+  content/browser/loop/libs/sdk.js                                                    (content/shared/libs/sdk.js)
+  content/browser/loop/sdk-content/js/dynamic_config.min.js                   (content/shared/libs/sdk-content/js/dynamic_config.min.js)
rename from browser/extensions/loop/manifest.ini
rename to browser/components/loop/manifest.ini
rename from browser/extensions/loop/content/modules/.eslintrc
rename to browser/components/loop/modules/.eslintrc
--- a/browser/extensions/loop/content/modules/.eslintrc
+++ b/browser/components/loop/modules/.eslintrc
@@ -1,3 +1,3 @@
 {
-  "extends": "../../.eslintrc-gecko"
+  "extends": "../.eslintrc-gecko"
 }
rename from browser/extensions/loop/content/modules/LoopRooms.jsm
rename to browser/components/loop/modules/LoopRooms.jsm
--- a/browser/extensions/loop/content/modules/LoopRooms.jsm
+++ b/browser/components/loop/modules/LoopRooms.jsm
@@ -5,38 +5,38 @@
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 
-const { MozLoopService, LOOP_SESSION_TYPE } = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+const { MozLoopService, LOOP_SESSION_TYPE } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
                                   "resource://services-common/utils.js");
 XPCOMUtils.defineLazyModuleGetter(this, "WebChannel",
                                   "resource://gre/modules/WebChannel.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
   const { EventEmitter } = Cu.import("resource://devtools/shared/event-emitter.js", {});
   return new EventEmitter();
 });
 XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {
   return Services.strings.createBundle("chrome://browser/locale/loop/loop.properties");
 });
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoopRoomsCache",
-  "chrome://loop/content/modules/LoopRoomsCache.jsm");
+  "resource:///modules/loop/LoopRoomsCache.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "loopUtils",
-  "chrome://loop/content/modules/utils.js", "utils");
+  "resource:///modules/loop/utils.js", "utils");
 XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
-  "chrome://loop/content/shared/js/crypto.js", "LoopCrypto");
+  "resource:///modules/loop/crypto.js", "LoopCrypto");
 XPCOMUtils.defineLazyModuleGetter(this, "ObjectUtils",
   "resource://gre/modules/ObjectUtils.jsm");
 
 
 this.EXPORTED_SYMBOLS = ["LoopRooms", "roomsPushNotification"];
 
 // The maximum number of clients that we support currently.
 const CLIENT_MAX_SIZE = 2;
rename from browser/extensions/loop/content/modules/LoopRoomsCache.jsm
rename to browser/components/loop/modules/LoopRoomsCache.jsm
--- a/browser/extensions/loop/content/modules/LoopRoomsCache.jsm
+++ b/browser/components/loop/modules/LoopRoomsCache.jsm
@@ -4,17 +4,17 @@
 "use strict";
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 const { MozLoopService, LOOP_SESSION_TYPE } =
-  Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+  Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
                                   "resource://services-common/utils.js");
 XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
 this.EXPORTED_SYMBOLS = ["LoopRoomsCache"];
 
 const LOOP_ROOMS_CACHE_FILENAME = "loopRoomsCache.json";
 XPCOMUtils.defineConstant(this, "LOOP_ROOMS_CACHE_FILENAME", LOOP_ROOMS_CACHE_FILENAME);
rename from browser/extensions/loop/content/modules/MozLoopAPI.jsm
rename to browser/components/loop/modules/MozLoopAPI.jsm
--- a/browser/extensions/loop/content/modules/MozLoopAPI.jsm
+++ b/browser/components/loop/modules/MozLoopAPI.jsm
@@ -4,18 +4,18 @@
 
 "use strict";
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("chrome://loop/content/modules/MozLoopService.jsm");
-Cu.import("chrome://loop/content/modules/LoopRooms.jsm");
+Cu.import("resource:///modules/loop/MozLoopService.jsm");
+Cu.import("resource:///modules/loop/LoopRooms.jsm");
 Cu.importGlobalProperties(["Blob"]);
 
 XPCOMUtils.defineLazyModuleGetter(this, "PageMetadata",
                                         "resource://gre/modules/PageMetadata.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
                                         "resource://gre/modules/PluralForm.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
                                         "resource://gre/modules/UpdateUtils.jsm");
rename from browser/extensions/loop/content/modules/MozLoopPushHandler.jsm
rename to browser/components/loop/modules/MozLoopPushHandler.jsm
--- a/browser/extensions/loop/content/modules/MozLoopPushHandler.jsm
+++ b/browser/components/loop/modules/MozLoopPushHandler.jsm
@@ -5,17 +5,17 @@
 "use strict";
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 
-const { MozLoopService } = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+const { MozLoopService } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 const consoleLog = MozLoopService.log;
 
 this.EXPORTED_SYMBOLS = ["MozLoopPushHandler"];
 
 const CONNECTION_STATE_CLOSED = 0;
 const CONNECTION_STATE_CONNECTING = 1;
 const CONNECTION_STATE_OPEN = 2;
 
rename from browser/extensions/loop/content/modules/MozLoopService.jsm
rename to browser/components/loop/modules/MozLoopService.jsm
--- a/browser/extensions/loop/content/modules/MozLoopService.jsm
+++ b/browser/components/loop/modules/MozLoopService.jsm
@@ -116,24 +116,24 @@ XPCOMUtils.defineConstant(this, "LOOP_SE
 XPCOMUtils.defineConstant(this, "TWO_WAY_MEDIA_CONN_LENGTH", TWO_WAY_MEDIA_CONN_LENGTH);
 XPCOMUtils.defineConstant(this, "SHARING_STATE_CHANGE", SHARING_STATE_CHANGE);
 XPCOMUtils.defineConstant(this, "SHARING_ROOM_URL", SHARING_ROOM_URL);
 XPCOMUtils.defineConstant(this, "ROOM_CREATE", ROOM_CREATE);
 XPCOMUtils.defineConstant(this, "ROOM_DELETE", ROOM_DELETE);
 XPCOMUtils.defineConstant(this, "ROOM_CONTEXT_ADD", ROOM_CONTEXT_ADD);
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoopAPI",
-  "chrome://loop/content/modules/MozLoopAPI.jsm");
+  "resource:///modules/loop/MozLoopAPI.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "convertToRTCStatsReport",
   "resource://gre/modules/media/RTCStatsReport.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "loopUtils",
-  "chrome://loop/content/modules/utils.js", "utils");
+  "resource:///modules/loop/utils.js", "utils");
 XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
-  "chrome://loop/content/shared/js/crypto.js", "LoopCrypto");
+  "resource:///modules/loop/crypto.js", "LoopCrypto");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Chat", "resource:///modules/Chat.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
                                   "resource://services-common/utils.js");
 
 XPCOMUtils.defineLazyModuleGetter(this, "CryptoUtils",
                                   "resource://services-crypto/utils.js");
@@ -146,23 +146,23 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 
 XPCOMUtils.defineLazyModuleGetter(this, "deriveHawkCredentials",
                                   "resource://services-common/hawkrequest.js");
 
 XPCOMUtils.defineLazyModuleGetter(this, "hookWindowCloseForPanelClose",
                                   "resource://gre/modules/MozSocialAPI.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoopRooms",
-                                  "chrome://loop/content/modules/LoopRooms.jsm");
+                                  "resource:///modules/loop/LoopRooms.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "roomsPushNotification",
-                                  "chrome://loop/content/modules/LoopRooms.jsm");
+                                  "resource:///modules/loop/LoopRooms.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "MozLoopPushHandler",
-                                  "chrome://loop/content/modules/MozLoopPushHandler.jsm");
+                                  "resource:///modules/loop/MozLoopPushHandler.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
                                   "resource:///modules/UITour.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
                                    "@mozilla.org/uuid-generator;1",
                                    "nsIUUIDGenerator");
 
rename from browser/extensions/loop/content/modules/MozLoopWorker.js
rename to browser/components/loop/modules/MozLoopWorker.js
rename from browser/extensions/loop/moz.build
rename to browser/components/loop/moz.build
--- a/browser/extensions/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -1,26 +1,27 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FINAL_TARGET = 'dist/bin/browser/features/loop@mozilla.org'
-
-FINAL_TARGET_FILES += [
- 'bootstrap.js'
-]
-
-DIST_FILES += [
-  'install.rdf.in'
-]
-
 JAR_MANIFESTS += ['jar.mn']
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
 
 BROWSER_CHROME_MANIFESTS += [
     'test/mochitest/browser.ini',
 ]
 
+EXTRA_JS_MODULES.loop += [
+    'content/shared/js/crypto.js',
+    'content/shared/js/utils.js',
+    'modules/LoopRooms.jsm',
+    'modules/LoopRoomsCache.jsm',
+    'modules/MozLoopAPI.jsm',
+    'modules/MozLoopPushHandler.jsm',
+    'modules/MozLoopService.jsm',
+    'modules/MozLoopWorker.js',
+]
+
 with Files('**'):
     BUG_COMPONENT = ('Loop', 'Client')
rename from browser/extensions/loop/run-all-loop-tests.sh
rename to browser/components/loop/run-all-loop-tests.sh
--- a/browser/extensions/loop/run-all-loop-tests.sh
+++ b/browser/components/loop/run-all-loop-tests.sh
@@ -7,30 +7,30 @@ if [ "$1" == "--help" ]; then
   exit 0;
 fi
 
 # Causes script to abort immediately if error code is not checked.
 set -e
 
 # Main tests
 
-LOOPDIR=browser/extensions/loop
+LOOPDIR=browser/components/loop
 ESLINT=standalone/node_modules/.bin/eslint
 if [ -x "${LOOPDIR}/${ESLINT}" ]; then
   echo 'running eslint; see http://eslint.org/docs/rules/ for error info'
   (cd ${LOOPDIR} && ./${ESLINT} --ext .js --ext .jsm --ext .jsx .)
   if [ $? != 0 ]; then
     exit 1;
   fi
   echo 'eslint run finished.'
 fi
 
 # Build tests coverage.
 MISSINGDEPSMSG="\nMake sure all dependencies are up to date by running
-'npm install' inside the 'browser/extensions/loop/test/' directory.\n"
+'npm install' inside the 'browser/components/loop/test/' directory.\n"
 (
 cd ${LOOPDIR}/test
 if ! npm run-script build-coverage ; then
   echo $MISSINGDEPSMSG && exit 1
 fi
 )
 
 ./mach xpcshell-test ${LOOPDIR}/
rename from browser/extensions/loop/standalone/.gitignore
rename to browser/components/loop/standalone/.gitignore
rename from browser/extensions/loop/standalone/Makefile
rename to browser/components/loop/standalone/Makefile
rename from browser/extensions/loop/standalone/README.md
rename to browser/components/loop/standalone/README.md
rename from browser/extensions/loop/standalone/content/css/webapp.css
rename to browser/components/loop/standalone/content/css/webapp.css
--- a/browser/extensions/loop/standalone/content/css/webapp.css
+++ b/browser/components/loop/standalone/content/css/webapp.css
@@ -82,17 +82,17 @@ html[dir="rtl"] .standalone-overlay-wrap
   left: 0;
   right: auto;
 }
 
 .standalone-overlay-wrapper .icon-help {
   background-size: contain;
   width: 16px;
   height: 16px;
-  background: transparent url("../shared/img/glyph-help-16x16.svg") no-repeat;
+  background: transparent url("../shared/img/svg/glyph-help-16x16.svg") no-repeat;
 }
 
 .standalone-overlay-wrapper > .standalone-moz-logo {
   width: 50px;
   height: 13px;
   position: absolute;
   bottom: 0;
   right: 0;
@@ -266,17 +266,17 @@ html[dir="rtl"] .standalone-overlay-wrap
   justify-content: space-between;
   margin: 3em auto 1em;
   /* This should match the width set in the room-waiting-tile to ensure the edges
      of the content aligns within the tile width. */
   width: 290px;
 }
 
 .room-inner-info-area > .room-waiting-area > a >.room-waiting-help {
-  background: transparent url("../shared/img/glyph-help-16x16.svg") no-repeat;
+  background: transparent url("../shared/img/svg/glyph-help-16x16.svg") no-repeat;
   display: inline-block;
   height: 16px;
   margin-left: 5px;
   vertical-align: middle;
   width: 16px;
 }
 
 .room-inner-info-area > .room-waiting-tile {
rename from browser/extensions/loop/standalone/content/favicon.ico
rename to browser/components/loop/standalone/content/favicon.ico
rename from browser/extensions/loop/standalone/content/img/gum-chrome.svg
rename to browser/components/loop/standalone/content/img/gum-chrome.svg
rename from browser/extensions/loop/standalone/content/img/gum-firefox.svg
rename to browser/components/loop/standalone/content/img/gum-firefox.svg
rename from browser/extensions/loop/standalone/content/img/gum-opera.svg
rename to browser/components/loop/standalone/content/img/gum-opera.svg
rename from browser/extensions/loop/standalone/content/img/gum-others.svg
rename to browser/components/loop/standalone/content/img/gum-others.svg
rename from browser/extensions/loop/standalone/content/img/hello-logo-text.svg
rename to browser/components/loop/standalone/content/img/hello-logo-text.svg
rename from browser/extensions/loop/standalone/content/img/logo.png
rename to browser/components/loop/standalone/content/img/logo.png
rename from browser/extensions/loop/standalone/content/img/mozilla-logo.svg
rename to browser/components/loop/standalone/content/img/mozilla-logo.svg
rename from browser/extensions/loop/standalone/content/index.html
rename to browser/components/loop/standalone/content/index.html
rename from browser/extensions/loop/standalone/content/js/standaloneAppStore.js
rename to browser/components/loop/standalone/content/js/standaloneAppStore.js
rename from browser/extensions/loop/standalone/content/js/standaloneMetricsStore.js
rename to browser/components/loop/standalone/content/js/standaloneMetricsStore.js
rename from browser/extensions/loop/standalone/content/js/standaloneMozLoop.js
rename to browser/components/loop/standalone/content/js/standaloneMozLoop.js
rename from browser/extensions/loop/standalone/content/js/standaloneRoomViews.js
rename to browser/components/loop/standalone/content/js/standaloneRoomViews.js
rename from browser/extensions/loop/standalone/content/js/standaloneRoomViews.jsx
rename to browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
rename from browser/extensions/loop/standalone/content/js/webapp.js
rename to browser/components/loop/standalone/content/js/webapp.js
rename from browser/extensions/loop/standalone/content/js/webapp.jsx
rename to browser/components/loop/standalone/content/js/webapp.jsx
rename from browser/extensions/loop/standalone/content/l10n/en-US/loop.properties
rename to browser/components/loop/standalone/content/l10n/en-US/loop.properties
rename from browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
rename to browser/components/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
rename from browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt
rename to browser/components/loop/standalone/content/libs/l10n-gaia-upstream.txt
rename from browser/extensions/loop/standalone/content/robots.txt
rename to browser/components/loop/standalone/content/robots.txt
rename from browser/extensions/loop/standalone/content/webappEntryPoint.js
rename to browser/components/loop/standalone/content/webappEntryPoint.js
--- a/browser/extensions/loop/standalone/content/webappEntryPoint.js
+++ b/browser/components/loop/standalone/content/webappEntryPoint.js
@@ -12,42 +12,42 @@
 // To get started, we're using webpack's script loader to load these things in
 // as-is.
 
 /* global require */
 
 // The OpenTok SDK tries to do some heuristic detection of require and
 // assumes a node environment if it's present, which confuses webpack, so
 // we turn that off by forcing require to false in that context.
-require("imports?require=>false!shared/vendor/sdk.js");
+require("imports?require=>false!shared/libs/sdk.js");
 
 // Ultimately, we'll likely want to pull the vendor libraries from npm, as that
 // makes upgrading easier, and it's generally better practice to minify the
 // "source" versions of libraries rather than built artifacts.  We probably do
 // want to minify them ourselves since this allows for better dead-code
 // elimination, but that can be a bit of judgement call.
-require("exports?_!shared/vendor/lodash-3.9.3.js");
+require("exports?_!shared/libs/lodash-3.9.3.js");
 
 // Disable Backbone's AMD auto-detection, as described at:
 //
 // https://github.com/jashkenas/backbone/wiki/Using-Backbone-without-jQuery
 //
-require("expose?Backbone!imports?define=>false!shared/vendor/backbone-1.2.1.js");
+require("expose?Backbone!imports?define=>false!shared/libs/backbone-1.2.1.js");
 
 /* global: __PROD__ */
 if (typeof __PROD__ !== "undefined") {
   // webpack warns if we try to minify some prebuilt libraries, so we
   // pull in the unbuilt version from node_modules
   require("expose?React!react");
   require("expose?React!react/addons");
   require("expose?classNames!classnames");
 } else {
   // our development server setup doesn't yet handle real modules, so for now...
-  require("shared/vendor/react-0.13.3.js");
-  require("shared/vendor/classnames-2.2.0.js");
+  require("shared/libs/react-0.13.3.js");
+  require("shared/libs/classnames-2.2.0.js");
 }
 
 
 // Someday, these will be real modules.  For now, we're chaining loaders
 // to teach webpack how to treat them like modules anyway.
 //
 // We do it in this file rather than globally in webpack.config.js
 // because:
rename from browser/extensions/loop/standalone/package.json
rename to browser/components/loop/standalone/package.json
rename from browser/extensions/loop/standalone/server.js
rename to browser/components/loop/standalone/server.js
--- a/browser/extensions/loop/standalone/server.js
+++ b/browser/components/loop/standalone/server.js
@@ -85,20 +85,16 @@ app.use("/content", express.static(path.
 // These two are based on the above, but handle call urls, that have a /c/ in them.
 app.use("/content/c", express.static(path.join(__dirname,
   standaloneContentDir)));
 app.use("/content/c", express.static(path.join(__dirname, "..", "content")));
 
 // Two lines for the same reason as /content above.
 app.use("/test", express.static(path.join(__dirname, "test")));
 app.use("/test", express.static(path.join(__dirname, "..", "test")));
-// Hacks for desktop to stop errors being raised in the tests for content loading.
-app.use("/test/shared/shared", express.static(path.join(__dirname, "..", "content/shared")));
-app.use("/test/desktop-local/shared", express.static(path.join(__dirname, "..", "content/shared")));
-
 
 // As we don't have hashes on the urls, the best way to serve the index files
 // appears to be to be to closely filter the url and match appropriately.
 function serveIndex(req, res) {
   "use strict";
 
   return res.sendFile(path.join(__dirname, standaloneContentDir, "index.html"));
 }
rename from browser/extensions/loop/standalone/webpack.config.js
rename to browser/components/loop/standalone/webpack.config.js
rename from browser/extensions/loop/test/.eslintrc
rename to browser/components/loop/test/.eslintrc
rename from browser/extensions/loop/test/coverage/index.html
rename to browser/components/loop/test/coverage/index.html
rename from browser/extensions/loop/test/desktop-local/.eslintrc
rename to browser/components/loop/test/desktop-local/.eslintrc
rename from browser/extensions/loop/test/desktop-local/README.md
rename to browser/components/loop/test/desktop-local/README.md
--- a/browser/extensions/loop/test/desktop-local/README.md
+++ b/browser/components/loop/test/desktop-local/README.md
@@ -6,16 +6,16 @@ and the Chai Assertion Library's [BDD in
 [1]: http://visionmedia.github.io/mocha/
 [2]: http://chaijs.com/api/bdd/
 
 Aim your browser at the index.html in this directory on your localhost using
 a file: or HTTP URL to run the tests.  Alternately, from the top-level of your
 Gecko source directory, execute:
 
 ```
-./mach marionette-test browser/extensions/loop/test/manifest.ini
+./mach marionette-test browser/components/loop/test/manifest.ini
 ```
 
 Next steps:
 
 * run using JS http server so the property security context for DOM elements
 is used
 
rename from browser/extensions/loop/test/desktop-local/conversationAppStore_test.js
rename to browser/components/loop/test/desktop-local/conversationAppStore_test.js
rename from browser/extensions/loop/test/desktop-local/conversation_test.js
rename to browser/components/loop/test/desktop-local/conversation_test.js
rename from browser/extensions/loop/test/desktop-local/feedbackViews_test.js
rename to browser/components/loop/test/desktop-local/feedbackViews_test.js
rename from browser/extensions/loop/test/desktop-local/index.html
rename to browser/components/loop/test/desktop-local/index.html
--- a/browser/extensions/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -9,27 +9,27 @@
   <link rel="stylesheet" media="all" href="../shared/vendor/mocha-2.2.5.css">
 </head>
 <body>
   <div id="mocha">
     <p><a href="../">Index</a></p>
   </div>
   <div id="messages"></div>
   <div id="fixtures"></div>
-  <script src="../../content/shared/vendor/lodash-3.9.3.js"></script>
+  <script src="../../content/shared/libs/lodash-3.9.3.js"></script>
   <script src="../shared/loop_mocha_utils.js"></script>
   <script>
     LoopMochaUtils.trapErrors();
   </script>
 
   <!-- libs -->
-  <script src="../../content/panels/vendor/l10n.js"></script>
-  <script src="../../content/shared/vendor/react-0.13.3.js"></script>
-  <script src="../../content/shared/vendor/classnames-2.2.0.js"></script>
-  <script src="../../content/shared/vendor/backbone-1.2.1.js"></script>
+  <script src="../../content/libs/l10n.js"></script>
+  <script src="../../content/shared/libs/react-0.13.3.js"></script>
+  <script src="../../content/shared/libs/classnames-2.2.0.js"></script>
+  <script src="../../content/shared/libs/backbone-1.2.1.js"></script>
 
   <!-- test dependencies -->
   <script src="../shared/vendor/mocha-2.2.5.js"></script>
   <script src="../shared/vendor/chai-3.0.0.js"></script>
   <script src="../shared/vendor/sinon-1.16.1.js"></script>
   <script>
     /*global chai,mocha */
     chai.config.includeStack = true;
@@ -45,22 +45,22 @@
   <script src="../../content/shared/js/validate.js"></script>
   <script src="../../content/shared/js/dispatcher.js"></script>
   <script src="../../content/shared/js/otSdkDriver.js"></script>
   <script src="../../content/shared/js/store.js"></script>
   <script src="../../content/shared/js/activeRoomStore.js"></script>
   <script src="../../content/shared/js/views.js"></script>
   <script src="../../content/shared/js/textChatStore.js"></script>
   <script src="../../content/shared/js/textChatView.js"></script>
-  <script src="../../content/panels/js/conversationAppStore.js"></script>
-  <script src="../../content/panels/js/roomStore.js"></script>
-  <script src="../../content/panels/js/roomViews.js"></script>
-  <script src="../../content/panels/js/feedbackViews.js"></script>
-  <script src="../../content/panels/js/conversation.js"></script>
-  <script src="../../content/panels/js/panel.js"></script>
+  <script src="../../content/js/conversationAppStore.js"></script>
+  <script src="../../content/js/roomStore.js"></script>
+  <script src="../../content/js/roomViews.js"></script>
+  <script src="../../content/js/feedbackViews.js"></script>
+  <script src="../../content/js/conversation.js"></script>
+  <script src="../../content/js/panel.js"></script>
 
   <!-- Test scripts -->
   <script src="conversationAppStore_test.js"></script>
   <script src="conversation_test.js"></script>
   <script src="feedbackViews_test.js"></script>
   <script src="panel_test.js"></script>
   <script src="roomViews_test.js"></script>
   <script src="l10n_test.js"></script>
rename from browser/extensions/loop/test/desktop-local/l10n_test.js
rename to browser/components/loop/test/desktop-local/l10n_test.js
rename from browser/extensions/loop/test/desktop-local/panel_test.js
rename to browser/components/loop/test/desktop-local/panel_test.js
rename from browser/extensions/loop/test/desktop-local/roomStore_test.js
rename to browser/components/loop/test/desktop-local/roomStore_test.js
rename from browser/extensions/loop/test/desktop-local/roomViews_test.js
rename to browser/components/loop/test/desktop-local/roomViews_test.js
rename from browser/extensions/loop/test/desktop-local/test_desktop_all.py
rename to browser/components/loop/test/desktop-local/test_desktop_all.py
rename from browser/extensions/loop/test/functional/config.py
rename to browser/components/loop/test/functional/config.py
rename from browser/extensions/loop/test/functional/hanging_threads.py
rename to browser/components/loop/test/functional/hanging_threads.py
rename from browser/extensions/loop/test/functional/manifest.ini
rename to browser/components/loop/test/functional/manifest.ini
rename from browser/extensions/loop/test/functional/serversetup.py
rename to browser/components/loop/test/functional/serversetup.py
rename from browser/extensions/loop/test/functional/test_1_browser_call.py
rename to browser/components/loop/test/functional/test_1_browser_call.py
rename from browser/extensions/loop/test/index.html
rename to browser/components/loop/test/index.html
rename from browser/extensions/loop/test/karma/head.js
rename to browser/components/loop/test/karma/head.js
rename from browser/extensions/loop/test/karma/karma.conf.base.js
rename to browser/components/loop/test/karma/karma.conf.base.js
rename from browser/extensions/loop/test/karma/karma.coverage.desktop.js
rename to browser/components/loop/test/karma/karma.coverage.desktop.js
--- a/browser/extensions/loop/test/karma/karma.coverage.desktop.js
+++ b/browser/components/loop/test/karma/karma.coverage.desktop.js
@@ -5,52 +5,52 @@
 
 module.exports = function(config) {
   "use strict";
 
   var baseConfig = require("./karma.conf.base.js")(config);
 
   // List of files / patterns to load in the browser.
   baseConfig.files = baseConfig.files.concat([
-    "content/panels/vendor/l10n.js",
-    "content/shared/vendor/react-0.13.3.js",
-    "content/shared/vendor/classnames-2.2.0.js",
-    "content/shared/vendor/lodash-3.9.3.js",
-    "content/shared/vendor/backbone-1.2.1.js",
+    "content/libs/l10n.js",
+    "content/shared/libs/react-0.13.3.js",
+    "content/shared/libs/classnames-2.2.0.js",
+    "content/shared/libs/lodash-3.9.3.js",
+    "content/shared/libs/backbone-1.2.1.js",
     "test/shared/vendor/*.js",
     "test/shared/loop_mocha_utils.js",
     "test/karma/head.js", // Stub out DOM event listener due to races.
     "content/shared/js/loopapi-client.js",
     "content/shared/js/utils.js",
     "content/shared/js/models.js",
     "content/shared/js/mixins.js",
     "content/shared/js/actions.js",
     "content/shared/js/otSdkDriver.js",
     "content/shared/js/validate.js",
     "content/shared/js/dispatcher.js",
     "content/shared/js/store.js",
     "content/shared/js/activeRoomStore.js",
     "content/shared/js/views.js",
     "content/shared/js/textChatStore.js",
     "content/shared/js/textChatView.js",
-    "content/panels/js/feedbackViews.js",
-    "content/panels/js/conversationAppStore.js",
-    "content/panels/js/roomStore.js",
-    "content/panels/js/roomViews.js",
-    "content/panels/js/conversation.js",
+    "content/js/feedbackViews.js",
+    "content/js/conversationAppStore.js",
+    "content/js/roomStore.js",
+    "content/js/roomViews.js",
+    "content/js/conversation.js",
     "test/desktop-local/*.js"
   ]);
 
   // List of files to exclude.
   baseConfig.exclude = baseConfig.exclude.concat([
     "test/desktop-local/panel_test.js"
   ]);
 
   // Preprocess matching files before serving them to the browser.
   // Available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor .
   baseConfig.preprocessors = {
-    "content/panels/js/*.js": ["coverage"]
+    "content/js/*.js": ["coverage"]
   };
 
   baseConfig.coverageReporter.dir = "test/coverage/desktop";
 
   config.set(baseConfig);
 };
rename from browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
rename to browser/components/loop/test/karma/karma.coverage.shared_standalone.js
--- a/browser/extensions/loop/test/karma/karma.coverage.shared_standalone.js
+++ b/browser/components/loop/test/karma/karma.coverage.shared_standalone.js
@@ -6,21 +6,21 @@
 module.exports = function(config) {
   "use strict";
 
   var baseConfig = require("./karma.conf.base.js")(config);
 
   // List of files / patterns to load in the browser.
   baseConfig.files = baseConfig.files.concat([
     "standalone/content/libs/l10n-gaia-02ca67948fe8.js",
-    "content/shared/vendor/lodash-3.9.3.js",
-    "content/shared/vendor/backbone-1.2.1.js",
-    "content/shared/vendor/react-0.13.3.js",
-    "content/shared/vendor/classnames-2.2.0.js",
-    "content/shared/vendor/sdk.js",
+    "content/shared/libs/lodash-3.9.3.js",
+    "content/shared/libs/backbone-1.2.1.js",
+    "content/shared/libs/react-0.13.3.js",
+    "content/shared/libs/classnames-2.2.0.js",
+    "content/shared/libs/sdk.js",
     "test/shared/vendor/*.js",
     "test/shared/loop_mocha_utils.js",
     "test/karma/head.js", // Add test fixture container
     "content/shared/js/loopapi-client.js",
     "content/shared/js/utils.js",
     "content/shared/js/store.js",
     "content/shared/js/models.js",
     "content/shared/js/mixins.js",
rename from browser/extensions/loop/test/mochitest/.eslintrc
rename to browser/components/loop/test/mochitest/.eslintrc
rename from browser/extensions/loop/test/mochitest/browser.ini
rename to browser/components/loop/test/mochitest/browser.ini
rename from browser/extensions/loop/test/mochitest/browser_LoopRooms_channel.js
rename to browser/components/loop/test/mochitest/browser_LoopRooms_channel.js
--- a/browser/extensions/loop/test/mochitest/browser_LoopRooms_channel.js
+++ b/browser/components/loop/test/mochitest/browser_LoopRooms_channel.js
@@ -7,17 +7,17 @@
  * window.
  */
 "use strict";
 
 var { WebChannel } = Cu.import("resource://gre/modules/WebChannel.jsm", {});
 var { Chat } = Cu.import("resource:///modules/Chat.jsm", {});
 
 const TEST_URI =
-  "example.com/browser/browser/extensions/loop/test/mochitest/test_loopLinkClicker_channel.html";
+  "example.com/browser/browser/components/loop/test/mochitest/test_loopLinkClicker_channel.html";
 const TEST_URI_GOOD = Services.io.newURI("https://" + TEST_URI, null, null);
 const TEST_URI_BAD = Services.io.newURI("http://" + TEST_URI, null, null);
 
 const ROOM_TOKEN = "fake1234";
 const LINKCLICKER_URL_PREFNAME = "loop.linkClicker.url";
 
 var openChatOrig = Chat.open;
 
rename from browser/extensions/loop/test/mochitest/browser_fxa_login.js
rename to browser/components/loop/test/mochitest/browser_fxa_login.js
--- a/browser/extensions/loop/test/mochitest/browser_fxa_login.js
+++ b/browser/components/loop/test/mochitest/browser_fxa_login.js
@@ -3,17 +3,17 @@
 
 /**
  * Test FxA logins with Loop.
  */
 
 "use strict";
 
 const BASE_URL = Services.prefs.getCharPref("loop.server");
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
 
 function* checkFxA401() {
   let err = MozLoopService.errors.get("login");
   is(err.code, 401, "Check error code");
   is(err.friendlyMessage, getLoopString("could_not_authenticate"),
      "Check friendlyMessage");
   is(err.friendlyDetails, getLoopString("password_changed_question"),
      "Check friendlyDetails");
rename from browser/extensions/loop/test/mochitest/browser_loop_fxa_server.js
rename to browser/components/loop/test/mochitest/browser_loop_fxa_server.js
--- a/browser/extensions/loop/test/mochitest/browser_loop_fxa_server.js
+++ b/browser/components/loop/test/mochitest/browser_loop_fxa_server.js
@@ -2,17 +2,17 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Test the server mocking FxA integration endpoints on the Loop server.
  */
 
 "use strict";
 
-const BASE_URL = "http://mochi.test:8888/browser/browser/extensions/loop/test/mochitest/loop_fxa.sjs?";
+const BASE_URL = "http://mochi.test:8888/browser/browser/components/loop/test/mochitest/loop_fxa.sjs?";
 
 registerCleanupFunction(function* () {
   yield promiseDeletedOAuthParams(BASE_URL);
 });
 
 add_task(function* required_setup_params() {
   let params = {
     client_id: "my_client_id",
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
 var [, gHandlers] = LoopAPI.inspect();
 
 add_task(function* test_mozLoop_appVersionInfo() {
   let appVersionInfo;
   gHandlers.GetAppVersionInfo({}, result => appVersionInfo = result);
 
   Assert.ok(appVersionInfo, "should have appVersionInfo");
 
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_chat.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_chat.js
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_context.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_context.js
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_context.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_context.js
@@ -2,17 +2,17 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /*
  * This file contains tests for various context-in-conversations helpers in
  * LoopUI and Loop API.
  */
 "use strict";
 
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
 var [, gHandlers] = LoopAPI.inspect();
 
 function promiseGetMetadata() {
   return new Promise(resolve => gHandlers.GetSelectedTabMetadata({}, resolve));
 }
 
 add_task(function* test_mozLoop_getSelectedTabMetadata() {
   let metadata = yield promiseGetMetadata();
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_sharingListeners.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_sharingListeners.js
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_sharingListeners.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_sharingListeners.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /*
  * This file contains tests for the window.LoopUI active tab trackers.
  */
 "use strict";
 
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
 var [, gHandlers] = LoopAPI.inspect();
 
 var handlers = [
   { windowId: null }, { windowId: null }
 ];
 
 function promiseWindowId() {
   return new Promise(resolve => {
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_socialShare.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_socialShare.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 Cu.import("resource://gre/modules/Promise.jsm");
 const { SocialService } = Cu.import("resource://gre/modules/SocialService.jsm", {});
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
 
 var [, gHandlers] = LoopAPI.inspect();
 
 const kShareProvider = {
   name: "provider 1",
   origin: "https://example.com",
   iconURL: "https://example.com/browser/browser/base/content/test/general/moz.png",
   shareURL: "https://example.com/browser/browser/base/content/test/social/social_sidebar_empty.html"
rename from browser/extensions/loop/test/mochitest/browser_mozLoop_telemetry.js
rename to browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
--- a/browser/extensions/loop/test/mochitest/browser_mozLoop_telemetry.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
@@ -2,17 +2,17 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /*
  * This file contains tests for the mozLoop telemetry API.
  */
 
 "use strict";
 
-const { LoopAPI } = Cu.import("chrome://loop/content/modules/MozLoopAPI.jsm", {});
+const { LoopAPI } = Cu.import("resource:///modules/loop/MozLoopAPI.jsm", {});
 var [, gHandlers] = LoopAPI.inspect();
 var gConstants;
 gHandlers.GetAllConstants({}, constants => gConstants = constants);
 
 /**
  * Enable local telemetry recording for the duration of the tests.
  */
 add_task(function* test_initialize() {
rename from browser/extensions/loop/test/mochitest/browser_toolbarbutton.js
rename to browser/components/loop/test/mochitest/browser_toolbarbutton.js
--- a/browser/extensions/loop/test/mochitest/browser_toolbarbutton.js
+++ b/browser/components/loop/test/mochitest/browser_toolbarbutton.js
@@ -3,17 +3,17 @@
 
 /**
  * Test the toolbar button states.
  */
 
 "use strict";
 
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
-const { LoopRoomsInternal } = Components.utils.import("chrome://loop/content/modules/LoopRooms.jsm", {});
+const { LoopRoomsInternal } = Components.utils.import("resource:///modules/loop/LoopRooms.jsm", {});
 Services.prefs.setBoolPref("loop.gettingStarted.seen", true);
 
 const fxASampleToken = {
   token_type: "bearer",
   access_token: "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1752",
   scope: "profile"
 };
 
rename from browser/extensions/loop/test/mochitest/head.js
rename to browser/components/loop/test/mochitest/head.js
--- a/browser/extensions/loop/test/mochitest/head.js
+++ b/browser/components/loop/test/mochitest/head.js
@@ -3,18 +3,18 @@
 
 "use strict";
 
 const HAWK_TOKEN_LENGTH = 64;
 const {
   LOOP_SESSION_TYPE,
   MozLoopServiceInternal,
   MozLoopService
-} = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
-const { LoopRooms } = Cu.import("chrome://loop/content/modules/LoopRooms.jsm", {});
+} = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
+const { LoopRooms } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
 
 // Cache this value only once, at the beginning of a
 // test run, so that it doesn't pick up the offline=true
 // if offline mode is requested multiple times in a test run.
 const WAS_OFFLINE = Services.io.offline;
 
 function promisePanelLoaded() {
   return new Promise((resolve, reject) => {
@@ -128,17 +128,17 @@ function promiseOAuthParamsSetup(baseURL
     xhr.setRequestHeader("X-Params", JSON.stringify(params));
     xhr.addEventListener("load", () => resolve(xhr));
     xhr.addEventListener("error", error => reject(error));
     xhr.send();
   });
 }
 
 function* resetFxA() {
-  let global = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+  let global = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
   global.gHawkClient = null;
   global.gFxAOAuthClientPromise = null;
   global.gFxAOAuthClient = null;
   MozLoopServiceInternal.fxAOAuthProfile = null;
   MozLoopServiceInternal.fxAOAuthTokenData = null;
   const fxASessionPref = MozLoopServiceInternal.getSessionTokenPrefName(LOOP_SESSION_TYPE.FXA);
   Services.prefs.clearUserPref(fxASessionPref);
   MozLoopService.errors.clear();
@@ -147,17 +147,17 @@ function* resetFxA() {
   yield notified;
 }
 
 function checkFxAOAuthTokenData(aValue) {
   is(MozLoopServiceInternal.fxAOAuthTokenData, aValue, "fxAOAuthTokenData should be " + aValue);
 }
 
 function checkLoggedOutState() {
-  let global = Cu.import("chrome://loop/content/modules/MozLoopService.jsm", {});
+  let global = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
   is(global.gFxAOAuthClientPromise, null, "gFxAOAuthClientPromise should be cleared");
   is(MozLoopService.userProfile, null, "fxAOAuthProfile should be cleared");
   is(global.gFxAOAuthClient, null, "gFxAOAuthClient should be cleared");
   checkFxAOAuthTokenData(null);
   const fxASessionPref = MozLoopServiceInternal.getSessionTokenPrefName(LOOP_SESSION_TYPE.FXA);
   is(Services.prefs.getPrefType(fxASessionPref), Services.prefs.PREF_INVALID,
      "FxA hawk session should be cleared anyways");
 }
rename from browser/extensions/loop/test/mochitest/loop_fxa.sjs
rename to browser/components/loop/test/mochitest/loop_fxa.sjs
rename from browser/extensions/loop/test/mochitest/test_loopLinkClicker_channel.html
rename to browser/components/loop/test/mochitest/test_loopLinkClicker_channel.html
rename from browser/extensions/loop/test/package.json
rename to browser/components/loop/test/package.json
rename from browser/extensions/loop/test/shared/activeRoomStore_test.js
rename to browser/components/loop/test/shared/activeRoomStore_test.js
rename from browser/extensions/loop/test/shared/crypto_test.js
rename to browser/components/loop/test/shared/crypto_test.js
rename from browser/extensions/loop/test/shared/dispatcher_test.js
rename to browser/components/loop/test/shared/dispatcher_test.js
rename from browser/extensions/loop/test/shared/frontend_tester.py
rename to browser/components/loop/test/shared/frontend_tester.py
rename from browser/extensions/loop/test/shared/index.html
rename to browser/components/loop/test/shared/index.html
--- a/browser/extensions/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -9,26 +9,26 @@
   <link rel="stylesheet" media="all" href="vendor/mocha-2.2.5.css">
 </head>
 <body>
   <div id="mocha">
     <p><a href="../">Index</a></p>
   </div>
   <div id="messages"></div>
   <div id="fixtures"></div>
-  <script src="../../content/shared/vendor/lodash-3.9.3.js"></script>
+  <script src="../../content/shared/libs/lodash-3.9.3.js"></script>
   <script src="../shared/loop_mocha_utils.js"></script>
   <script>
     LoopMochaUtils.trapErrors();
   </script>
 
   <!-- libs -->
-  <script src="../../content/shared/vendor/react-0.13.3.js"></script>
-  <script src="../../content/shared/vendor/classnames-2.2.0.js"></script>
-  <script src="../../content/shared/vendor/backbone-1.2.1.js"></script>
+  <script src="../../content/shared/libs/react-0.13.3.js"></script>
+  <script src="../../content/shared/libs/classnames-2.2.0.js"></script>
+  <script src="../../content/shared/libs/backbone-1.2.1.js"></script>
   <script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
 
   <!-- test dependencies -->
   <script src="vendor/mocha-2.2.5.js"></script>
   <script src="vendor/chai-3.0.0.js"></script>
   <script src="vendor/chai-as-promised-5.1.0.js"></script>
   <script src="vendor/sinon-1.16.1.js"></script>
   <script>
rename from browser/extensions/loop/test/shared/linkifiedTextView_test.js
rename to browser/components/loop/test/shared/linkifiedTextView_test.js
rename from browser/extensions/loop/test/shared/loop_mocha_utils.js
rename to browser/components/loop/test/shared/loop_mocha_utils.js
rename from browser/extensions/loop/test/shared/loopapi-client_test.js
rename to browser/components/loop/test/shared/loopapi-client_test.js
rename from browser/extensions/loop/test/shared/mixins_test.js
rename to browser/components/loop/test/shared/mixins_test.js
rename from browser/extensions/loop/test/shared/models_test.js
rename to browser/components/loop/test/shared/models_test.js
rename from browser/extensions/loop/test/shared/otSdkDriver_test.js
rename to browser/components/loop/test/shared/otSdkDriver_test.js
rename from browser/extensions/loop/test/shared/sdk_mock.js
rename to browser/components/loop/test/shared/sdk_mock.js
rename from browser/extensions/loop/test/shared/store_test.js
rename to browser/components/loop/test/shared/store_test.js
rename from browser/extensions/loop/test/shared/test_shared_all.py
rename to browser/components/loop/test/shared/test_shared_all.py
rename from browser/extensions/loop/test/shared/textChatStore_test.js
rename to browser/components/loop/test/shared/textChatStore_test.js
rename from browser/extensions/loop/test/shared/textChatView_test.js
rename to browser/components/loop/test/shared/textChatView_test.js
rename from browser/extensions/loop/test/shared/utils_test.js
rename to browser/components/loop/test/shared/utils_test.js
rename from browser/extensions/loop/test/shared/validate_test.js
rename to browser/components/loop/test/shared/validate_test.js
rename from browser/extensions/loop/test/shared/vendor/chai-3.0.0.js
rename to browser/components/loop/test/shared/vendor/chai-3.0.0.js
rename from browser/extensions/loop/test/shared/vendor/chai-as-promised-5.1.0.js
rename to browser/components/loop/test/shared/vendor/chai-as-promised-5.1.0.js
rename from browser/extensions/loop/test/shared/vendor/mocha-2.2.5.css
rename to browser/components/loop/test/shared/vendor/mocha-2.2.5.css
rename from browser/extensions/loop/test/shared/vendor/mocha-2.2.5.js
rename to browser/components/loop/test/shared/vendor/mocha-2.2.5.js
rename from browser/extensions/loop/test/shared/vendor/sinon-1.16.1.js
rename to browser/components/loop/test/shared/vendor/sinon-1.16.1.js
rename from browser/extensions/loop/test/shared/views_test.js
rename to browser/components/loop/test/shared/views_test.js
--- a/browser/extensions/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -835,17 +835,17 @@ describe("loop.shared.views", function()
 
     it("should use a default thumbnail for desktop if one is not supplied", function() {
       view = mountTestComponent({
         useDesktopPaths: true,
         url: "http://wonderful.invalid"
       });
 
       expect(view.getDOMNode().querySelector(".context-preview").getAttribute("src"))
-        .eql("shared/img/icons-16x16.svg#globe");
+        .eql("loop/shared/img/icons-16x16.svg#globe");
     });
 
     it("should not display a title if by default", function() {
       view = mountTestComponent({
         url: "http://wonderful.invalid"
       });
 
       expect(view.getDOMNode().querySelector(".context-content > p")).eql(null);
rename from browser/extensions/loop/test/standalone/index.html
rename to browser/components/loop/test/standalone/index.html
--- a/browser/extensions/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -9,26 +9,26 @@
   <link rel="stylesheet" media="all" href="../shared/vendor/mocha-2.2.5.css">
 </head>
 <body>
   <div id="mocha">
     <p><a href="../">Index</a></p>
  </div>
   <div id="messages"></div>
   <div id="fixtures"></div>
-  <script src="../../content/shared/vendor/lodash-3.9.3.js"></script>
+  <script src="../../content/shared/libs/lodash-3.9.3.js"></script>
   <script src="../shared/loop_mocha_utils.js"></script>
   <script>
     LoopMochaUtils.trapErrors();
   </script>
 
   <!-- libs -->
-  <script src="../../content/shared/vendor/react-0.13.3.js"></script>
-  <script src="../../content/shared/vendor/classnames-2.2.0.js"></script>
-  <script src="../../content/shared/vendor/backbone-1.2.1.js"></script>
+  <script src="../../content/shared/libs/react-0.13.3.js"></script>
+  <script src="../../content/shared/libs/classnames-2.2.0.js"></script>
+  <script src="../../content/shared/libs/backbone-1.2.1.js"></script>
   <script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
   <!-- test dependencies -->
   <script src="../shared/vendor/mocha-2.2.5.js"></script>
   <script src="../shared/vendor/chai-3.0.0.js"></script>
   <script src="../shared/vendor/sinon-1.16.1.js"></script>
   <script src="../shared/sdk_mock.js"></script>
   <script>
     chai.config.includeStack = true;
rename from browser/extensions/loop/test/standalone/standaloneAppStore_test.js
rename to browser/components/loop/test/standalone/standaloneAppStore_test.js
rename from browser/extensions/loop/test/standalone/standaloneMetricsStore_test.js
rename to browser/components/loop/test/standa