diff --git a/browser/devtools/.eslintignore b/devtools/client/.eslintignore
similarity index 100%
rename from browser/devtools/.eslintignore
rename to devtools/client/.eslintignore
diff --git a/browser/devtools/.eslintrc b/devtools/client/.eslintrc
similarity index 100%
rename from browser/devtools/.eslintrc
rename to devtools/client/.eslintrc
diff --git a/browser/devtools/.eslintrc.mochitests b/devtools/client/.eslintrc.mochitests
similarity index 100%
rename from browser/devtools/.eslintrc.mochitests
rename to devtools/client/.eslintrc.mochitests
diff --git a/browser/devtools/.eslintrc.xpcshell b/devtools/client/.eslintrc.xpcshell
similarity index 100%
rename from browser/devtools/.eslintrc.xpcshell
rename to devtools/client/.eslintrc.xpcshell
diff --git a/browser/devtools/animationinspector/animation-controller.js b/devtools/client/animationinspector/animation-controller.js
similarity index 100%
rename from browser/devtools/animationinspector/animation-controller.js
rename to devtools/client/animationinspector/animation-controller.js
diff --git a/browser/devtools/animationinspector/animation-inspector.xhtml b/devtools/client/animationinspector/animation-inspector.xhtml
similarity index 100%
rename from browser/devtools/animationinspector/animation-inspector.xhtml
rename to devtools/client/animationinspector/animation-inspector.xhtml
diff --git a/browser/devtools/animationinspector/animation-panel.js b/devtools/client/animationinspector/animation-panel.js
similarity index 100%
rename from browser/devtools/animationinspector/animation-panel.js
rename to devtools/client/animationinspector/animation-panel.js
diff --git a/browser/devtools/animationinspector/components.js b/devtools/client/animationinspector/components.js
similarity index 100%
rename from browser/devtools/animationinspector/components.js
rename to devtools/client/animationinspector/components.js
diff --git a/browser/devtools/animationinspector/moz.build b/devtools/client/animationinspector/moz.build
similarity index 100%
rename from browser/devtools/animationinspector/moz.build
rename to devtools/client/animationinspector/moz.build
diff --git a/browser/devtools/animationinspector/test/.eslintrc b/devtools/client/animationinspector/test/.eslintrc
similarity index 100%
rename from browser/devtools/animationinspector/test/.eslintrc
rename to devtools/client/animationinspector/test/.eslintrc
diff --git a/browser/devtools/animationinspector/test/browser.ini b/devtools/client/animationinspector/test/browser.ini
similarity index 100%
rename from browser/devtools/animationinspector/test/browser.ini
rename to devtools/client/animationinspector/test/browser.ini
diff --git a/browser/devtools/animationinspector/test/browser_animation_controller_exposes_document_currentTime.js b/devtools/client/animationinspector/test/browser_animation_controller_exposes_document_currentTime.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_controller_exposes_document_currentTime.js
rename to devtools/client/animationinspector/test/browser_animation_controller_exposes_document_currentTime.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_empty_on_invalid_nodes.js b/devtools/client/animationinspector/test/browser_animation_empty_on_invalid_nodes.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_empty_on_invalid_nodes.js
rename to devtools/client/animationinspector/test/browser_animation_empty_on_invalid_nodes.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_mutations_with_same_names.js b/devtools/client/animationinspector/test/browser_animation_mutations_with_same_names.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_mutations_with_same_names.js
rename to devtools/client/animationinspector/test/browser_animation_mutations_with_same_names.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_panel_exists.js b/devtools/client/animationinspector/test/browser_animation_panel_exists.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_panel_exists.js
rename to devtools/client/animationinspector/test/browser_animation_panel_exists.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_participate_in_inspector_update.js b/devtools/client/animationinspector/test/browser_animation_participate_in_inspector_update.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_participate_in_inspector_update.js
rename to devtools/client/animationinspector/test/browser_animation_participate_in_inspector_update.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js b/devtools/client/animationinspector/test/browser_animation_playerFronts_are_refreshed.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js
rename to devtools/client/animationinspector/test/browser_animation_playerFronts_are_refreshed.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js b/devtools/client/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js
rename to devtools/client/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_playerWidgets_target_nodes.js b/devtools/client/animationinspector/test/browser_animation_playerWidgets_target_nodes.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_playerWidgets_target_nodes.js
rename to devtools/client/animationinspector/test/browser_animation_playerWidgets_target_nodes.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_refresh_on_added_animation.js b/devtools/client/animationinspector/test/browser_animation_refresh_on_added_animation.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_refresh_on_added_animation.js
rename to devtools/client/animationinspector/test/browser_animation_refresh_on_added_animation.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_refresh_on_removed_animation.js b/devtools/client/animationinspector/test/browser_animation_refresh_on_removed_animation.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_refresh_on_removed_animation.js
rename to devtools/client/animationinspector/test/browser_animation_refresh_on_removed_animation.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_refresh_when_active.js b/devtools/client/animationinspector/test/browser_animation_refresh_when_active.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_refresh_when_active.js
rename to devtools/client/animationinspector/test/browser_animation_refresh_when_active.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js b/devtools/client/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js
rename to devtools/client/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_shows_player_on_valid_node.js b/devtools/client/animationinspector/test/browser_animation_shows_player_on_valid_node.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_shows_player_on_valid_node.js
rename to devtools/client/animationinspector/test/browser_animation_shows_player_on_valid_node.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_target_highlight_select.js b/devtools/client/animationinspector/test/browser_animation_target_highlight_select.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_target_highlight_select.js
rename to devtools/client/animationinspector/test/browser_animation_target_highlight_select.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_header.js b/devtools/client/animationinspector/test/browser_animation_timeline_header.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_header.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_header.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_pause_button.js b/devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_pause_button.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_exists.js b/devtools/client/animationinspector/test/browser_animation_timeline_scrubber_exists.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_exists.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_scrubber_exists.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_movable.js b/devtools/client/animationinspector/test/browser_animation_timeline_scrubber_movable.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_movable.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_scrubber_movable.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_moves.js b/devtools/client/animationinspector/test/browser_animation_timeline_scrubber_moves.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_moves.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_scrubber_moves.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_shows_delay.js b/devtools/client/animationinspector/test/browser_animation_timeline_shows_delay.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_shows_delay.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_shows_delay.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_shows_iterations.js b/devtools/client/animationinspector/test/browser_animation_timeline_shows_iterations.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_shows_iterations.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_shows_iterations.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_shows_time_info.js b/devtools/client/animationinspector/test/browser_animation_timeline_shows_time_info.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_shows_time_info.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_shows_time_info.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_takes_rate_into_account.js b/devtools/client/animationinspector/test/browser_animation_timeline_takes_rate_into_account.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_takes_rate_into_account.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_takes_rate_into_account.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_timeline_ui.js b/devtools/client/animationinspector/test/browser_animation_timeline_ui.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_timeline_ui.js
rename to devtools/client/animationinspector/test/browser_animation_timeline_ui.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js b/devtools/client/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js
rename to devtools/client/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_toggle_button_toggles_animations.js b/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
rename to devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js b/devtools/client/animationinspector/test/browser_animation_toolbar_exists.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js
rename to devtools/client/animationinspector/test/browser_animation_toolbar_exists.js
diff --git a/browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js b/devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js
similarity index 100%
rename from browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js
rename to devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js
diff --git a/browser/devtools/animationinspector/test/doc_body_animation.html b/devtools/client/animationinspector/test/doc_body_animation.html
similarity index 100%
rename from browser/devtools/animationinspector/test/doc_body_animation.html
rename to devtools/client/animationinspector/test/doc_body_animation.html
diff --git a/browser/devtools/animationinspector/test/doc_frame_script.js b/devtools/client/animationinspector/test/doc_frame_script.js
similarity index 100%
rename from browser/devtools/animationinspector/test/doc_frame_script.js
rename to devtools/client/animationinspector/test/doc_frame_script.js
diff --git a/browser/devtools/animationinspector/test/doc_modify_playbackRate.html b/devtools/client/animationinspector/test/doc_modify_playbackRate.html
similarity index 100%
rename from browser/devtools/animationinspector/test/doc_modify_playbackRate.html
rename to devtools/client/animationinspector/test/doc_modify_playbackRate.html
diff --git a/browser/devtools/animationinspector/test/doc_negative_animation.html b/devtools/client/animationinspector/test/doc_negative_animation.html
similarity index 100%
rename from browser/devtools/animationinspector/test/doc_negative_animation.html
rename to devtools/client/animationinspector/test/doc_negative_animation.html
diff --git a/browser/devtools/animationinspector/test/doc_simple_animation.html b/devtools/client/animationinspector/test/doc_simple_animation.html
similarity index 100%
rename from browser/devtools/animationinspector/test/doc_simple_animation.html
rename to devtools/client/animationinspector/test/doc_simple_animation.html
diff --git a/browser/devtools/animationinspector/test/head.js b/devtools/client/animationinspector/test/head.js
similarity index 100%
rename from browser/devtools/animationinspector/test/head.js
rename to devtools/client/animationinspector/test/head.js
diff --git a/browser/devtools/animationinspector/test/unit/.eslintrc b/devtools/client/animationinspector/test/unit/.eslintrc
similarity index 100%
rename from browser/devtools/animationinspector/test/unit/.eslintrc
rename to devtools/client/animationinspector/test/unit/.eslintrc
diff --git a/browser/devtools/animationinspector/test/unit/test_findOptimalTimeInterval.js b/devtools/client/animationinspector/test/unit/test_findOptimalTimeInterval.js
similarity index 100%
rename from browser/devtools/animationinspector/test/unit/test_findOptimalTimeInterval.js
rename to devtools/client/animationinspector/test/unit/test_findOptimalTimeInterval.js
diff --git a/browser/devtools/animationinspector/test/unit/test_timeScale.js b/devtools/client/animationinspector/test/unit/test_timeScale.js
similarity index 100%
rename from browser/devtools/animationinspector/test/unit/test_timeScale.js
rename to devtools/client/animationinspector/test/unit/test_timeScale.js
diff --git a/browser/devtools/animationinspector/test/unit/xpcshell.ini b/devtools/client/animationinspector/test/unit/xpcshell.ini
similarity index 100%
rename from browser/devtools/animationinspector/test/unit/xpcshell.ini
rename to devtools/client/animationinspector/test/unit/xpcshell.ini
diff --git a/browser/devtools/animationinspector/utils.js b/devtools/client/animationinspector/utils.js
similarity index 100%
rename from browser/devtools/animationinspector/utils.js
rename to devtools/client/animationinspector/utils.js
diff --git a/browser/devtools/app-manager/app-projects.js b/devtools/client/app-manager/app-projects.js
similarity index 100%
rename from browser/devtools/app-manager/app-projects.js
rename to devtools/client/app-manager/app-projects.js
diff --git a/browser/devtools/app-manager/app-validator.js b/devtools/client/app-manager/app-validator.js
similarity index 100%
rename from browser/devtools/app-manager/app-validator.js
rename to devtools/client/app-manager/app-validator.js
diff --git a/browser/devtools/app-manager/builtin-adb-store.js b/devtools/client/app-manager/builtin-adb-store.js
similarity index 100%
rename from browser/devtools/app-manager/builtin-adb-store.js
rename to devtools/client/app-manager/builtin-adb-store.js
diff --git a/browser/devtools/app-manager/connection-store.js b/devtools/client/app-manager/connection-store.js
similarity index 100%
rename from browser/devtools/app-manager/connection-store.js
rename to devtools/client/app-manager/connection-store.js
diff --git a/browser/devtools/app-manager/content/connection-footer.js b/devtools/client/app-manager/content/connection-footer.js
similarity index 100%
rename from browser/devtools/app-manager/content/connection-footer.js
rename to devtools/client/app-manager/content/connection-footer.js
diff --git a/browser/devtools/app-manager/content/connection-footer.xhtml b/devtools/client/app-manager/content/connection-footer.xhtml
similarity index 100%
rename from browser/devtools/app-manager/content/connection-footer.xhtml
rename to devtools/client/app-manager/content/connection-footer.xhtml
diff --git a/browser/devtools/app-manager/content/device.js b/devtools/client/app-manager/content/device.js
similarity index 100%
rename from browser/devtools/app-manager/content/device.js
rename to devtools/client/app-manager/content/device.js
diff --git a/browser/devtools/app-manager/content/device.xhtml b/devtools/client/app-manager/content/device.xhtml
similarity index 100%
rename from browser/devtools/app-manager/content/device.xhtml
rename to devtools/client/app-manager/content/device.xhtml
diff --git a/browser/devtools/app-manager/content/help.xhtml b/devtools/client/app-manager/content/help.xhtml
similarity index 100%
rename from browser/devtools/app-manager/content/help.xhtml
rename to devtools/client/app-manager/content/help.xhtml
diff --git a/browser/devtools/app-manager/content/index.js b/devtools/client/app-manager/content/index.js
similarity index 100%
rename from browser/devtools/app-manager/content/index.js
rename to devtools/client/app-manager/content/index.js
diff --git a/browser/devtools/app-manager/content/index.xul b/devtools/client/app-manager/content/index.xul
similarity index 100%
rename from browser/devtools/app-manager/content/index.xul
rename to devtools/client/app-manager/content/index.xul
diff --git a/browser/devtools/app-manager/content/manifest-editor.js b/devtools/client/app-manager/content/manifest-editor.js
similarity index 100%
rename from browser/devtools/app-manager/content/manifest-editor.js
rename to devtools/client/app-manager/content/manifest-editor.js
diff --git a/browser/devtools/app-manager/content/projects.js b/devtools/client/app-manager/content/projects.js
similarity index 100%
rename from browser/devtools/app-manager/content/projects.js
rename to devtools/client/app-manager/content/projects.js
diff --git a/browser/devtools/app-manager/content/projects.xhtml b/devtools/client/app-manager/content/projects.xhtml
similarity index 100%
rename from browser/devtools/app-manager/content/projects.xhtml
rename to devtools/client/app-manager/content/projects.xhtml
diff --git a/browser/devtools/app-manager/content/template.js b/devtools/client/app-manager/content/template.js
similarity index 100%
rename from browser/devtools/app-manager/content/template.js
rename to devtools/client/app-manager/content/template.js
diff --git a/browser/devtools/app-manager/content/utils.js b/devtools/client/app-manager/content/utils.js
similarity index 100%
rename from browser/devtools/app-manager/content/utils.js
rename to devtools/client/app-manager/content/utils.js
diff --git a/browser/devtools/app-manager/device-store.js b/devtools/client/app-manager/device-store.js
similarity index 100%
rename from browser/devtools/app-manager/device-store.js
rename to devtools/client/app-manager/device-store.js
diff --git a/browser/devtools/app-manager/moz.build b/devtools/client/app-manager/moz.build
similarity index 100%
rename from browser/devtools/app-manager/moz.build
rename to devtools/client/app-manager/moz.build
diff --git a/browser/devtools/app-manager/simulators-store.js b/devtools/client/app-manager/simulators-store.js
similarity index 100%
rename from browser/devtools/app-manager/simulators-store.js
rename to devtools/client/app-manager/simulators-store.js
diff --git a/browser/devtools/app-manager/test/.eslintrc b/devtools/client/app-manager/test/.eslintrc
similarity index 100%
rename from browser/devtools/app-manager/test/.eslintrc
rename to devtools/client/app-manager/test/.eslintrc
diff --git a/browser/devtools/app-manager/test/browser.ini b/devtools/client/app-manager/test/browser.ini
similarity index 100%
rename from browser/devtools/app-manager/test/browser.ini
rename to devtools/client/app-manager/test/browser.ini
diff --git a/browser/devtools/app-manager/test/browser_manifest_editor.js b/devtools/client/app-manager/test/browser_manifest_editor.js
similarity index 100%
rename from browser/devtools/app-manager/test/browser_manifest_editor.js
rename to devtools/client/app-manager/test/browser_manifest_editor.js
diff --git a/browser/devtools/app-manager/test/chrome.ini b/devtools/client/app-manager/test/chrome.ini
similarity index 100%
rename from browser/devtools/app-manager/test/chrome.ini
rename to devtools/client/app-manager/test/chrome.ini
diff --git a/browser/devtools/app-manager/test/head.js b/devtools/client/app-manager/test/head.js
similarity index 100%
rename from browser/devtools/app-manager/test/head.js
rename to devtools/client/app-manager/test/head.js
diff --git a/browser/devtools/app-manager/test/hosted_app.manifest b/devtools/client/app-manager/test/hosted_app.manifest
similarity index 100%
rename from browser/devtools/app-manager/test/hosted_app.manifest
rename to devtools/client/app-manager/test/hosted_app.manifest
diff --git a/browser/devtools/app-manager/test/manifest.webapp b/devtools/client/app-manager/test/manifest.webapp
similarity index 100%
rename from browser/devtools/app-manager/test/manifest.webapp
rename to devtools/client/app-manager/test/manifest.webapp
diff --git a/browser/devtools/app-manager/test/test_app_validator.html b/devtools/client/app-manager/test/test_app_validator.html
similarity index 100%
rename from browser/devtools/app-manager/test/test_app_validator.html
rename to devtools/client/app-manager/test/test_app_validator.html
diff --git a/browser/devtools/app-manager/test/test_connection_store.html b/devtools/client/app-manager/test/test_connection_store.html
similarity index 100%
rename from browser/devtools/app-manager/test/test_connection_store.html
rename to devtools/client/app-manager/test/test_connection_store.html
diff --git a/browser/devtools/app-manager/test/test_device_store.html b/devtools/client/app-manager/test/test_device_store.html
similarity index 100%
rename from browser/devtools/app-manager/test/test_device_store.html
rename to devtools/client/app-manager/test/test_device_store.html
diff --git a/browser/devtools/app-manager/test/test_projects_store.html b/devtools/client/app-manager/test/test_projects_store.html
similarity index 100%
rename from browser/devtools/app-manager/test/test_projects_store.html
rename to devtools/client/app-manager/test/test_projects_store.html
diff --git a/browser/devtools/app-manager/test/test_remain_connected.html b/devtools/client/app-manager/test/test_remain_connected.html
similarity index 100%
rename from browser/devtools/app-manager/test/test_remain_connected.html
rename to devtools/client/app-manager/test/test_remain_connected.html
diff --git a/browser/devtools/app-manager/test/test_template.html b/devtools/client/app-manager/test/test_template.html
similarity index 100%
rename from browser/devtools/app-manager/test/test_template.html
rename to devtools/client/app-manager/test/test_template.html
diff --git a/browser/devtools/app-manager/test/validator/no-name-or-icon/home.html b/devtools/client/app-manager/test/validator/no-name-or-icon/home.html
similarity index 100%
rename from browser/devtools/app-manager/test/validator/no-name-or-icon/home.html
rename to devtools/client/app-manager/test/validator/no-name-or-icon/home.html
diff --git a/browser/devtools/app-manager/test/validator/no-name-or-icon/manifest.webapp b/devtools/client/app-manager/test/validator/no-name-or-icon/manifest.webapp
similarity index 100%
rename from browser/devtools/app-manager/test/validator/no-name-or-icon/manifest.webapp
rename to devtools/client/app-manager/test/validator/no-name-or-icon/manifest.webapp
diff --git a/browser/devtools/app-manager/test/validator/non-absolute-path/manifest.webapp b/devtools/client/app-manager/test/validator/non-absolute-path/manifest.webapp
similarity index 100%
rename from browser/devtools/app-manager/test/validator/non-absolute-path/manifest.webapp
rename to devtools/client/app-manager/test/validator/non-absolute-path/manifest.webapp
diff --git a/browser/devtools/app-manager/test/validator/valid/alsoValid/manifest.webapp b/devtools/client/app-manager/test/validator/valid/alsoValid/manifest.webapp
similarity index 100%
rename from browser/devtools/app-manager/test/validator/valid/alsoValid/manifest.webapp
rename to devtools/client/app-manager/test/validator/valid/alsoValid/manifest.webapp
diff --git a/browser/devtools/app-manager/test/validator/valid/home.html b/devtools/client/app-manager/test/validator/valid/home.html
similarity index 100%
rename from browser/devtools/app-manager/test/validator/valid/home.html
rename to devtools/client/app-manager/test/validator/valid/home.html
diff --git a/browser/devtools/app-manager/test/validator/valid/icon.png b/devtools/client/app-manager/test/validator/valid/icon.png
similarity index 100%
rename from browser/devtools/app-manager/test/validator/valid/icon.png
rename to devtools/client/app-manager/test/validator/valid/icon.png
diff --git a/browser/devtools/app-manager/test/validator/valid/manifest.webapp b/devtools/client/app-manager/test/validator/valid/manifest.webapp
similarity index 100%
rename from browser/devtools/app-manager/test/validator/valid/manifest.webapp
rename to devtools/client/app-manager/test/validator/valid/manifest.webapp
diff --git a/browser/devtools/app-manager/test/validator/wrong-launch-path/icon.png b/devtools/client/app-manager/test/validator/wrong-launch-path/icon.png
similarity index 100%
rename from browser/devtools/app-manager/test/validator/wrong-launch-path/icon.png
rename to devtools/client/app-manager/test/validator/wrong-launch-path/icon.png
diff --git a/browser/devtools/app-manager/test/validator/wrong-launch-path/manifest.webapp b/devtools/client/app-manager/test/validator/wrong-launch-path/manifest.webapp
similarity index 100%
rename from browser/devtools/app-manager/test/validator/wrong-launch-path/manifest.webapp
rename to devtools/client/app-manager/test/validator/wrong-launch-path/manifest.webapp
diff --git a/browser/devtools/app-manager/webapps-store.js b/devtools/client/app-manager/webapps-store.js
similarity index 100%
rename from browser/devtools/app-manager/webapps-store.js
rename to devtools/client/app-manager/webapps-store.js
diff --git a/browser/devtools/canvasdebugger/callslist.js b/devtools/client/canvasdebugger/callslist.js
similarity index 100%
rename from browser/devtools/canvasdebugger/callslist.js
rename to devtools/client/canvasdebugger/callslist.js
diff --git a/browser/devtools/canvasdebugger/canvasdebugger.js b/devtools/client/canvasdebugger/canvasdebugger.js
similarity index 100%
rename from browser/devtools/canvasdebugger/canvasdebugger.js
rename to devtools/client/canvasdebugger/canvasdebugger.js
diff --git a/browser/devtools/canvasdebugger/canvasdebugger.xul b/devtools/client/canvasdebugger/canvasdebugger.xul
similarity index 100%
rename from browser/devtools/canvasdebugger/canvasdebugger.xul
rename to devtools/client/canvasdebugger/canvasdebugger.xul
diff --git a/browser/devtools/canvasdebugger/moz.build b/devtools/client/canvasdebugger/moz.build
similarity index 100%
rename from browser/devtools/canvasdebugger/moz.build
rename to devtools/client/canvasdebugger/moz.build
diff --git a/browser/devtools/canvasdebugger/panel.js b/devtools/client/canvasdebugger/panel.js
similarity index 100%
rename from browser/devtools/canvasdebugger/panel.js
rename to devtools/client/canvasdebugger/panel.js
diff --git a/browser/devtools/canvasdebugger/snapshotslist.js b/devtools/client/canvasdebugger/snapshotslist.js
similarity index 100%
rename from browser/devtools/canvasdebugger/snapshotslist.js
rename to devtools/client/canvasdebugger/snapshotslist.js
diff --git a/browser/devtools/canvasdebugger/test/.eslintrc b/devtools/client/canvasdebugger/test/.eslintrc
similarity index 100%
rename from browser/devtools/canvasdebugger/test/.eslintrc
rename to devtools/client/canvasdebugger/test/.eslintrc
diff --git a/browser/devtools/canvasdebugger/test/browser.ini b/devtools/client/canvasdebugger/test/browser.ini
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser.ini
rename to devtools/client/canvasdebugger/test/browser.ini
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-01.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-02.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-03.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-03.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-03.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-03.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-04.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-04.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-04.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-04.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-05.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-05.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-05.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-05.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-06.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-06.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-06.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-06.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-07.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-07.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-07.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-07.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-08.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-08.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-08.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-08.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-09.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-09.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-09.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-09.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-10.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-10.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-10.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-10.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-11.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-11.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-11.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-11.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-12.js b/devtools/client/canvasdebugger/test/browser_canvas-actor-test-12.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-actor-test-12.js
rename to devtools/client/canvasdebugger/test/browser_canvas-actor-test-12.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-highlight.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-call-highlight.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-highlight.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-call-highlight.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-list.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-call-list.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-list.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-call-list.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-search.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-call-search.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-search.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-call-search.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-03.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-03.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-03.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-03.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-clear.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-clear.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-clear.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-clear.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-screenshots.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-img-screenshots.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-screenshots.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-img-screenshots.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-open.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-open.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-open.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-open.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-record-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-record-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-record-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-record-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-03.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-record-03.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-03.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-record-03.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-04.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-record-04.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-04.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-record-04.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-reload-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-reload-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-reload-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-reload-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-slider-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-slider-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-slider-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-slider-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-slider-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-slider-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-slider-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-slider-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stepping.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-stepping.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-stepping.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-stepping.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-01.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-stop-01.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-01.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-stop-01.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-02.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-stop-02.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-02.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-stop-02.js
diff --git a/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-03.js b/devtools/client/canvasdebugger/test/browser_canvas-frontend-stop-03.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-03.js
rename to devtools/client/canvasdebugger/test/browser_canvas-frontend-stop-03.js
diff --git a/browser/devtools/canvasdebugger/test/browser_profiling-canvas.js b/devtools/client/canvasdebugger/test/browser_profiling-canvas.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_profiling-canvas.js
rename to devtools/client/canvasdebugger/test/browser_profiling-canvas.js
diff --git a/browser/devtools/canvasdebugger/test/browser_profiling-webgl.js b/devtools/client/canvasdebugger/test/browser_profiling-webgl.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/browser_profiling-webgl.js
rename to devtools/client/canvasdebugger/test/browser_profiling-webgl.js
diff --git a/browser/devtools/canvasdebugger/test/doc_no-canvas.html b/devtools/client/canvasdebugger/test/doc_no-canvas.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_no-canvas.html
rename to devtools/client/canvasdebugger/test/doc_no-canvas.html
diff --git a/browser/devtools/canvasdebugger/test/doc_raf-begin.html b/devtools/client/canvasdebugger/test/doc_raf-begin.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_raf-begin.html
rename to devtools/client/canvasdebugger/test/doc_raf-begin.html
diff --git a/browser/devtools/canvasdebugger/test/doc_raf-no-canvas.html b/devtools/client/canvasdebugger/test/doc_raf-no-canvas.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_raf-no-canvas.html
rename to devtools/client/canvasdebugger/test/doc_raf-no-canvas.html
diff --git a/browser/devtools/canvasdebugger/test/doc_settimeout.html b/devtools/client/canvasdebugger/test/doc_settimeout.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_settimeout.html
rename to devtools/client/canvasdebugger/test/doc_settimeout.html
diff --git a/browser/devtools/canvasdebugger/test/doc_simple-canvas-bitmasks.html b/devtools/client/canvasdebugger/test/doc_simple-canvas-bitmasks.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_simple-canvas-bitmasks.html
rename to devtools/client/canvasdebugger/test/doc_simple-canvas-bitmasks.html
diff --git a/browser/devtools/canvasdebugger/test/doc_simple-canvas-deep-stack.html b/devtools/client/canvasdebugger/test/doc_simple-canvas-deep-stack.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_simple-canvas-deep-stack.html
rename to devtools/client/canvasdebugger/test/doc_simple-canvas-deep-stack.html
diff --git a/browser/devtools/canvasdebugger/test/doc_simple-canvas-transparent.html b/devtools/client/canvasdebugger/test/doc_simple-canvas-transparent.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_simple-canvas-transparent.html
rename to devtools/client/canvasdebugger/test/doc_simple-canvas-transparent.html
diff --git a/browser/devtools/canvasdebugger/test/doc_simple-canvas.html b/devtools/client/canvasdebugger/test/doc_simple-canvas.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_simple-canvas.html
rename to devtools/client/canvasdebugger/test/doc_simple-canvas.html
diff --git a/browser/devtools/canvasdebugger/test/doc_webgl-bindings.html b/devtools/client/canvasdebugger/test/doc_webgl-bindings.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_webgl-bindings.html
rename to devtools/client/canvasdebugger/test/doc_webgl-bindings.html
diff --git a/browser/devtools/canvasdebugger/test/doc_webgl-enum.html b/devtools/client/canvasdebugger/test/doc_webgl-enum.html
similarity index 100%
rename from browser/devtools/canvasdebugger/test/doc_webgl-enum.html
rename to devtools/client/canvasdebugger/test/doc_webgl-enum.html
diff --git a/browser/devtools/canvasdebugger/test/head.js b/devtools/client/canvasdebugger/test/head.js
similarity index 100%
rename from browser/devtools/canvasdebugger/test/head.js
rename to devtools/client/canvasdebugger/test/head.js
diff --git a/browser/devtools/commandline/commandline.css b/devtools/client/commandline/commandline.css
similarity index 100%
rename from browser/devtools/commandline/commandline.css
rename to devtools/client/commandline/commandline.css
diff --git a/browser/devtools/commandline/commandlineoutput.xhtml b/devtools/client/commandline/commandlineoutput.xhtml
similarity index 100%
rename from browser/devtools/commandline/commandlineoutput.xhtml
rename to devtools/client/commandline/commandlineoutput.xhtml
diff --git a/browser/devtools/commandline/commandlinetooltip.xhtml b/devtools/client/commandline/commandlinetooltip.xhtml
similarity index 100%
rename from browser/devtools/commandline/commandlinetooltip.xhtml
rename to devtools/client/commandline/commandlinetooltip.xhtml
diff --git a/browser/devtools/commandline/moz.build b/devtools/client/commandline/moz.build
similarity index 100%
rename from browser/devtools/commandline/moz.build
rename to devtools/client/commandline/moz.build
diff --git a/browser/devtools/commandline/test/.eslintrc b/devtools/client/commandline/test/.eslintrc
similarity index 100%
rename from browser/devtools/commandline/test/.eslintrc
rename to devtools/client/commandline/test/.eslintrc
diff --git a/browser/devtools/commandline/test/browser.ini b/devtools/client/commandline/test/browser.ini
similarity index 100%
rename from browser/devtools/commandline/test/browser.ini
rename to devtools/client/commandline/test/browser.ini
diff --git a/browser/devtools/commandline/test/browser_cmd_addon.js b/devtools/client/commandline/test/browser_cmd_addon.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_addon.js
rename to devtools/client/commandline/test/browser_cmd_addon.js
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid.js b/devtools/client/commandline/test/browser_cmd_appcache_invalid.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid.js
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid.js
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_appcache.appcache b/devtools/client/commandline/test/browser_cmd_appcache_invalid_appcache.appcache
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_appcache.appcache
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_appcache.appcache
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_appcache.appcache^headers^ b/devtools/client/commandline/test/browser_cmd_appcache_invalid_appcache.appcache^headers^
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_appcache.appcache^headers^
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_appcache.appcache^headers^
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_index.html b/devtools/client/commandline/test/browser_cmd_appcache_invalid_index.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_index.html
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_index.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_page1.html b/devtools/client/commandline/test/browser_cmd_appcache_invalid_page1.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_page1.html
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_page1.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_page2.html b/devtools/client/commandline/test/browser_cmd_appcache_invalid_page2.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_page2.html
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_page2.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_page3.html b/devtools/client/commandline/test/browser_cmd_appcache_invalid_page3.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_page3.html
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_page3.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_invalid_page3.html^headers^ b/devtools/client/commandline/test/browser_cmd_appcache_invalid_page3.html^headers^
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_invalid_page3.html^headers^
rename to devtools/client/commandline/test/browser_cmd_appcache_invalid_page3.html^headers^
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid.js b/devtools/client/commandline/test/browser_cmd_appcache_valid.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid.js
rename to devtools/client/commandline/test/browser_cmd_appcache_valid.js
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid_appcache.appcache b/devtools/client/commandline/test/browser_cmd_appcache_valid_appcache.appcache
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid_appcache.appcache
rename to devtools/client/commandline/test/browser_cmd_appcache_valid_appcache.appcache
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid_appcache.appcache^headers^ b/devtools/client/commandline/test/browser_cmd_appcache_valid_appcache.appcache^headers^
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid_appcache.appcache^headers^
rename to devtools/client/commandline/test/browser_cmd_appcache_valid_appcache.appcache^headers^
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid_index.html b/devtools/client/commandline/test/browser_cmd_appcache_valid_index.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid_index.html
rename to devtools/client/commandline/test/browser_cmd_appcache_valid_index.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid_page1.html b/devtools/client/commandline/test/browser_cmd_appcache_valid_page1.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid_page1.html
rename to devtools/client/commandline/test/browser_cmd_appcache_valid_page1.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid_page2.html b/devtools/client/commandline/test/browser_cmd_appcache_valid_page2.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid_page2.html
rename to devtools/client/commandline/test/browser_cmd_appcache_valid_page2.html
diff --git a/browser/devtools/commandline/test/browser_cmd_appcache_valid_page3.html b/devtools/client/commandline/test/browser_cmd_appcache_valid_page3.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_appcache_valid_page3.html
rename to devtools/client/commandline/test/browser_cmd_appcache_valid_page3.html
diff --git a/browser/devtools/commandline/test/browser_cmd_calllog.js b/devtools/client/commandline/test/browser_cmd_calllog.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_calllog.js
rename to devtools/client/commandline/test/browser_cmd_calllog.js
diff --git a/browser/devtools/commandline/test/browser_cmd_calllog_chrome.js b/devtools/client/commandline/test/browser_cmd_calllog_chrome.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_calllog_chrome.js
rename to devtools/client/commandline/test/browser_cmd_calllog_chrome.js
diff --git a/browser/devtools/commandline/test/browser_cmd_commands.js b/devtools/client/commandline/test/browser_cmd_commands.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_commands.js
rename to devtools/client/commandline/test/browser_cmd_commands.js
diff --git a/browser/devtools/commandline/test/browser_cmd_cookie.html b/devtools/client/commandline/test/browser_cmd_cookie.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_cookie.html
rename to devtools/client/commandline/test/browser_cmd_cookie.html
diff --git a/browser/devtools/commandline/test/browser_cmd_cookie.js b/devtools/client/commandline/test/browser_cmd_cookie.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_cookie.js
rename to devtools/client/commandline/test/browser_cmd_cookie.js
diff --git a/browser/devtools/commandline/test/browser_cmd_cookie_host.js b/devtools/client/commandline/test/browser_cmd_cookie_host.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_cookie_host.js
rename to devtools/client/commandline/test/browser_cmd_cookie_host.js
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_oneshot.js b/devtools/client/commandline/test/browser_cmd_csscoverage_oneshot.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_oneshot.js
rename to devtools/client/commandline/test/browser_cmd_csscoverage_oneshot.js
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_page1.html b/devtools/client/commandline/test/browser_cmd_csscoverage_page1.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_page1.html
rename to devtools/client/commandline/test/browser_cmd_csscoverage_page1.html
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_page2.html b/devtools/client/commandline/test/browser_cmd_csscoverage_page2.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_page2.html
rename to devtools/client/commandline/test/browser_cmd_csscoverage_page2.html
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_page3.html b/devtools/client/commandline/test/browser_cmd_csscoverage_page3.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_page3.html
rename to devtools/client/commandline/test/browser_cmd_csscoverage_page3.html
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_sheetA.css b/devtools/client/commandline/test/browser_cmd_csscoverage_sheetA.css
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_sheetA.css
rename to devtools/client/commandline/test/browser_cmd_csscoverage_sheetA.css
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_sheetB.css b/devtools/client/commandline/test/browser_cmd_csscoverage_sheetB.css
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_sheetB.css
rename to devtools/client/commandline/test/browser_cmd_csscoverage_sheetB.css
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_sheetC.css b/devtools/client/commandline/test/browser_cmd_csscoverage_sheetC.css
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_sheetC.css
rename to devtools/client/commandline/test/browser_cmd_csscoverage_sheetC.css
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_sheetD.css b/devtools/client/commandline/test/browser_cmd_csscoverage_sheetD.css
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_sheetD.css
rename to devtools/client/commandline/test/browser_cmd_csscoverage_sheetD.css
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js b/devtools/client/commandline/test/browser_cmd_csscoverage_startstop.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js
rename to devtools/client/commandline/test/browser_cmd_csscoverage_startstop.js
diff --git a/browser/devtools/commandline/test/browser_cmd_csscoverage_util.js b/devtools/client/commandline/test/browser_cmd_csscoverage_util.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_csscoverage_util.js
rename to devtools/client/commandline/test/browser_cmd_csscoverage_util.js
diff --git a/browser/devtools/commandline/test/browser_cmd_folder.js b/devtools/client/commandline/test/browser_cmd_folder.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_folder.js
rename to devtools/client/commandline/test/browser_cmd_folder.js
diff --git a/browser/devtools/commandline/test/browser_cmd_highlight_01.js b/devtools/client/commandline/test/browser_cmd_highlight_01.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_highlight_01.js
rename to devtools/client/commandline/test/browser_cmd_highlight_01.js
diff --git a/browser/devtools/commandline/test/browser_cmd_highlight_02.js b/devtools/client/commandline/test/browser_cmd_highlight_02.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_highlight_02.js
rename to devtools/client/commandline/test/browser_cmd_highlight_02.js
diff --git a/browser/devtools/commandline/test/browser_cmd_inject.html b/devtools/client/commandline/test/browser_cmd_inject.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_inject.html
rename to devtools/client/commandline/test/browser_cmd_inject.html
diff --git a/browser/devtools/commandline/test/browser_cmd_inject.js b/devtools/client/commandline/test/browser_cmd_inject.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_inject.js
rename to devtools/client/commandline/test/browser_cmd_inject.js
diff --git a/browser/devtools/commandline/test/browser_cmd_jsb.js b/devtools/client/commandline/test/browser_cmd_jsb.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_jsb.js
rename to devtools/client/commandline/test/browser_cmd_jsb.js
diff --git a/browser/devtools/commandline/test/browser_cmd_jsb_script.jsi b/devtools/client/commandline/test/browser_cmd_jsb_script.jsi
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_jsb_script.jsi
rename to devtools/client/commandline/test/browser_cmd_jsb_script.jsi
diff --git a/browser/devtools/commandline/test/browser_cmd_listen.js b/devtools/client/commandline/test/browser_cmd_listen.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_listen.js
rename to devtools/client/commandline/test/browser_cmd_listen.js
diff --git a/browser/devtools/commandline/test/browser_cmd_media.html b/devtools/client/commandline/test/browser_cmd_media.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_media.html
rename to devtools/client/commandline/test/browser_cmd_media.html
diff --git a/browser/devtools/commandline/test/browser_cmd_media.js b/devtools/client/commandline/test/browser_cmd_media.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_media.js
rename to devtools/client/commandline/test/browser_cmd_media.js
diff --git a/browser/devtools/commandline/test/browser_cmd_pagemod_export.html b/devtools/client/commandline/test/browser_cmd_pagemod_export.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_pagemod_export.html
rename to devtools/client/commandline/test/browser_cmd_pagemod_export.html
diff --git a/browser/devtools/commandline/test/browser_cmd_pagemod_export.js b/devtools/client/commandline/test/browser_cmd_pagemod_export.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_pagemod_export.js
rename to devtools/client/commandline/test/browser_cmd_pagemod_export.js
diff --git a/browser/devtools/commandline/test/browser_cmd_paintflashing.js b/devtools/client/commandline/test/browser_cmd_paintflashing.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_paintflashing.js
rename to devtools/client/commandline/test/browser_cmd_paintflashing.js
diff --git a/browser/devtools/commandline/test/browser_cmd_pref1.js b/devtools/client/commandline/test/browser_cmd_pref1.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_pref1.js
rename to devtools/client/commandline/test/browser_cmd_pref1.js
diff --git a/browser/devtools/commandline/test/browser_cmd_pref2.js b/devtools/client/commandline/test/browser_cmd_pref2.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_pref2.js
rename to devtools/client/commandline/test/browser_cmd_pref2.js
diff --git a/browser/devtools/commandline/test/browser_cmd_pref3.js b/devtools/client/commandline/test/browser_cmd_pref3.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_pref3.js
rename to devtools/client/commandline/test/browser_cmd_pref3.js
diff --git a/browser/devtools/commandline/test/browser_cmd_restart.js b/devtools/client/commandline/test/browser_cmd_restart.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_restart.js
rename to devtools/client/commandline/test/browser_cmd_restart.js
diff --git a/browser/devtools/commandline/test/browser_cmd_rulers.js b/devtools/client/commandline/test/browser_cmd_rulers.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_rulers.js
rename to devtools/client/commandline/test/browser_cmd_rulers.js
diff --git a/browser/devtools/commandline/test/browser_cmd_screenshot.html b/devtools/client/commandline/test/browser_cmd_screenshot.html
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_screenshot.html
rename to devtools/client/commandline/test/browser_cmd_screenshot.html
diff --git a/browser/devtools/commandline/test/browser_cmd_screenshot.js b/devtools/client/commandline/test/browser_cmd_screenshot.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_screenshot.js
rename to devtools/client/commandline/test/browser_cmd_screenshot.js
diff --git a/browser/devtools/commandline/test/browser_cmd_settings.js b/devtools/client/commandline/test/browser_cmd_settings.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_cmd_settings.js
rename to devtools/client/commandline/test/browser_cmd_settings.js
diff --git a/browser/devtools/commandline/test/browser_gcli_async.js b/devtools/client/commandline/test/browser_gcli_async.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_async.js
rename to devtools/client/commandline/test/browser_gcli_async.js
diff --git a/browser/devtools/commandline/test/browser_gcli_canon.js b/devtools/client/commandline/test/browser_gcli_canon.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_canon.js
rename to devtools/client/commandline/test/browser_gcli_canon.js
diff --git a/browser/devtools/commandline/test/browser_gcli_cli1.js b/devtools/client/commandline/test/browser_gcli_cli1.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_cli1.js
rename to devtools/client/commandline/test/browser_gcli_cli1.js
diff --git a/browser/devtools/commandline/test/browser_gcli_cli2.js b/devtools/client/commandline/test/browser_gcli_cli2.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_cli2.js
rename to devtools/client/commandline/test/browser_gcli_cli2.js
diff --git a/browser/devtools/commandline/test/browser_gcli_completion1.js b/devtools/client/commandline/test/browser_gcli_completion1.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_completion1.js
rename to devtools/client/commandline/test/browser_gcli_completion1.js
diff --git a/browser/devtools/commandline/test/browser_gcli_completion2.js b/devtools/client/commandline/test/browser_gcli_completion2.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_completion2.js
rename to devtools/client/commandline/test/browser_gcli_completion2.js
diff --git a/browser/devtools/commandline/test/browser_gcli_context.js b/devtools/client/commandline/test/browser_gcli_context.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_context.js
rename to devtools/client/commandline/test/browser_gcli_context.js
diff --git a/browser/devtools/commandline/test/browser_gcli_date.js b/devtools/client/commandline/test/browser_gcli_date.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_date.js
rename to devtools/client/commandline/test/browser_gcli_date.js
diff --git a/browser/devtools/commandline/test/browser_gcli_exec.js b/devtools/client/commandline/test/browser_gcli_exec.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_exec.js
rename to devtools/client/commandline/test/browser_gcli_exec.js
diff --git a/browser/devtools/commandline/test/browser_gcli_fail.js b/devtools/client/commandline/test/browser_gcli_fail.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_fail.js
rename to devtools/client/commandline/test/browser_gcli_fail.js
diff --git a/browser/devtools/commandline/test/browser_gcli_file.js b/devtools/client/commandline/test/browser_gcli_file.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_file.js
rename to devtools/client/commandline/test/browser_gcli_file.js
diff --git a/browser/devtools/commandline/test/browser_gcli_fileparser.js b/devtools/client/commandline/test/browser_gcli_fileparser.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_fileparser.js
rename to devtools/client/commandline/test/browser_gcli_fileparser.js
diff --git a/browser/devtools/commandline/test/browser_gcli_filesystem.js b/devtools/client/commandline/test/browser_gcli_filesystem.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_filesystem.js
rename to devtools/client/commandline/test/browser_gcli_filesystem.js
diff --git a/browser/devtools/commandline/test/browser_gcli_focus.js b/devtools/client/commandline/test/browser_gcli_focus.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_focus.js
rename to devtools/client/commandline/test/browser_gcli_focus.js
diff --git a/browser/devtools/commandline/test/browser_gcli_history.js b/devtools/client/commandline/test/browser_gcli_history.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_history.js
rename to devtools/client/commandline/test/browser_gcli_history.js
diff --git a/browser/devtools/commandline/test/browser_gcli_incomplete.js b/devtools/client/commandline/test/browser_gcli_incomplete.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_incomplete.js
rename to devtools/client/commandline/test/browser_gcli_incomplete.js
diff --git a/browser/devtools/commandline/test/browser_gcli_inputter.js b/devtools/client/commandline/test/browser_gcli_inputter.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_inputter.js
rename to devtools/client/commandline/test/browser_gcli_inputter.js
diff --git a/browser/devtools/commandline/test/browser_gcli_intro.js b/devtools/client/commandline/test/browser_gcli_intro.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_intro.js
rename to devtools/client/commandline/test/browser_gcli_intro.js
diff --git a/browser/devtools/commandline/test/browser_gcli_js.js b/devtools/client/commandline/test/browser_gcli_js.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_js.js
rename to devtools/client/commandline/test/browser_gcli_js.js
diff --git a/browser/devtools/commandline/test/browser_gcli_keyboard1.js b/devtools/client/commandline/test/browser_gcli_keyboard1.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_keyboard1.js
rename to devtools/client/commandline/test/browser_gcli_keyboard1.js
diff --git a/browser/devtools/commandline/test/browser_gcli_keyboard2.js b/devtools/client/commandline/test/browser_gcli_keyboard2.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_keyboard2.js
rename to devtools/client/commandline/test/browser_gcli_keyboard2.js
diff --git a/browser/devtools/commandline/test/browser_gcli_keyboard3.js b/devtools/client/commandline/test/browser_gcli_keyboard3.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_keyboard3.js
rename to devtools/client/commandline/test/browser_gcli_keyboard3.js
diff --git a/browser/devtools/commandline/test/browser_gcli_keyboard4.js b/devtools/client/commandline/test/browser_gcli_keyboard4.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_keyboard4.js
rename to devtools/client/commandline/test/browser_gcli_keyboard4.js
diff --git a/browser/devtools/commandline/test/browser_gcli_keyboard5.js b/devtools/client/commandline/test/browser_gcli_keyboard5.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_keyboard5.js
rename to devtools/client/commandline/test/browser_gcli_keyboard5.js
diff --git a/browser/devtools/commandline/test/browser_gcli_keyboard6.js b/devtools/client/commandline/test/browser_gcli_keyboard6.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_keyboard6.js
rename to devtools/client/commandline/test/browser_gcli_keyboard6.js
diff --git a/browser/devtools/commandline/test/browser_gcli_menu.js b/devtools/client/commandline/test/browser_gcli_menu.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_menu.js
rename to devtools/client/commandline/test/browser_gcli_menu.js
diff --git a/browser/devtools/commandline/test/browser_gcli_node.js b/devtools/client/commandline/test/browser_gcli_node.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_node.js
rename to devtools/client/commandline/test/browser_gcli_node.js
diff --git a/browser/devtools/commandline/test/browser_gcli_pref1.js b/devtools/client/commandline/test/browser_gcli_pref1.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_pref1.js
rename to devtools/client/commandline/test/browser_gcli_pref1.js
diff --git a/browser/devtools/commandline/test/browser_gcli_pref2.js b/devtools/client/commandline/test/browser_gcli_pref2.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_pref2.js
rename to devtools/client/commandline/test/browser_gcli_pref2.js
diff --git a/browser/devtools/commandline/test/browser_gcli_remotews.js b/devtools/client/commandline/test/browser_gcli_remotews.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_remotews.js
rename to devtools/client/commandline/test/browser_gcli_remotews.js
diff --git a/browser/devtools/commandline/test/browser_gcli_remotexhr.js b/devtools/client/commandline/test/browser_gcli_remotexhr.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_remotexhr.js
rename to devtools/client/commandline/test/browser_gcli_remotexhr.js
diff --git a/browser/devtools/commandline/test/browser_gcli_resource.js b/devtools/client/commandline/test/browser_gcli_resource.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_resource.js
rename to devtools/client/commandline/test/browser_gcli_resource.js
diff --git a/browser/devtools/commandline/test/browser_gcli_short.js b/devtools/client/commandline/test/browser_gcli_short.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_short.js
rename to devtools/client/commandline/test/browser_gcli_short.js
diff --git a/browser/devtools/commandline/test/browser_gcli_spell.js b/devtools/client/commandline/test/browser_gcli_spell.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_spell.js
rename to devtools/client/commandline/test/browser_gcli_spell.js
diff --git a/browser/devtools/commandline/test/browser_gcli_split.js b/devtools/client/commandline/test/browser_gcli_split.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_split.js
rename to devtools/client/commandline/test/browser_gcli_split.js
diff --git a/browser/devtools/commandline/test/browser_gcli_string.js b/devtools/client/commandline/test/browser_gcli_string.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_string.js
rename to devtools/client/commandline/test/browser_gcli_string.js
diff --git a/browser/devtools/commandline/test/browser_gcli_tokenize.js b/devtools/client/commandline/test/browser_gcli_tokenize.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_tokenize.js
rename to devtools/client/commandline/test/browser_gcli_tokenize.js
diff --git a/browser/devtools/commandline/test/browser_gcli_tooltip.js b/devtools/client/commandline/test/browser_gcli_tooltip.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_tooltip.js
rename to devtools/client/commandline/test/browser_gcli_tooltip.js
diff --git a/browser/devtools/commandline/test/browser_gcli_types.js b/devtools/client/commandline/test/browser_gcli_types.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_types.js
rename to devtools/client/commandline/test/browser_gcli_types.js
diff --git a/browser/devtools/commandline/test/browser_gcli_union.js b/devtools/client/commandline/test/browser_gcli_union.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_union.js
rename to devtools/client/commandline/test/browser_gcli_union.js
diff --git a/browser/devtools/commandline/test/browser_gcli_url.js b/devtools/client/commandline/test/browser_gcli_url.js
similarity index 100%
rename from browser/devtools/commandline/test/browser_gcli_url.js
rename to devtools/client/commandline/test/browser_gcli_url.js
diff --git a/browser/devtools/commandline/test/head.js b/devtools/client/commandline/test/head.js
similarity index 100%
rename from browser/devtools/commandline/test/head.js
rename to devtools/client/commandline/test/head.js
diff --git a/browser/devtools/commandline/test/helpers.js b/devtools/client/commandline/test/helpers.js
similarity index 100%
rename from browser/devtools/commandline/test/helpers.js
rename to devtools/client/commandline/test/helpers.js
diff --git a/browser/devtools/commandline/test/mockCommands.js b/devtools/client/commandline/test/mockCommands.js
similarity index 100%
rename from browser/devtools/commandline/test/mockCommands.js
rename to devtools/client/commandline/test/mockCommands.js
diff --git a/browser/devtools/debugger/content/actions/event-listeners.js b/devtools/client/debugger/content/actions/event-listeners.js
similarity index 100%
rename from browser/devtools/debugger/content/actions/event-listeners.js
rename to devtools/client/debugger/content/actions/event-listeners.js
diff --git a/browser/devtools/debugger/content/constants.js b/devtools/client/debugger/content/constants.js
similarity index 100%
rename from browser/devtools/debugger/content/constants.js
rename to devtools/client/debugger/content/constants.js
diff --git a/browser/devtools/debugger/content/globalActions.js b/devtools/client/debugger/content/globalActions.js
similarity index 100%
rename from browser/devtools/debugger/content/globalActions.js
rename to devtools/client/debugger/content/globalActions.js
diff --git a/browser/devtools/debugger/content/reducers/event-listeners.js b/devtools/client/debugger/content/reducers/event-listeners.js
similarity index 100%
rename from browser/devtools/debugger/content/reducers/event-listeners.js
rename to devtools/client/debugger/content/reducers/event-listeners.js
diff --git a/browser/devtools/debugger/content/reducers/index.js b/devtools/client/debugger/content/reducers/index.js
similarity index 100%
rename from browser/devtools/debugger/content/reducers/index.js
rename to devtools/client/debugger/content/reducers/index.js
diff --git a/browser/devtools/debugger/content/utils.js b/devtools/client/debugger/content/utils.js
similarity index 100%
rename from browser/devtools/debugger/content/utils.js
rename to devtools/client/debugger/content/utils.js
diff --git a/browser/devtools/debugger/content/views/event-listeners-view.js b/devtools/client/debugger/content/views/event-listeners-view.js
similarity index 100%
rename from browser/devtools/debugger/content/views/event-listeners-view.js
rename to devtools/client/debugger/content/views/event-listeners-view.js
diff --git a/browser/devtools/debugger/debugger-commands.js b/devtools/client/debugger/debugger-commands.js
similarity index 100%
rename from browser/devtools/debugger/debugger-commands.js
rename to devtools/client/debugger/debugger-commands.js
diff --git a/browser/devtools/debugger/debugger-controller.js b/devtools/client/debugger/debugger-controller.js
similarity index 100%
rename from browser/devtools/debugger/debugger-controller.js
rename to devtools/client/debugger/debugger-controller.js
diff --git a/browser/devtools/debugger/debugger-view.js b/devtools/client/debugger/debugger-view.js
similarity index 100%
rename from browser/devtools/debugger/debugger-view.js
rename to devtools/client/debugger/debugger-view.js
diff --git a/browser/devtools/debugger/debugger.css b/devtools/client/debugger/debugger.css
similarity index 100%
rename from browser/devtools/debugger/debugger.css
rename to devtools/client/debugger/debugger.css
diff --git a/browser/devtools/debugger/debugger.xul b/devtools/client/debugger/debugger.xul
similarity index 100%
rename from browser/devtools/debugger/debugger.xul
rename to devtools/client/debugger/debugger.xul
diff --git a/browser/devtools/debugger/moz.build b/devtools/client/debugger/moz.build
similarity index 100%
rename from browser/devtools/debugger/moz.build
rename to devtools/client/debugger/moz.build
diff --git a/browser/devtools/debugger/panel.js b/devtools/client/debugger/panel.js
similarity index 100%
rename from browser/devtools/debugger/panel.js
rename to devtools/client/debugger/panel.js
diff --git a/browser/devtools/debugger/test/.eslintrc b/devtools/client/debugger/test/.eslintrc
similarity index 100%
rename from browser/devtools/debugger/test/.eslintrc
rename to devtools/client/debugger/test/.eslintrc
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon3/lib/main.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon3/lib/main.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon3/lib/main.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon3/lib/main.js
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon3/package.json b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon3/package.json
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon3/package.json
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon3/package.json
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/bootstrap.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/bootstrap.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/bootstrap.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/bootstrap.js
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/chrome.manifest b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/chrome.manifest
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/chrome.manifest
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/chrome.manifest
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/install.rdf b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/install.rdf
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/install.rdf
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/install.rdf
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.jsm b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.jsm
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.jsm
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.jsm
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.xul b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.xul
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.xul
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test.xul
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.jsm b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.jsm
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.jsm
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.jsm
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.xul b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.xul
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.xul
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/test2.xul
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul.js
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul2.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul2.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul2.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon4/testxul2.js
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/bootstrap.js
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/chrome.manifest b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/chrome.manifest
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/chrome.manifest
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/chrome.manifest
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/install.rdf b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/install.rdf
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/install.rdf
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/install.rdf
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.jsm b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.jsm
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.jsm
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.jsm
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.xul b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.xul
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.xul
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test.xul
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.jsm b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.jsm
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.jsm
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.jsm
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.xul b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.xul
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.xul
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/test2.xul
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul.js
diff --git a/browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul2.js b/devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul2.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul2.js
rename to devtools/client/debugger/test/mochitest/addon-source/browser_dbg_addon5/testxul2.js
diff --git a/browser/devtools/debugger/test/mochitest/addon1.xpi b/devtools/client/debugger/test/mochitest/addon1.xpi
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon1.xpi
rename to devtools/client/debugger/test/mochitest/addon1.xpi
diff --git a/browser/devtools/debugger/test/mochitest/addon2.xpi b/devtools/client/debugger/test/mochitest/addon2.xpi
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon2.xpi
rename to devtools/client/debugger/test/mochitest/addon2.xpi
diff --git a/browser/devtools/debugger/test/mochitest/addon3.xpi b/devtools/client/debugger/test/mochitest/addon3.xpi
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon3.xpi
rename to devtools/client/debugger/test/mochitest/addon3.xpi
diff --git a/browser/devtools/debugger/test/mochitest/addon4.xpi b/devtools/client/debugger/test/mochitest/addon4.xpi
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon4.xpi
rename to devtools/client/debugger/test/mochitest/addon4.xpi
diff --git a/browser/devtools/debugger/test/mochitest/addon5.xpi b/devtools/client/debugger/test/mochitest/addon5.xpi
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/addon5.xpi
rename to devtools/client/debugger/test/mochitest/addon5.xpi
diff --git a/browser/devtools/debugger/test/mochitest/browser.ini b/devtools/client/debugger/test/mochitest/browser.ini
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser.ini
rename to devtools/client/debugger/test/mochitest/browser.ini
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_WorkerActor.attach.js b/devtools/client/debugger/test/mochitest/browser_dbg_WorkerActor.attach.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_WorkerActor.attach.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_WorkerActor.attach.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_WorkerActor.attachThread.js b/devtools/client/debugger/test/mochitest/browser_dbg_WorkerActor.attachThread.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_WorkerActor.attachThread.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_WorkerActor.attachThread.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_aaa_run_first_leaktest.js b/devtools/client/debugger/test/mochitest/browser_dbg_aaa_run_first_leaktest.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_aaa_run_first_leaktest.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_aaa_run_first_leaktest.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_addon-console.js b/devtools/client/debugger/test/mochitest/browser_dbg_addon-console.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_addon-console.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_addon-console.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_addon-modules-unpacked.js b/devtools/client/debugger/test/mochitest/browser_dbg_addon-modules-unpacked.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_addon-modules-unpacked.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_addon-modules-unpacked.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_addon-modules.js b/devtools/client/debugger/test/mochitest/browser_dbg_addon-modules.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_addon-modules.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_addon-modules.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_addon-panels.js b/devtools/client/debugger/test/mochitest/browser_dbg_addon-panels.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_addon-panels.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_addon-panels.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_addon-sources.js b/devtools/client/debugger/test/mochitest/browser_dbg_addon-sources.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_addon-sources.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_addon-sources.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_addonactor.js b/devtools/client/debugger/test/mochitest/browser_dbg_addonactor.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_addonactor.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_addonactor.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_auto-pretty-print-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_auto-pretty-print-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_auto-pretty-print-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_auto-pretty-print-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_auto-pretty-print-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_auto-pretty-print-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_auto-pretty-print-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_auto-pretty-print-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_bfcache.js b/devtools/client/debugger/test/mochitest/browser_dbg_bfcache.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_bfcache.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_bfcache.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_blackboxing-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_blackboxing-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breadcrumbs-access.js b/devtools/client/debugger/test/mochitest/browser_dbg_breadcrumbs-access.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breadcrumbs-access.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breadcrumbs-access.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-in-anon.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-in-anon.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-in-anon.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-in-anon.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-07.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-07.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-07.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-07.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-08.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-08.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-08.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-08.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-event-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-event-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-event-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-event-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-event-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-dom-event-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-next-console.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-next-console.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-next-console.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-next-console.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_break-on-next.js b/devtools/client/debugger/test/mochitest/browser_dbg_break-on-next.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_break-on-next.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_break-on-next.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-actual-location.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-actual-location.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-actual-location.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-actual-location.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-actual-location2.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-actual-location2.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-actual-location2.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-actual-location2.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-button-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-button-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-button-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-button-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-button-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-button-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-button-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-button-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-condition-thrown-message.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-condition-thrown-message.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-condition-thrown-message.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-condition-thrown-message.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu-add.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu-add.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu-add.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu-add.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-contextmenu.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-disabled-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-disabled-reload.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-disabled-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-disabled-reload.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-editor.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-editor.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-editor.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-editor.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-eval.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-eval.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-eval.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-eval.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-highlight.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-highlight.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-highlight.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-highlight.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-new-script.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-new-script.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-new-script.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-new-script.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-other-tabs.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-other-tabs.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-other-tabs.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-other-tabs.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-pane.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-pane.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-pane.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-pane.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-reload.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_breakpoints-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_breakpoints-reload.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_bug-896139.js b/devtools/client/debugger/test/mochitest/browser_dbg_bug-896139.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_bug-896139.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_bug-896139.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_chrome-create.js b/devtools/client/debugger/test/mochitest/browser_dbg_chrome-create.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_chrome-create.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_chrome-create.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_chrome-debugging.js b/devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_chrome-debugging.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_clean-exit-window.js b/devtools/client/debugger/test/mochitest/browser_dbg_clean-exit-window.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_clean-exit-window.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_clean-exit-window.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_clean-exit.js b/devtools/client/debugger/test/mochitest/browser_dbg_clean-exit.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_clean-exit.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_clean-exit.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_closure-inspection.js b/devtools/client/debugger/test/mochitest/browser_dbg_closure-inspection.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_closure-inspection.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_closure-inspection.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_cmd-blackbox.js b/devtools/client/debugger/test/mochitest/browser_dbg_cmd-blackbox.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_cmd-blackbox.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_cmd-blackbox.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_cmd-break.js b/devtools/client/debugger/test/mochitest/browser_dbg_cmd-break.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_cmd-break.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_cmd-break.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_cmd-dbg.js b/devtools/client/debugger/test/mochitest/browser_dbg_cmd-dbg.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_cmd-dbg.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_cmd-dbg.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_conditional-breakpoints-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_conditional-breakpoints-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_console-eval.js b/devtools/client/debugger/test/mochitest/browser_dbg_console-eval.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_console-eval.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_console-eval.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_console-named-eval.js b/devtools/client/debugger/test/mochitest/browser_dbg_console-named-eval.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_console-named-eval.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_console-named-eval.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_controller-evaluate-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_controller-evaluate-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_controller-evaluate-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_controller-evaluate-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_controller-evaluate-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_controller-evaluate-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_controller-evaluate-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_controller-evaluate-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_debugger-statement.js b/devtools/client/debugger/test/mochitest/browser_dbg_debugger-statement.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_debugger-statement.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_debugger-statement.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_editor-contextmenu.js b/devtools/client/debugger/test/mochitest/browser_dbg_editor-contextmenu.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_editor-contextmenu.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_editor-contextmenu.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_editor-mode.js b/devtools/client/debugger/test/mochitest/browser_dbg_editor-mode.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_editor-mode.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_editor-mode.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_event-listeners-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_file-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg_file-reload.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_file-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_file-reload.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_function-display-name.js b/devtools/client/debugger/test/mochitest/browser_dbg_function-display-name.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_function-display-name.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_function-display-name.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_global-method-override.js b/devtools/client/debugger/test/mochitest/browser_dbg_global-method-override.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_global-method-override.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_global-method-override.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_globalactor.js b/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_globalactor.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_hide-toolbar-buttons.js b/devtools/client/debugger/test/mochitest/browser_dbg_hide-toolbar-buttons.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_hide-toolbar-buttons.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_hide-toolbar-buttons.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_host-layout.js b/devtools/client/debugger/test/mochitest/browser_dbg_host-layout.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_host-layout.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_host-layout.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_iframes.js b/devtools/client/debugger/test/mochitest/browser_dbg_iframes.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_iframes.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_iframes.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_instruments-pane-collapse.js b/devtools/client/debugger/test/mochitest/browser_dbg_instruments-pane-collapse.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_instruments-pane-collapse.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_instruments-pane-collapse.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_interrupts.js b/devtools/client/debugger/test/mochitest/browser_dbg_interrupts.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_interrupts.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_interrupts.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_listaddons.js b/devtools/client/debugger/test/mochitest/browser_dbg_listaddons.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_listaddons.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_listaddons.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_listtabs-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_listtabs-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_listtabs-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_listtabs-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_listtabs-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_listtabs-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_listtabs-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_listtabs-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_listtabs-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_listtabs-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_listtabs-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_listtabs-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_listworkers.js b/devtools/client/debugger/test/mochitest/browser_dbg_listworkers.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_listworkers.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_listworkers.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-01-simple.js b/devtools/client/debugger/test/mochitest/browser_dbg_location-changes-01-simple.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-01-simple.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_location-changes-01-simple.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-02-blank.js b/devtools/client/debugger/test/mochitest/browser_dbg_location-changes-02-blank.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-02-blank.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_location-changes-02-blank.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-03-new.js b/devtools/client/debugger/test/mochitest/browser_dbg_location-changes-03-new.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-03-new.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_location-changes-03-new.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-04-breakpoint.js b/devtools/client/debugger/test/mochitest/browser_dbg_location-changes-04-breakpoint.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_location-changes-04-breakpoint.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_location-changes-04-breakpoint.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_multiple-windows.js b/devtools/client/debugger/test/mochitest/browser_dbg_multiple-windows.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_multiple-windows.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_multiple-windows.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_navigation.js b/devtools/client/debugger/test/mochitest/browser_dbg_navigation.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_navigation.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_navigation.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_no-page-sources.js b/devtools/client/debugger/test/mochitest/browser_dbg_no-page-sources.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_no-page-sources.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_no-page-sources.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_on-pause-highlight.js b/devtools/client/debugger/test/mochitest/browser_dbg_on-pause-highlight.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_on-pause-highlight.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_on-pause-highlight.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_on-pause-raise.js b/devtools/client/debugger/test/mochitest/browser_dbg_on-pause-raise.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_on-pause-raise.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_on-pause-raise.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_optimized-out-vars.js b/devtools/client/debugger/test/mochitest/browser_dbg_optimized-out-vars.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_optimized-out-vars.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_optimized-out-vars.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_panel-size.js b/devtools/client/debugger/test/mochitest/browser_dbg_panel-size.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_panel-size.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_panel-size.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-07.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-07.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-08.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-08.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-09.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-09.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_parser-10.js b/devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_parser-10.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pause-exceptions-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_pause-exceptions-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pause-exceptions-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pause-exceptions-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pause-exceptions-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_pause-exceptions-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pause-exceptions-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pause-exceptions-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pause-no-step.js b/devtools/client/debugger/test/mochitest/browser_dbg_pause-no-step.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pause-no-step.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pause-no-step.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pause-resume.js b/devtools/client/debugger/test/mochitest/browser_dbg_pause-resume.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pause-resume.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pause-resume.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pause-warning.js b/devtools/client/debugger/test/mochitest/browser_dbg_pause-warning.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pause-warning.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pause-warning.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_paused-keybindings.js b/devtools/client/debugger/test/mochitest/browser_dbg_paused-keybindings.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_paused-keybindings.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_paused-keybindings.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-07.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-07.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-07.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-07.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-08.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-08.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-08.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-08.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-09.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-09.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-09.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-09.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-10.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-10.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-10.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-10.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-11.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-11.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-11.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-11.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-12.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-12.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-12.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-12.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-13.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-13.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-13.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-13.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-on-paused.js b/devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-on-paused.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_pretty-print-on-paused.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_pretty-print-on-paused.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_progress-listener-bug.js b/devtools/client/debugger/test/mochitest/browser_dbg_progress-listener-bug.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_progress-listener-bug.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_progress-listener-bug.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_reload-preferred-script-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_reload-preferred-script-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_reload-preferred-script-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_reload-preferred-script-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_reload-preferred-script-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_reload-preferred-script-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_reload-preferred-script-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_reload-preferred-script-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_reload-preferred-script-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_reload-preferred-script-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_reload-preferred-script-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_reload-preferred-script-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_reload-same-script.js b/devtools/client/debugger/test/mochitest/browser_dbg_reload-same-script.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_reload-same-script.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_reload-same-script.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_scripts-switching-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_scripts-switching-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_scripts-switching-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_scripts-switching-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_scripts-switching-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_scripts-switching-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_scripts-switching-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_scripts-switching-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_scripts-switching-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_scripts-switching-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_scripts-switching-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_scripts-switching-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-autofill-identifier.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-autofill-identifier.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-autofill-identifier.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-autofill-identifier.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-basic-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-basic-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-basic-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-basic-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-basic-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-basic-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-basic-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-basic-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-basic-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-global-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-global-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-global-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-global-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-global-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-global-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-global-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-global-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-global-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-global-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-global-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-global-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-global-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-global-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-global-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-global-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-global-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-global-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-global-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-global-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-global-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-global-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-global-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-global-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-popup-jank.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-popup-jank.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-popup-jank.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-popup-jank.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-sources-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-sources-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-sources-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-sources-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-sources-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-sources-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-sources-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-sources-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-sources-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-sources-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-sources-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-sources-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_search-symbols.js b/devtools/client/debugger/test/mochitest/browser_dbg_search-symbols.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_search-symbols.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_search-symbols.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_searchbox-help-popup-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_searchbox-help-popup-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_searchbox-help-popup-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_searchbox-help-popup-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_searchbox-parse.js b/devtools/client/debugger/test/mochitest/browser_dbg_searchbox-parse.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_searchbox-parse.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_searchbox-parse.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_server-conditional-bp-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_server-conditional-bp-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_source-maps-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_source-maps-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_source-maps-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_source-maps-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_source-maps-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-bookmarklet.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-bookmarklet.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-bookmarklet.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-bookmarklet.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-cache.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-cache.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-cache.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-cache.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-contextmenu-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-contextmenu-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-contextmenu-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-contextmenu-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-contextmenu-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-contextmenu-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-contextmenu-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-contextmenu-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-eval-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-eval-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-eval-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-eval-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-eval-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-eval-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-eval-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-eval-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-keybindings.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-keybindings.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-keybindings.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-keybindings.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-labels.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-labels.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-labels.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-labels.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_sources-sorting.js b/devtools/client/debugger/test/mochitest/browser_dbg_sources-sorting.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_sources-sorting.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_sources-sorting.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_split-console-paused-reload.js b/devtools/client/debugger/test/mochitest/browser_dbg_split-console-paused-reload.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_split-console-paused-reload.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_split-console-paused-reload.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_stack-07.js b/devtools/client/debugger/test/mochitest/browser_dbg_stack-07.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_stack-07.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_stack-07.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_step-out.js b/devtools/client/debugger/test/mochitest/browser_dbg_step-out.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_step-out.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_step-out.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_tabactor-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_tabactor-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_tabactor-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_tabactor-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_terminate-on-tab-close.js b/devtools/client/debugger/test/mochitest/browser_dbg_terminate-on-tab-close.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_terminate-on-tab-close.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_terminate-on-tab-close.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-accessibility.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-accessibility.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-accessibility.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-accessibility.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-data.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-data.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-data.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-data.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-click.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-click.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-click.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-click.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-getset-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-value.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-value.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-value.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-value.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-watch.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-watch.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-edit-watch.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-watch.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-pref.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-pref.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-pref.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-pref.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-searchbox.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-searchbox.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-filter-searchbox.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-filter-searchbox.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-parameters-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-with.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-with.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frame-with.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frame-with.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frozen-sealed-nonext.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frozen-sealed-nonext.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-frozen-sealed-nonext.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-frozen-sealed-nonext.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-hide-non-enums.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-hide-non-enums.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-hide-non-enums.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-hide-non-enums.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-large-array-buffer.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-large-array-buffer.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-large-array-buffer.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-large-array-buffer.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-override-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-override-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-override-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-override-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-override-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-override-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-override-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-override-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-04.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-04.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-04.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-04.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-05.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-05.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-05.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-05.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-06.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-06.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-06.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-06.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-07.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-07.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-07.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-07.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-08.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-08.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-08.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-08.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-09.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-09.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-09.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-09.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-10.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-10.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-10.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-10.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-11.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-11.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-11.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-11.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-12.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-12.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-12.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-12.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-13.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-13.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-13.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-13.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-14.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-14.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-14.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-14.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-15.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-15.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-15.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-15.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-16.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-16.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-popup-16.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-16.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-reexpand-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-reexpand-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-reexpand-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-reexpand-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-02.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-reexpand-03.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-reexpand-03.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-reexpand-03.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-webidl.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-webidl.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_variables-view-webidl.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_variables-view-webidl.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_watch-expressions-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_watch-expressions-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_watch-expressions-01.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_watch-expressions-01.js
diff --git a/browser/devtools/debugger/test/mochitest/browser_dbg_watch-expressions-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_watch-expressions-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/browser_dbg_watch-expressions-02.js
rename to devtools/client/debugger/test/mochitest/browser_dbg_watch-expressions-02.js
diff --git a/browser/devtools/debugger/test/mochitest/code_WorkerActor.attach-worker1.js b/devtools/client/debugger/test/mochitest/code_WorkerActor.attach-worker1.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_WorkerActor.attach-worker1.js
rename to devtools/client/debugger/test/mochitest/code_WorkerActor.attach-worker1.js
diff --git a/browser/devtools/debugger/test/mochitest/code_WorkerActor.attach-worker2.js b/devtools/client/debugger/test/mochitest/code_WorkerActor.attach-worker2.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_WorkerActor.attach-worker2.js
rename to devtools/client/debugger/test/mochitest/code_WorkerActor.attach-worker2.js
diff --git a/browser/devtools/debugger/test/mochitest/code_WorkerActor.attachThread-worker.js b/devtools/client/debugger/test/mochitest/code_WorkerActor.attachThread-worker.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_WorkerActor.attachThread-worker.js
rename to devtools/client/debugger/test/mochitest/code_WorkerActor.attachThread-worker.js
diff --git a/browser/devtools/debugger/test/mochitest/code_binary_search.coffee b/devtools/client/debugger/test/mochitest/code_binary_search.coffee
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_binary_search.coffee
rename to devtools/client/debugger/test/mochitest/code_binary_search.coffee
diff --git a/browser/devtools/debugger/test/mochitest/code_binary_search.js b/devtools/client/debugger/test/mochitest/code_binary_search.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_binary_search.js
rename to devtools/client/debugger/test/mochitest/code_binary_search.js
diff --git a/browser/devtools/debugger/test/mochitest/code_binary_search.map b/devtools/client/debugger/test/mochitest/code_binary_search.map
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_binary_search.map
rename to devtools/client/debugger/test/mochitest/code_binary_search.map
diff --git a/browser/devtools/debugger/test/mochitest/code_blackboxing_blackboxme.js b/devtools/client/debugger/test/mochitest/code_blackboxing_blackboxme.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_blackboxing_blackboxme.js
rename to devtools/client/debugger/test/mochitest/code_blackboxing_blackboxme.js
diff --git a/browser/devtools/debugger/test/mochitest/code_blackboxing_one.js b/devtools/client/debugger/test/mochitest/code_blackboxing_one.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_blackboxing_one.js
rename to devtools/client/debugger/test/mochitest/code_blackboxing_one.js
diff --git a/browser/devtools/debugger/test/mochitest/code_blackboxing_three.js b/devtools/client/debugger/test/mochitest/code_blackboxing_three.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_blackboxing_three.js
rename to devtools/client/debugger/test/mochitest/code_blackboxing_three.js
diff --git a/browser/devtools/debugger/test/mochitest/code_blackboxing_two.js b/devtools/client/debugger/test/mochitest/code_blackboxing_two.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_blackboxing_two.js
rename to devtools/client/debugger/test/mochitest/code_blackboxing_two.js
diff --git a/browser/devtools/debugger/test/mochitest/code_breakpoints-break-on-last-line-of-script-on-reload.js b/devtools/client/debugger/test/mochitest/code_breakpoints-break-on-last-line-of-script-on-reload.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_breakpoints-break-on-last-line-of-script-on-reload.js
rename to devtools/client/debugger/test/mochitest/code_breakpoints-break-on-last-line-of-script-on-reload.js
diff --git a/browser/devtools/debugger/test/mochitest/code_breakpoints-other-tabs.js b/devtools/client/debugger/test/mochitest/code_breakpoints-other-tabs.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_breakpoints-other-tabs.js
rename to devtools/client/debugger/test/mochitest/code_breakpoints-other-tabs.js
diff --git a/browser/devtools/debugger/test/mochitest/code_bug-896139.js b/devtools/client/debugger/test/mochitest/code_bug-896139.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_bug-896139.js
rename to devtools/client/debugger/test/mochitest/code_bug-896139.js
diff --git a/browser/devtools/debugger/test/mochitest/code_frame-script.js b/devtools/client/debugger/test/mochitest/code_frame-script.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_frame-script.js
rename to devtools/client/debugger/test/mochitest/code_frame-script.js
diff --git a/browser/devtools/debugger/test/mochitest/code_function-search-01.js b/devtools/client/debugger/test/mochitest/code_function-search-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_function-search-01.js
rename to devtools/client/debugger/test/mochitest/code_function-search-01.js
diff --git a/browser/devtools/debugger/test/mochitest/code_function-search-02.js b/devtools/client/debugger/test/mochitest/code_function-search-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_function-search-02.js
rename to devtools/client/debugger/test/mochitest/code_function-search-02.js
diff --git a/browser/devtools/debugger/test/mochitest/code_function-search-03.js b/devtools/client/debugger/test/mochitest/code_function-search-03.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_function-search-03.js
rename to devtools/client/debugger/test/mochitest/code_function-search-03.js
diff --git a/browser/devtools/debugger/test/mochitest/code_listworkers-worker1.js b/devtools/client/debugger/test/mochitest/code_listworkers-worker1.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_listworkers-worker1.js
rename to devtools/client/debugger/test/mochitest/code_listworkers-worker1.js
diff --git a/browser/devtools/debugger/test/mochitest/code_listworkers-worker2.js b/devtools/client/debugger/test/mochitest/code_listworkers-worker2.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_listworkers-worker2.js
rename to devtools/client/debugger/test/mochitest/code_listworkers-worker2.js
diff --git a/browser/devtools/debugger/test/mochitest/code_location-changes.js b/devtools/client/debugger/test/mochitest/code_location-changes.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_location-changes.js
rename to devtools/client/debugger/test/mochitest/code_location-changes.js
diff --git a/browser/devtools/debugger/test/mochitest/code_math.js b/devtools/client/debugger/test/mochitest/code_math.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_math.js
rename to devtools/client/debugger/test/mochitest/code_math.js
diff --git a/browser/devtools/debugger/test/mochitest/code_math.map b/devtools/client/debugger/test/mochitest/code_math.map
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_math.map
rename to devtools/client/debugger/test/mochitest/code_math.map
diff --git a/browser/devtools/debugger/test/mochitest/code_math.min.js b/devtools/client/debugger/test/mochitest/code_math.min.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_math.min.js
rename to devtools/client/debugger/test/mochitest/code_math.min.js
diff --git a/browser/devtools/debugger/test/mochitest/code_math_bogus_map.js b/devtools/client/debugger/test/mochitest/code_math_bogus_map.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_math_bogus_map.js
rename to devtools/client/debugger/test/mochitest/code_math_bogus_map.js
diff --git a/browser/devtools/debugger/test/mochitest/code_same-line-functions.js b/devtools/client/debugger/test/mochitest/code_same-line-functions.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_same-line-functions.js
rename to devtools/client/debugger/test/mochitest/code_same-line-functions.js
diff --git a/browser/devtools/debugger/test/mochitest/code_script-eval.js b/devtools/client/debugger/test/mochitest/code_script-eval.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_script-eval.js
rename to devtools/client/debugger/test/mochitest/code_script-eval.js
diff --git a/browser/devtools/debugger/test/mochitest/code_script-switching-01.js b/devtools/client/debugger/test/mochitest/code_script-switching-01.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_script-switching-01.js
rename to devtools/client/debugger/test/mochitest/code_script-switching-01.js
diff --git a/browser/devtools/debugger/test/mochitest/code_script-switching-02.js b/devtools/client/debugger/test/mochitest/code_script-switching-02.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_script-switching-02.js
rename to devtools/client/debugger/test/mochitest/code_script-switching-02.js
diff --git a/browser/devtools/debugger/test/mochitest/code_test-editor-mode b/devtools/client/debugger/test/mochitest/code_test-editor-mode
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_test-editor-mode
rename to devtools/client/debugger/test/mochitest/code_test-editor-mode
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-2.js b/devtools/client/debugger/test/mochitest/code_ugly-2.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-2.js
rename to devtools/client/debugger/test/mochitest/code_ugly-2.js
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-3.js b/devtools/client/debugger/test/mochitest/code_ugly-3.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-3.js
rename to devtools/client/debugger/test/mochitest/code_ugly-3.js
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-4.js b/devtools/client/debugger/test/mochitest/code_ugly-4.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-4.js
rename to devtools/client/debugger/test/mochitest/code_ugly-4.js
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-5.js b/devtools/client/debugger/test/mochitest/code_ugly-5.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-5.js
rename to devtools/client/debugger/test/mochitest/code_ugly-5.js
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-6.js b/devtools/client/debugger/test/mochitest/code_ugly-6.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-6.js
rename to devtools/client/debugger/test/mochitest/code_ugly-6.js
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-7.js b/devtools/client/debugger/test/mochitest/code_ugly-7.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-7.js
rename to devtools/client/debugger/test/mochitest/code_ugly-7.js
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-8 b/devtools/client/debugger/test/mochitest/code_ugly-8
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-8
rename to devtools/client/debugger/test/mochitest/code_ugly-8
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly-8^headers^ b/devtools/client/debugger/test/mochitest/code_ugly-8^headers^
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly-8^headers^
rename to devtools/client/debugger/test/mochitest/code_ugly-8^headers^
diff --git a/browser/devtools/debugger/test/mochitest/code_ugly.js b/devtools/client/debugger/test/mochitest/code_ugly.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_ugly.js
rename to devtools/client/debugger/test/mochitest/code_ugly.js
diff --git a/browser/devtools/debugger/test/mochitest/code_workeractor-worker.js b/devtools/client/debugger/test/mochitest/code_workeractor-worker.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/code_workeractor-worker.js
rename to devtools/client/debugger/test/mochitest/code_workeractor-worker.js
diff --git a/browser/devtools/debugger/test/mochitest/doc_WorkerActor.attach-tab1.html b/devtools/client/debugger/test/mochitest/doc_WorkerActor.attach-tab1.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_WorkerActor.attach-tab1.html
rename to devtools/client/debugger/test/mochitest/doc_WorkerActor.attach-tab1.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_WorkerActor.attach-tab2.html b/devtools/client/debugger/test/mochitest/doc_WorkerActor.attach-tab2.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_WorkerActor.attach-tab2.html
rename to devtools/client/debugger/test/mochitest/doc_WorkerActor.attach-tab2.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_WorkerActor.attachThread-tab.html b/devtools/client/debugger/test/mochitest/doc_WorkerActor.attachThread-tab.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_WorkerActor.attachThread-tab.html
rename to devtools/client/debugger/test/mochitest/doc_WorkerActor.attachThread-tab.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_auto-pretty-print-01.html b/devtools/client/debugger/test/mochitest/doc_auto-pretty-print-01.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_auto-pretty-print-01.html
rename to devtools/client/debugger/test/mochitest/doc_auto-pretty-print-01.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_auto-pretty-print-02.html b/devtools/client/debugger/test/mochitest/doc_auto-pretty-print-02.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_auto-pretty-print-02.html
rename to devtools/client/debugger/test/mochitest/doc_auto-pretty-print-02.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_binary_search.html b/devtools/client/debugger/test/mochitest/doc_binary_search.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_binary_search.html
rename to devtools/client/debugger/test/mochitest/doc_binary_search.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_blackboxing.html b/devtools/client/debugger/test/mochitest/doc_blackboxing.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_blackboxing.html
rename to devtools/client/debugger/test/mochitest/doc_blackboxing.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_breakpoint-move.html b/devtools/client/debugger/test/mochitest/doc_breakpoint-move.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_breakpoint-move.html
rename to devtools/client/debugger/test/mochitest/doc_breakpoint-move.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_breakpoints-break-on-last-line-of-script-on-reload.html b/devtools/client/debugger/test/mochitest/doc_breakpoints-break-on-last-line-of-script-on-reload.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_breakpoints-break-on-last-line-of-script-on-reload.html
rename to devtools/client/debugger/test/mochitest/doc_breakpoints-break-on-last-line-of-script-on-reload.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_breakpoints-other-tabs.html b/devtools/client/debugger/test/mochitest/doc_breakpoints-other-tabs.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_breakpoints-other-tabs.html
rename to devtools/client/debugger/test/mochitest/doc_breakpoints-other-tabs.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_breakpoints-reload.html b/devtools/client/debugger/test/mochitest/doc_breakpoints-reload.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_breakpoints-reload.html
rename to devtools/client/debugger/test/mochitest/doc_breakpoints-reload.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_bug-896139.html b/devtools/client/debugger/test/mochitest/doc_bug-896139.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_bug-896139.html
rename to devtools/client/debugger/test/mochitest/doc_bug-896139.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_closure-optimized-out.html b/devtools/client/debugger/test/mochitest/doc_closure-optimized-out.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_closure-optimized-out.html
rename to devtools/client/debugger/test/mochitest/doc_closure-optimized-out.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_closures.html b/devtools/client/debugger/test/mochitest/doc_closures.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_closures.html
rename to devtools/client/debugger/test/mochitest/doc_closures.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_cmd-break.html b/devtools/client/debugger/test/mochitest/doc_cmd-break.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_cmd-break.html
rename to devtools/client/debugger/test/mochitest/doc_cmd-break.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_cmd-dbg.html b/devtools/client/debugger/test/mochitest/doc_cmd-dbg.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_cmd-dbg.html
rename to devtools/client/debugger/test/mochitest/doc_cmd-dbg.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_conditional-breakpoints.html b/devtools/client/debugger/test/mochitest/doc_conditional-breakpoints.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_conditional-breakpoints.html
rename to devtools/client/debugger/test/mochitest/doc_conditional-breakpoints.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_domnode-variables.html b/devtools/client/debugger/test/mochitest/doc_domnode-variables.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_domnode-variables.html
rename to devtools/client/debugger/test/mochitest/doc_domnode-variables.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_editor-mode.html b/devtools/client/debugger/test/mochitest/doc_editor-mode.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_editor-mode.html
rename to devtools/client/debugger/test/mochitest/doc_editor-mode.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_empty-tab-01.html b/devtools/client/debugger/test/mochitest/doc_empty-tab-01.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_empty-tab-01.html
rename to devtools/client/debugger/test/mochitest/doc_empty-tab-01.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_empty-tab-02.html b/devtools/client/debugger/test/mochitest/doc_empty-tab-02.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_empty-tab-02.html
rename to devtools/client/debugger/test/mochitest/doc_empty-tab-02.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_event-listeners-01.html b/devtools/client/debugger/test/mochitest/doc_event-listeners-01.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_event-listeners-01.html
rename to devtools/client/debugger/test/mochitest/doc_event-listeners-01.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_event-listeners-02.html b/devtools/client/debugger/test/mochitest/doc_event-listeners-02.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_event-listeners-02.html
rename to devtools/client/debugger/test/mochitest/doc_event-listeners-02.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_event-listeners-03.html b/devtools/client/debugger/test/mochitest/doc_event-listeners-03.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_event-listeners-03.html
rename to devtools/client/debugger/test/mochitest/doc_event-listeners-03.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_event-listeners-04.html b/devtools/client/debugger/test/mochitest/doc_event-listeners-04.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_event-listeners-04.html
rename to devtools/client/debugger/test/mochitest/doc_event-listeners-04.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_frame-parameters.html b/devtools/client/debugger/test/mochitest/doc_frame-parameters.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_frame-parameters.html
rename to devtools/client/debugger/test/mochitest/doc_frame-parameters.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_function-display-name.html b/devtools/client/debugger/test/mochitest/doc_function-display-name.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_function-display-name.html
rename to devtools/client/debugger/test/mochitest/doc_function-display-name.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_function-search.html b/devtools/client/debugger/test/mochitest/doc_function-search.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_function-search.html
rename to devtools/client/debugger/test/mochitest/doc_function-search.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_global-method-override.html b/devtools/client/debugger/test/mochitest/doc_global-method-override.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_global-method-override.html
rename to devtools/client/debugger/test/mochitest/doc_global-method-override.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_iframes.html b/devtools/client/debugger/test/mochitest/doc_iframes.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_iframes.html
rename to devtools/client/debugger/test/mochitest/doc_iframes.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_included-script.html b/devtools/client/debugger/test/mochitest/doc_included-script.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_included-script.html
rename to devtools/client/debugger/test/mochitest/doc_included-script.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_inline-debugger-statement.html b/devtools/client/debugger/test/mochitest/doc_inline-debugger-statement.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_inline-debugger-statement.html
rename to devtools/client/debugger/test/mochitest/doc_inline-debugger-statement.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_inline-script.html b/devtools/client/debugger/test/mochitest/doc_inline-script.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_inline-script.html
rename to devtools/client/debugger/test/mochitest/doc_inline-script.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_large-array-buffer.html b/devtools/client/debugger/test/mochitest/doc_large-array-buffer.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_large-array-buffer.html
rename to devtools/client/debugger/test/mochitest/doc_large-array-buffer.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_listworkers-tab.html b/devtools/client/debugger/test/mochitest/doc_listworkers-tab.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_listworkers-tab.html
rename to devtools/client/debugger/test/mochitest/doc_listworkers-tab.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_minified.html b/devtools/client/debugger/test/mochitest/doc_minified.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_minified.html
rename to devtools/client/debugger/test/mochitest/doc_minified.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_minified_bogus_map.html b/devtools/client/debugger/test/mochitest/doc_minified_bogus_map.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_minified_bogus_map.html
rename to devtools/client/debugger/test/mochitest/doc_minified_bogus_map.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_native-event-handler.html b/devtools/client/debugger/test/mochitest/doc_native-event-handler.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_native-event-handler.html
rename to devtools/client/debugger/test/mochitest/doc_native-event-handler.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_no-page-sources.html b/devtools/client/debugger/test/mochitest/doc_no-page-sources.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_no-page-sources.html
rename to devtools/client/debugger/test/mochitest/doc_no-page-sources.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_pause-exceptions.html b/devtools/client/debugger/test/mochitest/doc_pause-exceptions.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_pause-exceptions.html
rename to devtools/client/debugger/test/mochitest/doc_pause-exceptions.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_pretty-print-2.html b/devtools/client/debugger/test/mochitest/doc_pretty-print-2.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_pretty-print-2.html
rename to devtools/client/debugger/test/mochitest/doc_pretty-print-2.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_pretty-print-3.html b/devtools/client/debugger/test/mochitest/doc_pretty-print-3.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_pretty-print-3.html
rename to devtools/client/debugger/test/mochitest/doc_pretty-print-3.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_pretty-print-on-paused.html b/devtools/client/debugger/test/mochitest/doc_pretty-print-on-paused.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_pretty-print-on-paused.html
rename to devtools/client/debugger/test/mochitest/doc_pretty-print-on-paused.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_pretty-print.html b/devtools/client/debugger/test/mochitest/doc_pretty-print.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_pretty-print.html
rename to devtools/client/debugger/test/mochitest/doc_pretty-print.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_promise-get-allocation-stack.html b/devtools/client/debugger/test/mochitest/doc_promise-get-allocation-stack.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_promise-get-allocation-stack.html
rename to devtools/client/debugger/test/mochitest/doc_promise-get-allocation-stack.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_promise-get-fulfillment-stack.html b/devtools/client/debugger/test/mochitest/doc_promise-get-fulfillment-stack.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_promise-get-fulfillment-stack.html
rename to devtools/client/debugger/test/mochitest/doc_promise-get-fulfillment-stack.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_promise-get-rejection-stack.html b/devtools/client/debugger/test/mochitest/doc_promise-get-rejection-stack.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_promise-get-rejection-stack.html
rename to devtools/client/debugger/test/mochitest/doc_promise-get-rejection-stack.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_promise.html b/devtools/client/debugger/test/mochitest/doc_promise.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_promise.html
rename to devtools/client/debugger/test/mochitest/doc_promise.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_random-javascript.html b/devtools/client/debugger/test/mochitest/doc_random-javascript.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_random-javascript.html
rename to devtools/client/debugger/test/mochitest/doc_random-javascript.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_recursion-stack.html b/devtools/client/debugger/test/mochitest/doc_recursion-stack.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_recursion-stack.html
rename to devtools/client/debugger/test/mochitest/doc_recursion-stack.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_scope-variable-2.html b/devtools/client/debugger/test/mochitest/doc_scope-variable-2.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_scope-variable-2.html
rename to devtools/client/debugger/test/mochitest/doc_scope-variable-2.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_scope-variable-3.html b/devtools/client/debugger/test/mochitest/doc_scope-variable-3.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_scope-variable-3.html
rename to devtools/client/debugger/test/mochitest/doc_scope-variable-3.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_scope-variable-4.html b/devtools/client/debugger/test/mochitest/doc_scope-variable-4.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_scope-variable-4.html
rename to devtools/client/debugger/test/mochitest/doc_scope-variable-4.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_scope-variable.html b/devtools/client/debugger/test/mochitest/doc_scope-variable.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_scope-variable.html
rename to devtools/client/debugger/test/mochitest/doc_scope-variable.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_script-bookmarklet.html b/devtools/client/debugger/test/mochitest/doc_script-bookmarklet.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_script-bookmarklet.html
rename to devtools/client/debugger/test/mochitest/doc_script-bookmarklet.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_script-eval.html b/devtools/client/debugger/test/mochitest/doc_script-eval.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_script-eval.html
rename to devtools/client/debugger/test/mochitest/doc_script-eval.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_script-switching-01.html b/devtools/client/debugger/test/mochitest/doc_script-switching-01.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_script-switching-01.html
rename to devtools/client/debugger/test/mochitest/doc_script-switching-01.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_script-switching-02.html b/devtools/client/debugger/test/mochitest/doc_script-switching-02.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_script-switching-02.html
rename to devtools/client/debugger/test/mochitest/doc_script-switching-02.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_split-console-paused-reload.html b/devtools/client/debugger/test/mochitest/doc_split-console-paused-reload.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_split-console-paused-reload.html
rename to devtools/client/debugger/test/mochitest/doc_split-console-paused-reload.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_step-out.html b/devtools/client/debugger/test/mochitest/doc_step-out.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_step-out.html
rename to devtools/client/debugger/test/mochitest/doc_step-out.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_terminate-on-tab-close.html b/devtools/client/debugger/test/mochitest/doc_terminate-on-tab-close.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_terminate-on-tab-close.html
rename to devtools/client/debugger/test/mochitest/doc_terminate-on-tab-close.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_watch-expression-button.html b/devtools/client/debugger/test/mochitest/doc_watch-expression-button.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_watch-expression-button.html
rename to devtools/client/debugger/test/mochitest/doc_watch-expression-button.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_watch-expressions.html b/devtools/client/debugger/test/mochitest/doc_watch-expressions.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_watch-expressions.html
rename to devtools/client/debugger/test/mochitest/doc_watch-expressions.html
diff --git a/browser/devtools/debugger/test/mochitest/doc_with-frame.html b/devtools/client/debugger/test/mochitest/doc_with-frame.html
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/doc_with-frame.html
rename to devtools/client/debugger/test/mochitest/doc_with-frame.html
diff --git a/browser/devtools/debugger/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/head.js
rename to devtools/client/debugger/test/mochitest/head.js
diff --git a/browser/devtools/debugger/test/mochitest/sjs_random-javascript.sjs b/devtools/client/debugger/test/mochitest/sjs_random-javascript.sjs
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/sjs_random-javascript.sjs
rename to devtools/client/debugger/test/mochitest/sjs_random-javascript.sjs
diff --git a/browser/devtools/debugger/test/mochitest/testactors.js b/devtools/client/debugger/test/mochitest/testactors.js
similarity index 100%
rename from browser/devtools/debugger/test/mochitest/testactors.js
rename to devtools/client/debugger/test/mochitest/testactors.js
diff --git a/browser/devtools/debugger/utils.js b/devtools/client/debugger/utils.js
similarity index 100%
rename from browser/devtools/debugger/utils.js
rename to devtools/client/debugger/utils.js
diff --git a/browser/devtools/debugger/views/filter-view.js b/devtools/client/debugger/views/filter-view.js
similarity index 100%
rename from browser/devtools/debugger/views/filter-view.js
rename to devtools/client/debugger/views/filter-view.js
diff --git a/browser/devtools/debugger/views/global-search-view.js b/devtools/client/debugger/views/global-search-view.js
similarity index 100%
rename from browser/devtools/debugger/views/global-search-view.js
rename to devtools/client/debugger/views/global-search-view.js
diff --git a/browser/devtools/debugger/views/options-view.js b/devtools/client/debugger/views/options-view.js
similarity index 100%
rename from browser/devtools/debugger/views/options-view.js
rename to devtools/client/debugger/views/options-view.js
diff --git a/browser/devtools/debugger/views/sources-view.js b/devtools/client/debugger/views/sources-view.js
similarity index 100%
rename from browser/devtools/debugger/views/sources-view.js
rename to devtools/client/debugger/views/sources-view.js
diff --git a/browser/devtools/debugger/views/stack-frames-classic-view.js b/devtools/client/debugger/views/stack-frames-classic-view.js
similarity index 100%
rename from browser/devtools/debugger/views/stack-frames-classic-view.js
rename to devtools/client/debugger/views/stack-frames-classic-view.js
diff --git a/browser/devtools/debugger/views/stack-frames-view.js b/devtools/client/debugger/views/stack-frames-view.js
similarity index 100%
rename from browser/devtools/debugger/views/stack-frames-view.js
rename to devtools/client/debugger/views/stack-frames-view.js
diff --git a/browser/devtools/debugger/views/toolbar-view.js b/devtools/client/debugger/views/toolbar-view.js
similarity index 100%
rename from browser/devtools/debugger/views/toolbar-view.js
rename to devtools/client/debugger/views/toolbar-view.js
diff --git a/browser/devtools/debugger/views/variable-bubble-view.js b/devtools/client/debugger/views/variable-bubble-view.js
similarity index 100%
rename from browser/devtools/debugger/views/variable-bubble-view.js
rename to devtools/client/debugger/views/variable-bubble-view.js
diff --git a/browser/devtools/debugger/views/watch-expressions-view.js b/devtools/client/debugger/views/watch-expressions-view.js
similarity index 100%
rename from browser/devtools/debugger/views/watch-expressions-view.js
rename to devtools/client/debugger/views/watch-expressions-view.js
diff --git a/browser/devtools/debugger/views/workers-view.js b/devtools/client/debugger/views/workers-view.js
similarity index 100%
rename from browser/devtools/debugger/views/workers-view.js
rename to devtools/client/debugger/views/workers-view.js
diff --git a/browser/devtools/definitions.js b/devtools/client/definitions.js
similarity index 100%
rename from browser/devtools/definitions.js
rename to devtools/client/definitions.js
diff --git a/browser/devtools/devtools-clhandler.js b/devtools/client/devtools-clhandler.js
similarity index 100%
rename from browser/devtools/devtools-clhandler.js
rename to devtools/client/devtools-clhandler.js
diff --git a/browser/devtools/devtools-clhandler.manifest b/devtools/client/devtools-clhandler.manifest
similarity index 100%
rename from browser/devtools/devtools-clhandler.manifest
rename to devtools/client/devtools-clhandler.manifest
diff --git a/browser/devtools/eyedropper/commands.js b/devtools/client/eyedropper/commands.js
similarity index 100%
rename from browser/devtools/eyedropper/commands.js
rename to devtools/client/eyedropper/commands.js
diff --git a/browser/devtools/eyedropper/crosshairs.css b/devtools/client/eyedropper/crosshairs.css
similarity index 100%
rename from browser/devtools/eyedropper/crosshairs.css
rename to devtools/client/eyedropper/crosshairs.css
diff --git a/browser/devtools/eyedropper/eyedropper-child.js b/devtools/client/eyedropper/eyedropper-child.js
similarity index 100%
rename from browser/devtools/eyedropper/eyedropper-child.js
rename to devtools/client/eyedropper/eyedropper-child.js
diff --git a/browser/devtools/eyedropper/eyedropper.js b/devtools/client/eyedropper/eyedropper.js
similarity index 100%
rename from browser/devtools/eyedropper/eyedropper.js
rename to devtools/client/eyedropper/eyedropper.js
diff --git a/browser/devtools/eyedropper/eyedropper.xul b/devtools/client/eyedropper/eyedropper.xul
similarity index 100%
rename from browser/devtools/eyedropper/eyedropper.xul
rename to devtools/client/eyedropper/eyedropper.xul
diff --git a/browser/devtools/eyedropper/moz.build b/devtools/client/eyedropper/moz.build
similarity index 100%
rename from browser/devtools/eyedropper/moz.build
rename to devtools/client/eyedropper/moz.build
diff --git a/browser/devtools/eyedropper/nocursor.css b/devtools/client/eyedropper/nocursor.css
similarity index 100%
rename from browser/devtools/eyedropper/nocursor.css
rename to devtools/client/eyedropper/nocursor.css
diff --git a/browser/devtools/eyedropper/test/.eslintrc b/devtools/client/eyedropper/test/.eslintrc
similarity index 100%
rename from browser/devtools/eyedropper/test/.eslintrc
rename to devtools/client/eyedropper/test/.eslintrc
diff --git a/browser/devtools/eyedropper/test/browser.ini b/devtools/client/eyedropper/test/browser.ini
similarity index 100%
rename from browser/devtools/eyedropper/test/browser.ini
rename to devtools/client/eyedropper/test/browser.ini
diff --git a/browser/devtools/eyedropper/test/browser_eyedropper_basic.js b/devtools/client/eyedropper/test/browser_eyedropper_basic.js
similarity index 100%
rename from browser/devtools/eyedropper/test/browser_eyedropper_basic.js
rename to devtools/client/eyedropper/test/browser_eyedropper_basic.js
diff --git a/browser/devtools/eyedropper/test/browser_eyedropper_cmd.js b/devtools/client/eyedropper/test/browser_eyedropper_cmd.js
similarity index 100%
rename from browser/devtools/eyedropper/test/browser_eyedropper_cmd.js
rename to devtools/client/eyedropper/test/browser_eyedropper_cmd.js
diff --git a/browser/devtools/eyedropper/test/color-block.html b/devtools/client/eyedropper/test/color-block.html
similarity index 100%
rename from browser/devtools/eyedropper/test/color-block.html
rename to devtools/client/eyedropper/test/color-block.html
diff --git a/browser/devtools/eyedropper/test/head.js b/devtools/client/eyedropper/test/head.js
similarity index 100%
rename from browser/devtools/eyedropper/test/head.js
rename to devtools/client/eyedropper/test/head.js
diff --git a/browser/devtools/fontinspector/font-inspector.css b/devtools/client/fontinspector/font-inspector.css
similarity index 100%
rename from browser/devtools/fontinspector/font-inspector.css
rename to devtools/client/fontinspector/font-inspector.css
diff --git a/browser/devtools/fontinspector/font-inspector.js b/devtools/client/fontinspector/font-inspector.js
similarity index 100%
rename from browser/devtools/fontinspector/font-inspector.js
rename to devtools/client/fontinspector/font-inspector.js
diff --git a/browser/devtools/fontinspector/font-inspector.xhtml b/devtools/client/fontinspector/font-inspector.xhtml
similarity index 100%
rename from browser/devtools/fontinspector/font-inspector.xhtml
rename to devtools/client/fontinspector/font-inspector.xhtml
diff --git a/browser/devtools/fontinspector/moz.build b/devtools/client/fontinspector/moz.build
similarity index 100%
rename from browser/devtools/fontinspector/moz.build
rename to devtools/client/fontinspector/moz.build
diff --git a/browser/devtools/fontinspector/test/.eslintrc b/devtools/client/fontinspector/test/.eslintrc
similarity index 100%
rename from browser/devtools/fontinspector/test/.eslintrc
rename to devtools/client/fontinspector/test/.eslintrc
diff --git a/browser/devtools/fontinspector/test/OstrichLicense.txt b/devtools/client/fontinspector/test/OstrichLicense.txt
similarity index 100%
rename from browser/devtools/fontinspector/test/OstrichLicense.txt
rename to devtools/client/fontinspector/test/OstrichLicense.txt
diff --git a/browser/devtools/fontinspector/test/browser.ini b/devtools/client/fontinspector/test/browser.ini
similarity index 100%
rename from browser/devtools/fontinspector/test/browser.ini
rename to devtools/client/fontinspector/test/browser.ini
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector.html b/devtools/client/fontinspector/test/browser_fontinspector.html
similarity index 100%
rename from browser/devtools/fontinspector/test/browser_fontinspector.html
rename to devtools/client/fontinspector/test/browser_fontinspector.html
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector.js b/devtools/client/fontinspector/test/browser_fontinspector.js
similarity index 100%
rename from browser/devtools/fontinspector/test/browser_fontinspector.js
rename to devtools/client/fontinspector/test/browser_fontinspector.js
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js b/devtools/client/fontinspector/test/browser_fontinspector_edit-previews-show-all.js
similarity index 100%
rename from browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js
rename to devtools/client/fontinspector/test/browser_fontinspector_edit-previews-show-all.js
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js b/devtools/client/fontinspector/test/browser_fontinspector_edit-previews.js
similarity index 100%
rename from browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js
rename to devtools/client/fontinspector/test/browser_fontinspector_edit-previews.js
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector_theme-change.js b/devtools/client/fontinspector/test/browser_fontinspector_theme-change.js
similarity index 100%
rename from browser/devtools/fontinspector/test/browser_fontinspector_theme-change.js
rename to devtools/client/fontinspector/test/browser_fontinspector_theme-change.js
diff --git a/browser/devtools/fontinspector/test/head.js b/devtools/client/fontinspector/test/head.js
similarity index 100%
rename from browser/devtools/fontinspector/test/head.js
rename to devtools/client/fontinspector/test/head.js
diff --git a/browser/devtools/fontinspector/test/ostrich-black.ttf b/devtools/client/fontinspector/test/ostrich-black.ttf
similarity index 100%
rename from browser/devtools/fontinspector/test/ostrich-black.ttf
rename to devtools/client/fontinspector/test/ostrich-black.ttf
diff --git a/browser/devtools/fontinspector/test/ostrich-regular.ttf b/devtools/client/fontinspector/test/ostrich-regular.ttf
similarity index 100%
rename from browser/devtools/fontinspector/test/ostrich-regular.ttf
rename to devtools/client/fontinspector/test/ostrich-regular.ttf
diff --git a/browser/devtools/fontinspector/test/test_iframe.html b/devtools/client/fontinspector/test/test_iframe.html
similarity index 100%
rename from browser/devtools/fontinspector/test/test_iframe.html
rename to devtools/client/fontinspector/test/test_iframe.html
diff --git a/browser/devtools/framework/ToolboxProcess.jsm b/devtools/client/framework/ToolboxProcess.jsm
similarity index 100%
rename from browser/devtools/framework/ToolboxProcess.jsm
rename to devtools/client/framework/ToolboxProcess.jsm
diff --git a/browser/devtools/framework/connect/connect.css b/devtools/client/framework/connect/connect.css
similarity index 100%
rename from browser/devtools/framework/connect/connect.css
rename to devtools/client/framework/connect/connect.css
diff --git a/browser/devtools/framework/connect/connect.js b/devtools/client/framework/connect/connect.js
similarity index 100%
rename from browser/devtools/framework/connect/connect.js
rename to devtools/client/framework/connect/connect.js
diff --git a/browser/devtools/framework/connect/connect.xhtml b/devtools/client/framework/connect/connect.xhtml
similarity index 100%
rename from browser/devtools/framework/connect/connect.xhtml
rename to devtools/client/framework/connect/connect.xhtml
diff --git a/browser/devtools/framework/dev-edition-promo/dev-edition-logo.png b/devtools/client/framework/dev-edition-promo/dev-edition-logo.png
similarity index 100%
rename from browser/devtools/framework/dev-edition-promo/dev-edition-logo.png
rename to devtools/client/framework/dev-edition-promo/dev-edition-logo.png
diff --git a/browser/devtools/framework/dev-edition-promo/dev-edition-promo.css b/devtools/client/framework/dev-edition-promo/dev-edition-promo.css
similarity index 100%
rename from browser/devtools/framework/dev-edition-promo/dev-edition-promo.css
rename to devtools/client/framework/dev-edition-promo/dev-edition-promo.css
diff --git a/browser/devtools/framework/dev-edition-promo/dev-edition-promo.xul b/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul
similarity index 100%
rename from browser/devtools/framework/dev-edition-promo/dev-edition-promo.xul
rename to devtools/client/framework/dev-edition-promo/dev-edition-promo.xul
diff --git a/browser/devtools/framework/gDevTools.jsm b/devtools/client/framework/gDevTools.jsm
similarity index 100%
rename from browser/devtools/framework/gDevTools.jsm
rename to devtools/client/framework/gDevTools.jsm
diff --git a/browser/devtools/framework/moz.build b/devtools/client/framework/moz.build
similarity index 100%
rename from browser/devtools/framework/moz.build
rename to devtools/client/framework/moz.build
diff --git a/browser/devtools/framework/options-panel.css b/devtools/client/framework/options-panel.css
similarity index 100%
rename from browser/devtools/framework/options-panel.css
rename to devtools/client/framework/options-panel.css
diff --git a/browser/devtools/framework/selection.js b/devtools/client/framework/selection.js
similarity index 100%
rename from browser/devtools/framework/selection.js
rename to devtools/client/framework/selection.js
diff --git a/browser/devtools/framework/sidebar.js b/devtools/client/framework/sidebar.js
similarity index 100%
rename from browser/devtools/framework/sidebar.js
rename to devtools/client/framework/sidebar.js
diff --git a/browser/devtools/framework/target.js b/devtools/client/framework/target.js
similarity index 100%
rename from browser/devtools/framework/target.js
rename to devtools/client/framework/target.js
diff --git a/browser/devtools/framework/test/.eslintrc b/devtools/client/framework/test/.eslintrc
similarity index 100%
rename from browser/devtools/framework/test/.eslintrc
rename to devtools/client/framework/test/.eslintrc
diff --git a/browser/devtools/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
similarity index 100%
rename from browser/devtools/framework/test/browser.ini
rename to devtools/client/framework/test/browser.ini
diff --git a/browser/devtools/framework/test/browser_devtools_api.js b/devtools/client/framework/test/browser_devtools_api.js
similarity index 100%
rename from browser/devtools/framework/test/browser_devtools_api.js
rename to devtools/client/framework/test/browser_devtools_api.js
diff --git a/browser/devtools/framework/test/browser_devtools_api_destroy.js b/devtools/client/framework/test/browser_devtools_api_destroy.js
similarity index 100%
rename from browser/devtools/framework/test/browser_devtools_api_destroy.js
rename to devtools/client/framework/test/browser_devtools_api_destroy.js
diff --git a/browser/devtools/framework/test/browser_dynamic_tool_enabling.js b/devtools/client/framework/test/browser_dynamic_tool_enabling.js
similarity index 100%
rename from browser/devtools/framework/test/browser_dynamic_tool_enabling.js
rename to devtools/client/framework/test/browser_dynamic_tool_enabling.js
diff --git a/browser/devtools/framework/test/browser_ignore_toolbox_network_requests.js b/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
similarity index 100%
rename from browser/devtools/framework/test/browser_ignore_toolbox_network_requests.js
rename to devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
diff --git a/browser/devtools/framework/test/browser_keybindings_01.js b/devtools/client/framework/test/browser_keybindings_01.js
similarity index 100%
rename from browser/devtools/framework/test/browser_keybindings_01.js
rename to devtools/client/framework/test/browser_keybindings_01.js
diff --git a/browser/devtools/framework/test/browser_keybindings_02.js b/devtools/client/framework/test/browser_keybindings_02.js
similarity index 100%
rename from browser/devtools/framework/test/browser_keybindings_02.js
rename to devtools/client/framework/test/browser_keybindings_02.js
diff --git a/browser/devtools/framework/test/browser_keybindings_03.js b/devtools/client/framework/test/browser_keybindings_03.js
similarity index 100%
rename from browser/devtools/framework/test/browser_keybindings_03.js
rename to devtools/client/framework/test/browser_keybindings_03.js
diff --git a/browser/devtools/framework/test/browser_new_activation_workflow.js b/devtools/client/framework/test/browser_new_activation_workflow.js
similarity index 100%
rename from browser/devtools/framework/test/browser_new_activation_workflow.js
rename to devtools/client/framework/test/browser_new_activation_workflow.js
diff --git a/browser/devtools/framework/test/browser_target_events.js b/devtools/client/framework/test/browser_target_events.js
similarity index 100%
rename from browser/devtools/framework/test/browser_target_events.js
rename to devtools/client/framework/test/browser_target_events.js
diff --git a/browser/devtools/framework/test/browser_target_remote.js b/devtools/client/framework/test/browser_target_remote.js
similarity index 100%
rename from browser/devtools/framework/test/browser_target_remote.js
rename to devtools/client/framework/test/browser_target_remote.js
diff --git a/browser/devtools/framework/test/browser_target_support.js b/devtools/client/framework/test/browser_target_support.js
similarity index 100%
rename from browser/devtools/framework/test/browser_target_support.js
rename to devtools/client/framework/test/browser_target_support.js
diff --git a/browser/devtools/framework/test/browser_toolbox_custom_host.js b/devtools/client/framework/test/browser_toolbox_custom_host.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_custom_host.js
rename to devtools/client/framework/test/browser_toolbox_custom_host.js
diff --git a/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js b/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
rename to devtools/client/framework/test/browser_toolbox_dynamic_registration.js
diff --git a/browser/devtools/framework/test/browser_toolbox_getpanelwhenready.js b/devtools/client/framework/test/browser_toolbox_getpanelwhenready.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_getpanelwhenready.js
rename to devtools/client/framework/test/browser_toolbox_getpanelwhenready.js
diff --git a/browser/devtools/framework/test/browser_toolbox_highlight.js b/devtools/client/framework/test/browser_toolbox_highlight.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_highlight.js
rename to devtools/client/framework/test/browser_toolbox_highlight.js
diff --git a/browser/devtools/framework/test/browser_toolbox_hosts.js b/devtools/client/framework/test/browser_toolbox_hosts.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_hosts.js
rename to devtools/client/framework/test/browser_toolbox_hosts.js
diff --git a/browser/devtools/framework/test/browser_toolbox_hosts_size.js b/devtools/client/framework/test/browser_toolbox_hosts_size.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_hosts_size.js
rename to devtools/client/framework/test/browser_toolbox_hosts_size.js
diff --git a/browser/devtools/framework/test/browser_toolbox_minimize.js b/devtools/client/framework/test/browser_toolbox_minimize.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_minimize.js
rename to devtools/client/framework/test/browser_toolbox_minimize.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options.js b/devtools/client/framework/test/browser_toolbox_options.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options.js
rename to devtools/client/framework/test/browser_toolbox_options.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_buttons.js b/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_buttons.js
rename to devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_cache-01.js b/devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_cache-01.js
rename to devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_cache-02.js b/devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_cache-02.js
rename to devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_cache.sjs b/devtools/client/framework/test/browser_toolbox_options_disable_cache.sjs
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_cache.sjs
rename to devtools/client/framework/test/browser_toolbox_options_disable_cache.sjs
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_js.html b/devtools/client/framework/test/browser_toolbox_options_disable_js.html
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_js.html
rename to devtools/client/framework/test/browser_toolbox_options_disable_js.html
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_js.js b/devtools/client/framework/test/browser_toolbox_options_disable_js.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_js.js
rename to devtools/client/framework/test/browser_toolbox_options_disable_js.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html b/devtools/client/framework/test/browser_toolbox_options_disable_js_iframe.html
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html
rename to devtools/client/framework/test/browser_toolbox_options_disable_js_iframe.html
diff --git a/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.html b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.html
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.html
rename to devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.html
diff --git a/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
rename to devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
diff --git a/browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
rename to devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
diff --git a/browser/devtools/framework/test/browser_toolbox_raise.js b/devtools/client/framework/test/browser_toolbox_raise.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_raise.js
rename to devtools/client/framework/test/browser_toolbox_raise.js
diff --git a/browser/devtools/framework/test/browser_toolbox_ready.js b/devtools/client/framework/test/browser_toolbox_ready.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_ready.js
rename to devtools/client/framework/test/browser_toolbox_ready.js
diff --git a/browser/devtools/framework/test/browser_toolbox_select_event.js b/devtools/client/framework/test/browser_toolbox_select_event.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_select_event.js
rename to devtools/client/framework/test/browser_toolbox_select_event.js
diff --git a/browser/devtools/framework/test/browser_toolbox_selected_tool_unavailable.js b/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_selected_tool_unavailable.js
rename to devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar.js b/devtools/client/framework/test/browser_toolbox_sidebar.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_sidebar.js
rename to devtools/client/framework/test/browser_toolbox_sidebar.js
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar_events.js b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_sidebar_events.js
rename to devtools/client/framework/test/browser_toolbox_sidebar_events.js
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar_existing_tabs.js b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_sidebar_existing_tabs.js
rename to devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar_overflow_menu.js b/devtools/client/framework/test/browser_toolbox_sidebar_overflow_menu.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_sidebar_overflow_menu.js
rename to devtools/client/framework/test/browser_toolbox_sidebar_overflow_menu.js
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar_tool.xul b/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_sidebar_tool.xul
rename to devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
diff --git a/browser/devtools/framework/test/browser_toolbox_tabsswitch_shortcuts.js b/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_tabsswitch_shortcuts.js
rename to devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
diff --git a/browser/devtools/framework/test/browser_toolbox_textbox_context_menu.js b/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_textbox_context_menu.js
rename to devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
diff --git a/browser/devtools/framework/test/browser_toolbox_theme_registration.js b/devtools/client/framework/test/browser_toolbox_theme_registration.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_theme_registration.js
rename to devtools/client/framework/test/browser_toolbox_theme_registration.js
diff --git a/browser/devtools/framework/test/browser_toolbox_toggle.js b/devtools/client/framework/test/browser_toolbox_toggle.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_toggle.js
rename to devtools/client/framework/test/browser_toolbox_toggle.js
diff --git a/browser/devtools/framework/test/browser_toolbox_tool_ready.js b/devtools/client/framework/test/browser_toolbox_tool_ready.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_tool_ready.js
rename to devtools/client/framework/test/browser_toolbox_tool_ready.js
diff --git a/browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js b/devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js
rename to devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
diff --git a/browser/devtools/framework/test/browser_toolbox_transport_events.js b/devtools/client/framework/test/browser_toolbox_transport_events.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_transport_events.js
rename to devtools/client/framework/test/browser_toolbox_transport_events.js
diff --git a/browser/devtools/framework/test/browser_toolbox_view_source_01.js b/devtools/client/framework/test/browser_toolbox_view_source_01.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_view_source_01.js
rename to devtools/client/framework/test/browser_toolbox_view_source_01.js
diff --git a/browser/devtools/framework/test/browser_toolbox_view_source_02.js b/devtools/client/framework/test/browser_toolbox_view_source_02.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_view_source_02.js
rename to devtools/client/framework/test/browser_toolbox_view_source_02.js
diff --git a/browser/devtools/framework/test/browser_toolbox_view_source_03.js b/devtools/client/framework/test/browser_toolbox_view_source_03.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_view_source_03.js
rename to devtools/client/framework/test/browser_toolbox_view_source_03.js
diff --git a/browser/devtools/framework/test/browser_toolbox_view_source_04.js b/devtools/client/framework/test/browser_toolbox_view_source_04.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_view_source_04.js
rename to devtools/client/framework/test/browser_toolbox_view_source_04.js
diff --git a/browser/devtools/framework/test/browser_toolbox_window_reload_target.js b/devtools/client/framework/test/browser_toolbox_window_reload_target.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_window_reload_target.js
rename to devtools/client/framework/test/browser_toolbox_window_reload_target.js
diff --git a/browser/devtools/framework/test/browser_toolbox_window_shortcuts.js b/devtools/client/framework/test/browser_toolbox_window_shortcuts.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_window_shortcuts.js
rename to devtools/client/framework/test/browser_toolbox_window_shortcuts.js
diff --git a/browser/devtools/framework/test/browser_toolbox_window_title_changes.js b/devtools/client/framework/test/browser_toolbox_window_title_changes.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_window_title_changes.js
rename to devtools/client/framework/test/browser_toolbox_window_title_changes.js
diff --git a/browser/devtools/framework/test/browser_toolbox_zoom.js b/devtools/client/framework/test/browser_toolbox_zoom.js
similarity index 100%
rename from browser/devtools/framework/test/browser_toolbox_zoom.js
rename to devtools/client/framework/test/browser_toolbox_zoom.js
diff --git a/browser/devtools/framework/test/browser_two_tabs.js b/devtools/client/framework/test/browser_two_tabs.js
similarity index 100%
rename from browser/devtools/framework/test/browser_two_tabs.js
rename to devtools/client/framework/test/browser_two_tabs.js
diff --git a/browser/devtools/framework/test/code_math.js b/devtools/client/framework/test/code_math.js
similarity index 100%
rename from browser/devtools/framework/test/code_math.js
rename to devtools/client/framework/test/code_math.js
diff --git a/browser/devtools/framework/test/doc_theme.css b/devtools/client/framework/test/doc_theme.css
similarity index 100%
rename from browser/devtools/framework/test/doc_theme.css
rename to devtools/client/framework/test/doc_theme.css
diff --git a/browser/devtools/framework/test/doc_viewsource.html b/devtools/client/framework/test/doc_viewsource.html
similarity index 100%
rename from browser/devtools/framework/test/doc_viewsource.html
rename to devtools/client/framework/test/doc_viewsource.html
diff --git a/browser/devtools/framework/test/head.js b/devtools/client/framework/test/head.js
similarity index 100%
rename from browser/devtools/framework/test/head.js
rename to devtools/client/framework/test/head.js
diff --git a/browser/devtools/framework/test/helper_disable_cache.js b/devtools/client/framework/test/helper_disable_cache.js
similarity index 100%
rename from browser/devtools/framework/test/helper_disable_cache.js
rename to devtools/client/framework/test/helper_disable_cache.js
diff --git a/browser/devtools/framework/test/serviceworker.js b/devtools/client/framework/test/serviceworker.js
similarity index 100%
rename from browser/devtools/framework/test/serviceworker.js
rename to devtools/client/framework/test/serviceworker.js
diff --git a/browser/devtools/framework/test/shared-head.js b/devtools/client/framework/test/shared-head.js
similarity index 100%
rename from browser/devtools/framework/test/shared-head.js
rename to devtools/client/framework/test/shared-head.js
diff --git a/browser/devtools/framework/toolbox-highlighter-utils.js b/devtools/client/framework/toolbox-highlighter-utils.js
similarity index 100%
rename from browser/devtools/framework/toolbox-highlighter-utils.js
rename to devtools/client/framework/toolbox-highlighter-utils.js
diff --git a/browser/devtools/framework/toolbox-hosts.js b/devtools/client/framework/toolbox-hosts.js
similarity index 100%
rename from browser/devtools/framework/toolbox-hosts.js
rename to devtools/client/framework/toolbox-hosts.js
diff --git a/browser/devtools/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js
similarity index 100%
rename from browser/devtools/framework/toolbox-options.js
rename to devtools/client/framework/toolbox-options.js
diff --git a/browser/devtools/framework/toolbox-options.xul b/devtools/client/framework/toolbox-options.xul
similarity index 100%
rename from browser/devtools/framework/toolbox-options.xul
rename to devtools/client/framework/toolbox-options.xul
diff --git a/browser/devtools/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
similarity index 100%
rename from browser/devtools/framework/toolbox-process-window.js
rename to devtools/client/framework/toolbox-process-window.js
diff --git a/browser/devtools/framework/toolbox-process-window.xul b/devtools/client/framework/toolbox-process-window.xul
similarity index 100%
rename from browser/devtools/framework/toolbox-process-window.xul
rename to devtools/client/framework/toolbox-process-window.xul
diff --git a/browser/devtools/framework/toolbox-window.xul b/devtools/client/framework/toolbox-window.xul
similarity index 100%
rename from browser/devtools/framework/toolbox-window.xul
rename to devtools/client/framework/toolbox-window.xul
diff --git a/browser/devtools/framework/toolbox.js b/devtools/client/framework/toolbox.js
similarity index 100%
rename from browser/devtools/framework/toolbox.js
rename to devtools/client/framework/toolbox.js
diff --git a/browser/devtools/framework/toolbox.xul b/devtools/client/framework/toolbox.xul
similarity index 100%
rename from browser/devtools/framework/toolbox.xul
rename to devtools/client/framework/toolbox.xul
diff --git a/browser/devtools/inspector/breadcrumbs.js b/devtools/client/inspector/breadcrumbs.js
similarity index 100%
rename from browser/devtools/inspector/breadcrumbs.js
rename to devtools/client/inspector/breadcrumbs.js
diff --git a/browser/devtools/inspector/inspector-commands.js b/devtools/client/inspector/inspector-commands.js
similarity index 100%
rename from browser/devtools/inspector/inspector-commands.js
rename to devtools/client/inspector/inspector-commands.js
diff --git a/browser/devtools/inspector/inspector-panel.js b/devtools/client/inspector/inspector-panel.js
similarity index 100%
rename from browser/devtools/inspector/inspector-panel.js
rename to devtools/client/inspector/inspector-panel.js
diff --git a/browser/devtools/inspector/inspector.css b/devtools/client/inspector/inspector.css
similarity index 100%
rename from browser/devtools/inspector/inspector.css
rename to devtools/client/inspector/inspector.css
diff --git a/browser/devtools/inspector/inspector.xul b/devtools/client/inspector/inspector.xul
similarity index 100%
rename from browser/devtools/inspector/inspector.xul
rename to devtools/client/inspector/inspector.xul
diff --git a/browser/devtools/inspector/moz.build b/devtools/client/inspector/moz.build
similarity index 100%
rename from browser/devtools/inspector/moz.build
rename to devtools/client/inspector/moz.build
diff --git a/browser/devtools/inspector/selector-search.js b/devtools/client/inspector/selector-search.js
similarity index 100%
rename from browser/devtools/inspector/selector-search.js
rename to devtools/client/inspector/selector-search.js
diff --git a/browser/devtools/inspector/test/.eslintrc b/devtools/client/inspector/test/.eslintrc
similarity index 100%
rename from browser/devtools/inspector/test/.eslintrc
rename to devtools/client/inspector/test/.eslintrc
diff --git a/browser/devtools/inspector/test/browser.ini b/devtools/client/inspector/test/browser.ini
similarity index 100%
rename from browser/devtools/inspector/test/browser.ini
rename to devtools/client/inspector/test/browser.ini
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js b/devtools/client/inspector/test/browser_inspector_breadcrumbs.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
rename to devtools/client/inspector/test/browser_inspector_breadcrumbs.js
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js b/devtools/client/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js
rename to devtools/client/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs_keybinding.js b/devtools/client/inspector/test/browser_inspector_breadcrumbs_keybinding.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs_keybinding.js
rename to devtools/client/inspector/test/browser_inspector_breadcrumbs_keybinding.js
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs_menu.js b/devtools/client/inspector/test/browser_inspector_breadcrumbs_menu.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs_menu.js
rename to devtools/client/inspector/test/browser_inspector_breadcrumbs_menu.js
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs_mutations.js b/devtools/client/inspector/test/browser_inspector_breadcrumbs_mutations.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs_mutations.js
rename to devtools/client/inspector/test/browser_inspector_breadcrumbs_mutations.js
diff --git a/browser/devtools/inspector/test/browser_inspector_delete-selected-node-01.js b/devtools/client/inspector/test/browser_inspector_delete-selected-node-01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_delete-selected-node-01.js
rename to devtools/client/inspector/test/browser_inspector_delete-selected-node-01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_delete-selected-node-02.js b/devtools/client/inspector/test/browser_inspector_delete-selected-node-02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_delete-selected-node-02.js
rename to devtools/client/inspector/test/browser_inspector_delete-selected-node-02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js b/devtools/client/inspector/test/browser_inspector_delete-selected-node-03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js
rename to devtools/client/inspector/test/browser_inspector_delete-selected-node-03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_destroy-after-navigation.js b/devtools/client/inspector/test/browser_inspector_destroy-after-navigation.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_destroy-after-navigation.js
rename to devtools/client/inspector/test/browser_inspector_destroy-after-navigation.js
diff --git a/browser/devtools/inspector/test/browser_inspector_destroy-before-ready.js b/devtools/client/inspector/test/browser_inspector_destroy-before-ready.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_destroy-before-ready.js
rename to devtools/client/inspector/test/browser_inspector_destroy-before-ready.js
diff --git a/browser/devtools/inspector/test/browser_inspector_gcli-inspect-command.js b/devtools/client/inspector/test/browser_inspector_gcli-inspect-command.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_gcli-inspect-command.js
rename to devtools/client/inspector/test/browser_inspector_gcli-inspect-command.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-01.js b/devtools/client/inspector/test/browser_inspector_highlighter-01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-02.js b/devtools/client/inspector/test/browser_inspector_highlighter-02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-03.js b/devtools/client/inspector/test/browser_inspector_highlighter-03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-03.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-04.js b/devtools/client/inspector/test/browser_inspector_highlighter-04.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-04.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-04.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-by-type.js b/devtools/client/inspector/test/browser_inspector_highlighter-by-type.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-by-type.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-by-type.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-comments.js b/devtools/client/inspector/test/browser_inspector_highlighter-comments.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-comments.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-comments.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-csstransform_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-geometry_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-geometry_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-geometry_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-geometry_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-geometry_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-geometry_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-geometry_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-geometry_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-geometry_03.js b/devtools/client/inspector/test/browser_inspector_highlighter-geometry_03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-geometry_03.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-geometry_03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-geometry_04.js b/devtools/client/inspector/test/browser_inspector_highlighter-geometry_04.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-geometry_04.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-geometry_04.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-geometry_05.js b/devtools/client/inspector/test/browser_inspector_highlighter-geometry_05.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-geometry_05.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-geometry_05.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-hover_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-hover_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-hover_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-hover_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-hover_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-hover_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-hover_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-hover_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-hover_03.js b/devtools/client/inspector/test/browser_inspector_highlighter-hover_03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-hover_03.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-hover_03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-iframes.js b/devtools/client/inspector/test/browser_inspector_highlighter-iframes.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-iframes.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-iframes.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-inline.js b/devtools/client/inspector/test/browser_inspector_highlighter-inline.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-inline.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-inline.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-keybinding_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-keybinding_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-keybinding_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-keybinding_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_03.js b/devtools/client/inspector/test/browser_inspector_highlighter-keybinding_03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_03.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-keybinding_03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_04.js b/devtools/client/inspector/test/browser_inspector_highlighter-keybinding_04.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_04.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-keybinding_04.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-options.js b/devtools/client/inspector/test/browser_inspector_highlighter-options.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-options.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-options.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-rect_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-rect_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-rect_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-rect_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-rect_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-rect_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-rulers_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-rulers_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-rulers_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-rulers_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-rulers_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-rulers_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-rulers_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-rulers_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-selector_01.js b/devtools/client/inspector/test/browser_inspector_highlighter-selector_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-selector_01.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-selector_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-selector_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-selector_02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-selector_02.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-selector_02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-xbl.js b/devtools/client/inspector/test/browser_inspector_highlighter-xbl.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-xbl.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-xbl.js
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js b/devtools/client/inspector/test/browser_inspector_highlighter-zoom.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js
rename to devtools/client/inspector/test/browser_inspector_highlighter-zoom.js
diff --git a/browser/devtools/inspector/test/browser_inspector_iframe-navigation.js b/devtools/client/inspector/test/browser_inspector_iframe-navigation.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_iframe-navigation.js
rename to devtools/client/inspector/test/browser_inspector_iframe-navigation.js
diff --git a/browser/devtools/inspector/test/browser_inspector_infobar_01.js b/devtools/client/inspector/test/browser_inspector_infobar_01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_infobar_01.js
rename to devtools/client/inspector/test/browser_inspector_infobar_01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_initialization.js b/devtools/client/inspector/test/browser_inspector_initialization.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_initialization.js
rename to devtools/client/inspector/test/browser_inspector_initialization.js
diff --git a/browser/devtools/inspector/test/browser_inspector_inspect-object-element.js b/devtools/client/inspector/test/browser_inspector_inspect-object-element.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_inspect-object-element.js
rename to devtools/client/inspector/test/browser_inspector_inspect-object-element.js
diff --git a/browser/devtools/inspector/test/browser_inspector_invalidate.js b/devtools/client/inspector/test/browser_inspector_invalidate.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_invalidate.js
rename to devtools/client/inspector/test/browser_inspector_invalidate.js
diff --git a/browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js b/devtools/client/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js
rename to devtools/client/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js
diff --git a/browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts.js b/devtools/client/inspector/test/browser_inspector_keyboard-shortcuts.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts.js
rename to devtools/client/inspector/test/browser_inspector_keyboard-shortcuts.js
diff --git a/browser/devtools/inspector/test/browser_inspector_menu-01-sensitivity.js b/devtools/client/inspector/test/browser_inspector_menu-01-sensitivity.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_menu-01-sensitivity.js
rename to devtools/client/inspector/test/browser_inspector_menu-01-sensitivity.js
diff --git a/browser/devtools/inspector/test/browser_inspector_menu-02-copy-items.js b/devtools/client/inspector/test/browser_inspector_menu-02-copy-items.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_menu-02-copy-items.js
rename to devtools/client/inspector/test/browser_inspector_menu-02-copy-items.js
diff --git a/browser/devtools/inspector/test/browser_inspector_menu-03-paste-items.js b/devtools/client/inspector/test/browser_inspector_menu-03-paste-items.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_menu-03-paste-items.js
rename to devtools/client/inspector/test/browser_inspector_menu-03-paste-items.js
diff --git a/browser/devtools/inspector/test/browser_inspector_menu-04-use-in-console.js b/devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_menu-04-use-in-console.js
rename to devtools/client/inspector/test/browser_inspector_menu-04-use-in-console.js
diff --git a/browser/devtools/inspector/test/browser_inspector_menu-05-other.js b/devtools/client/inspector/test/browser_inspector_menu-05-other.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_menu-05-other.js
rename to devtools/client/inspector/test/browser_inspector_menu-05-other.js
diff --git a/browser/devtools/inspector/test/browser_inspector_navigation.js b/devtools/client/inspector/test/browser_inspector_navigation.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_navigation.js
rename to devtools/client/inspector/test/browser_inspector_navigation.js
diff --git a/browser/devtools/inspector/test/browser_inspector_pane-toggle-01.js b/devtools/client/inspector/test/browser_inspector_pane-toggle-01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_pane-toggle-01.js
rename to devtools/client/inspector/test/browser_inspector_pane-toggle-01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_pane-toggle-02.js b/devtools/client/inspector/test/browser_inspector_pane-toggle-02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_pane-toggle-02.js
rename to devtools/client/inspector/test/browser_inspector_pane-toggle-02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_pane-toggle-03.js b/devtools/client/inspector/test/browser_inspector_pane-toggle-03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_pane-toggle-03.js
rename to devtools/client/inspector/test/browser_inspector_pane-toggle-03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_picker-stop-on-destroy.js b/devtools/client/inspector/test/browser_inspector_picker-stop-on-destroy.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_picker-stop-on-destroy.js
rename to devtools/client/inspector/test/browser_inspector_picker-stop-on-destroy.js
diff --git a/browser/devtools/inspector/test/browser_inspector_picker-stop-on-tool-change.js b/devtools/client/inspector/test/browser_inspector_picker-stop-on-tool-change.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_picker-stop-on-tool-change.js
rename to devtools/client/inspector/test/browser_inspector_picker-stop-on-tool-change.js
diff --git a/browser/devtools/inspector/test/browser_inspector_pseudoclass-lock.js b/devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_pseudoclass-lock.js
rename to devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js
diff --git a/browser/devtools/inspector/test/browser_inspector_pseudoclass-menu.js b/devtools/client/inspector/test/browser_inspector_pseudoclass-menu.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_pseudoclass-menu.js
rename to devtools/client/inspector/test/browser_inspector_pseudoclass-menu.js
diff --git a/browser/devtools/inspector/test/browser_inspector_reload-01.js b/devtools/client/inspector/test/browser_inspector_reload-01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_reload-01.js
rename to devtools/client/inspector/test/browser_inspector_reload-01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_reload-02.js b/devtools/client/inspector/test/browser_inspector_reload-02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_reload-02.js
rename to devtools/client/inspector/test/browser_inspector_reload-02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_remove-iframe-during-load.js b/devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_remove-iframe-during-load.js
rename to devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js
diff --git a/browser/devtools/inspector/test/browser_inspector_scrolling.js b/devtools/client/inspector/test/browser_inspector_scrolling.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_scrolling.js
rename to devtools/client/inspector/test/browser_inspector_scrolling.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-01.js b/devtools/client/inspector/test/browser_inspector_search-01.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-01.js
rename to devtools/client/inspector/test/browser_inspector_search-01.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-02.js b/devtools/client/inspector/test/browser_inspector_search-02.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-02.js
rename to devtools/client/inspector/test/browser_inspector_search-02.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-03.js b/devtools/client/inspector/test/browser_inspector_search-03.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-03.js
rename to devtools/client/inspector/test/browser_inspector_search-03.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-04.js b/devtools/client/inspector/test/browser_inspector_search-04.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-04.js
rename to devtools/client/inspector/test/browser_inspector_search-04.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-05.js b/devtools/client/inspector/test/browser_inspector_search-05.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-05.js
rename to devtools/client/inspector/test/browser_inspector_search-05.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-06.js b/devtools/client/inspector/test/browser_inspector_search-06.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-06.js
rename to devtools/client/inspector/test/browser_inspector_search-06.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-navigation.js b/devtools/client/inspector/test/browser_inspector_search-navigation.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-navigation.js
rename to devtools/client/inspector/test/browser_inspector_search-navigation.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-reserved.js b/devtools/client/inspector/test/browser_inspector_search-reserved.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-reserved.js
rename to devtools/client/inspector/test/browser_inspector_search-reserved.js
diff --git a/browser/devtools/inspector/test/browser_inspector_search-suggests-ids-and-classes.js b/devtools/client/inspector/test/browser_inspector_search-suggests-ids-and-classes.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_search-suggests-ids-and-classes.js
rename to devtools/client/inspector/test/browser_inspector_search-suggests-ids-and-classes.js
diff --git a/browser/devtools/inspector/test/browser_inspector_select-docshell.js b/devtools/client/inspector/test/browser_inspector_select-docshell.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_select-docshell.js
rename to devtools/client/inspector/test/browser_inspector_select-docshell.js
diff --git a/browser/devtools/inspector/test/browser_inspector_select-last-selected.js b/devtools/client/inspector/test/browser_inspector_select-last-selected.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_select-last-selected.js
rename to devtools/client/inspector/test/browser_inspector_select-last-selected.js
diff --git a/browser/devtools/inspector/test/browser_inspector_sidebarstate.js b/devtools/client/inspector/test/browser_inspector_sidebarstate.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_sidebarstate.js
rename to devtools/client/inspector/test/browser_inspector_sidebarstate.js
diff --git a/browser/devtools/inspector/test/browser_inspector_switch-to-inspector-on-pick.js b/devtools/client/inspector/test/browser_inspector_switch-to-inspector-on-pick.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_switch-to-inspector-on-pick.js
rename to devtools/client/inspector/test/browser_inspector_switch-to-inspector-on-pick.js
diff --git a/browser/devtools/inspector/test/doc_inspector_breadcrumbs.html b/devtools/client/inspector/test/doc_inspector_breadcrumbs.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_breadcrumbs.html
rename to devtools/client/inspector/test/doc_inspector_breadcrumbs.html
diff --git a/browser/devtools/inspector/test/doc_inspector_delete-selected-node-01.html b/devtools/client/inspector/test/doc_inspector_delete-selected-node-01.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_delete-selected-node-01.html
rename to devtools/client/inspector/test/doc_inspector_delete-selected-node-01.html
diff --git a/browser/devtools/inspector/test/doc_inspector_delete-selected-node-02.html b/devtools/client/inspector/test/doc_inspector_delete-selected-node-02.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_delete-selected-node-02.html
rename to devtools/client/inspector/test/doc_inspector_delete-selected-node-02.html
diff --git a/browser/devtools/inspector/test/doc_inspector_gcli-inspect-command.html b/devtools/client/inspector/test/doc_inspector_gcli-inspect-command.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_gcli-inspect-command.html
rename to devtools/client/inspector/test/doc_inspector_gcli-inspect-command.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlight_after_transition.html b/devtools/client/inspector/test/doc_inspector_highlight_after_transition.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlight_after_transition.html
rename to devtools/client/inspector/test/doc_inspector_highlight_after_transition.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter-comments.html b/devtools/client/inspector/test/doc_inspector_highlighter-comments.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter-comments.html
rename to devtools/client/inspector/test/doc_inspector_highlighter-comments.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter-geometry_01.html b/devtools/client/inspector/test/doc_inspector_highlighter-geometry_01.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter-geometry_01.html
rename to devtools/client/inspector/test/doc_inspector_highlighter-geometry_01.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter-geometry_02.html b/devtools/client/inspector/test/doc_inspector_highlighter-geometry_02.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter-geometry_02.html
rename to devtools/client/inspector/test/doc_inspector_highlighter-geometry_02.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter.html b/devtools/client/inspector/test/doc_inspector_highlighter.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter.html
rename to devtools/client/inspector/test/doc_inspector_highlighter.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter_csstransform.html b/devtools/client/inspector/test/doc_inspector_highlighter_csstransform.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter_csstransform.html
rename to devtools/client/inspector/test/doc_inspector_highlighter_csstransform.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter_dom.html b/devtools/client/inspector/test/doc_inspector_highlighter_dom.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter_dom.html
rename to devtools/client/inspector/test/doc_inspector_highlighter_dom.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter_inline.html b/devtools/client/inspector/test/doc_inspector_highlighter_inline.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter_inline.html
rename to devtools/client/inspector/test/doc_inspector_highlighter_inline.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter_rect.html b/devtools/client/inspector/test/doc_inspector_highlighter_rect.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter_rect.html
rename to devtools/client/inspector/test/doc_inspector_highlighter_rect.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter_rect_iframe.html b/devtools/client/inspector/test/doc_inspector_highlighter_rect_iframe.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter_rect_iframe.html
rename to devtools/client/inspector/test/doc_inspector_highlighter_rect_iframe.html
diff --git a/browser/devtools/inspector/test/doc_inspector_highlighter_xbl.xul b/devtools/client/inspector/test/doc_inspector_highlighter_xbl.xul
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_highlighter_xbl.xul
rename to devtools/client/inspector/test/doc_inspector_highlighter_xbl.xul
diff --git a/browser/devtools/inspector/test/doc_inspector_infobar.html b/devtools/client/inspector/test/doc_inspector_infobar.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_infobar.html
rename to devtools/client/inspector/test/doc_inspector_infobar.html
diff --git a/browser/devtools/inspector/test/doc_inspector_infobar_01.html b/devtools/client/inspector/test/doc_inspector_infobar_01.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_infobar_01.html
rename to devtools/client/inspector/test/doc_inspector_infobar_01.html
diff --git a/browser/devtools/inspector/test/doc_inspector_infobar_02.html b/devtools/client/inspector/test/doc_inspector_infobar_02.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_infobar_02.html
rename to devtools/client/inspector/test/doc_inspector_infobar_02.html
diff --git a/browser/devtools/inspector/test/doc_inspector_menu.html b/devtools/client/inspector/test/doc_inspector_menu.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_menu.html
rename to devtools/client/inspector/test/doc_inspector_menu.html
diff --git a/browser/devtools/inspector/test/doc_inspector_outerhtml.html b/devtools/client/inspector/test/doc_inspector_outerhtml.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_outerhtml.html
rename to devtools/client/inspector/test/doc_inspector_outerhtml.html
diff --git a/browser/devtools/inspector/test/doc_inspector_remove-iframe-during-load.html b/devtools/client/inspector/test/doc_inspector_remove-iframe-during-load.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_remove-iframe-during-load.html
rename to devtools/client/inspector/test/doc_inspector_remove-iframe-during-load.html
diff --git a/browser/devtools/inspector/test/doc_inspector_search-reserved.html b/devtools/client/inspector/test/doc_inspector_search-reserved.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_search-reserved.html
rename to devtools/client/inspector/test/doc_inspector_search-reserved.html
diff --git a/browser/devtools/inspector/test/doc_inspector_search-suggestions.html b/devtools/client/inspector/test/doc_inspector_search-suggestions.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_search-suggestions.html
rename to devtools/client/inspector/test/doc_inspector_search-suggestions.html
diff --git a/browser/devtools/inspector/test/doc_inspector_search.html b/devtools/client/inspector/test/doc_inspector_search.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_search.html
rename to devtools/client/inspector/test/doc_inspector_search.html
diff --git a/browser/devtools/inspector/test/doc_inspector_select-last-selected-01.html b/devtools/client/inspector/test/doc_inspector_select-last-selected-01.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_select-last-selected-01.html
rename to devtools/client/inspector/test/doc_inspector_select-last-selected-01.html
diff --git a/browser/devtools/inspector/test/doc_inspector_select-last-selected-02.html b/devtools/client/inspector/test/doc_inspector_select-last-selected-02.html
similarity index 100%
rename from browser/devtools/inspector/test/doc_inspector_select-last-selected-02.html
rename to devtools/client/inspector/test/doc_inspector_select-last-selected-02.html
diff --git a/browser/devtools/inspector/test/head.js b/devtools/client/inspector/test/head.js
similarity index 100%
rename from browser/devtools/inspector/test/head.js
rename to devtools/client/inspector/test/head.js
diff --git a/browser/devtools/jar.mn b/devtools/client/jar.mn
similarity index 100%
rename from browser/devtools/jar.mn
rename to devtools/client/jar.mn
diff --git a/browser/devtools/layoutview/moz.build b/devtools/client/layoutview/moz.build
similarity index 100%
rename from browser/devtools/layoutview/moz.build
rename to devtools/client/layoutview/moz.build
diff --git a/browser/devtools/layoutview/test/.eslintrc b/devtools/client/layoutview/test/.eslintrc
similarity index 100%
rename from browser/devtools/layoutview/test/.eslintrc
rename to devtools/client/layoutview/test/.eslintrc
diff --git a/browser/devtools/layoutview/test/browser.ini b/devtools/client/layoutview/test/browser.ini
similarity index 100%
rename from browser/devtools/layoutview/test/browser.ini
rename to devtools/client/layoutview/test/browser.ini
diff --git a/browser/devtools/layoutview/test/browser_layoutview.js b/devtools/client/layoutview/test/browser_layoutview.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview.js
rename to devtools/client/layoutview/test/browser_layoutview.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_editablemodel.js b/devtools/client/layoutview/test/browser_layoutview_editablemodel.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_editablemodel.js
rename to devtools/client/layoutview/test/browser_layoutview_editablemodel.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_editablemodel_allproperties.js b/devtools/client/layoutview/test/browser_layoutview_editablemodel_allproperties.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_editablemodel_allproperties.js
rename to devtools/client/layoutview/test/browser_layoutview_editablemodel_allproperties.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_editablemodel_border.js b/devtools/client/layoutview/test/browser_layoutview_editablemodel_border.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_editablemodel_border.js
rename to devtools/client/layoutview/test/browser_layoutview_editablemodel_border.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_editablemodel_stylerules.js b/devtools/client/layoutview/test/browser_layoutview_editablemodel_stylerules.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_editablemodel_stylerules.js
rename to devtools/client/layoutview/test/browser_layoutview_editablemodel_stylerules.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_guides.js b/devtools/client/layoutview/test/browser_layoutview_guides.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_guides.js
rename to devtools/client/layoutview/test/browser_layoutview_guides.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_rotate-labels-on-sides.js b/devtools/client/layoutview/test/browser_layoutview_rotate-labels-on-sides.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_rotate-labels-on-sides.js
rename to devtools/client/layoutview/test/browser_layoutview_rotate-labels-on-sides.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_tooltips.js b/devtools/client/layoutview/test/browser_layoutview_tooltips.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_tooltips.js
rename to devtools/client/layoutview/test/browser_layoutview_tooltips.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_update-after-navigation.js b/devtools/client/layoutview/test/browser_layoutview_update-after-navigation.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_update-after-navigation.js
rename to devtools/client/layoutview/test/browser_layoutview_update-after-navigation.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_update-after-reload.js b/devtools/client/layoutview/test/browser_layoutview_update-after-reload.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_update-after-reload.js
rename to devtools/client/layoutview/test/browser_layoutview_update-after-reload.js
diff --git a/browser/devtools/layoutview/test/browser_layoutview_update-in-iframes.js b/devtools/client/layoutview/test/browser_layoutview_update-in-iframes.js
similarity index 100%
rename from browser/devtools/layoutview/test/browser_layoutview_update-in-iframes.js
rename to devtools/client/layoutview/test/browser_layoutview_update-in-iframes.js
diff --git a/browser/devtools/layoutview/test/doc_layoutview_iframe1.html b/devtools/client/layoutview/test/doc_layoutview_iframe1.html
similarity index 100%
rename from browser/devtools/layoutview/test/doc_layoutview_iframe1.html
rename to devtools/client/layoutview/test/doc_layoutview_iframe1.html
diff --git a/browser/devtools/layoutview/test/doc_layoutview_iframe2.html b/devtools/client/layoutview/test/doc_layoutview_iframe2.html
similarity index 100%
rename from browser/devtools/layoutview/test/doc_layoutview_iframe2.html
rename to devtools/client/layoutview/test/doc_layoutview_iframe2.html
diff --git a/browser/devtools/layoutview/test/head.js b/devtools/client/layoutview/test/head.js
similarity index 100%
rename from browser/devtools/layoutview/test/head.js
rename to devtools/client/layoutview/test/head.js
diff --git a/browser/devtools/layoutview/view.js b/devtools/client/layoutview/view.js
similarity index 100%
rename from browser/devtools/layoutview/view.js
rename to devtools/client/layoutview/view.js
diff --git a/browser/devtools/layoutview/view.xhtml b/devtools/client/layoutview/view.xhtml
similarity index 100%
rename from browser/devtools/layoutview/view.xhtml
rename to devtools/client/layoutview/view.xhtml
diff --git a/browser/devtools/main.js b/devtools/client/main.js
similarity index 100%
rename from browser/devtools/main.js
rename to devtools/client/main.js
diff --git a/browser/devtools/markupview/html-editor.js b/devtools/client/markupview/html-editor.js
similarity index 100%
rename from browser/devtools/markupview/html-editor.js
rename to devtools/client/markupview/html-editor.js
diff --git a/browser/devtools/markupview/markup-view.css b/devtools/client/markupview/markup-view.css
similarity index 100%
rename from browser/devtools/markupview/markup-view.css
rename to devtools/client/markupview/markup-view.css
diff --git a/browser/devtools/markupview/markup-view.js b/devtools/client/markupview/markup-view.js
similarity index 100%
rename from browser/devtools/markupview/markup-view.js
rename to devtools/client/markupview/markup-view.js
diff --git a/browser/devtools/markupview/markup-view.xhtml b/devtools/client/markupview/markup-view.xhtml
similarity index 100%
rename from browser/devtools/markupview/markup-view.xhtml
rename to devtools/client/markupview/markup-view.xhtml
diff --git a/browser/devtools/markupview/moz.build b/devtools/client/markupview/moz.build
similarity index 100%
rename from browser/devtools/markupview/moz.build
rename to devtools/client/markupview/moz.build
diff --git a/browser/devtools/markupview/test/.eslintrc b/devtools/client/markupview/test/.eslintrc
similarity index 100%
rename from browser/devtools/markupview/test/.eslintrc
rename to devtools/client/markupview/test/.eslintrc
diff --git a/browser/devtools/markupview/test/actor_events_form.js b/devtools/client/markupview/test/actor_events_form.js
similarity index 100%
rename from browser/devtools/markupview/test/actor_events_form.js
rename to devtools/client/markupview/test/actor_events_form.js
diff --git a/browser/devtools/markupview/test/browser.ini b/devtools/client/markupview/test/browser.ini
similarity index 100%
rename from browser/devtools/markupview/test/browser.ini
rename to devtools/client/markupview/test/browser.ini
diff --git a/browser/devtools/markupview/test/browser_markupview_anonymous_01.js b/devtools/client/markupview/test/browser_markupview_anonymous_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_anonymous_01.js
rename to devtools/client/markupview/test/browser_markupview_anonymous_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_anonymous_02.js b/devtools/client/markupview/test/browser_markupview_anonymous_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_anonymous_02.js
rename to devtools/client/markupview/test/browser_markupview_anonymous_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_anonymous_03.js b/devtools/client/markupview/test/browser_markupview_anonymous_03.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_anonymous_03.js
rename to devtools/client/markupview/test/browser_markupview_anonymous_03.js
diff --git a/browser/devtools/markupview/test/browser_markupview_anonymous_04.js b/devtools/client/markupview/test/browser_markupview_anonymous_04.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_anonymous_04.js
rename to devtools/client/markupview/test/browser_markupview_anonymous_04.js
diff --git a/browser/devtools/markupview/test/browser_markupview_copy_image_data.js b/devtools/client/markupview/test/browser_markupview_copy_image_data.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_copy_image_data.js
rename to devtools/client/markupview/test/browser_markupview_copy_image_data.js
diff --git a/browser/devtools/markupview/test/browser_markupview_css_completion_style_attribute.js b/devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_css_completion_style_attribute.js
rename to devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js b/devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_dragRootNode.js b/devtools/client/markupview/test/browser_markupview_dragdrop_dragRootNode.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_dragRootNode.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_dragRootNode.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js b/devtools/client/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js b/devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js b/devtools/client/markupview/test/browser_markupview_dragdrop_isDragging.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_isDragging.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js b/devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js
diff --git a/browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js b/devtools/client/markupview/test/browser_markupview_dragdrop_textSelection.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js
rename to devtools/client/markupview/test/browser_markupview_dragdrop_textSelection.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events-overflow.js b/devtools/client/markupview/test/browser_markupview_events-overflow.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events-overflow.js
rename to devtools/client/markupview/test/browser_markupview_events-overflow.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events.js b/devtools/client/markupview/test/browser_markupview_events.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events.js
rename to devtools/client/markupview/test/browser_markupview_events.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_form.js b/devtools/client/markupview/test/browser_markupview_events_form.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_form.js
rename to devtools/client/markupview/test/browser_markupview_events_form.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.0.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.0.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.1.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.1.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.11.1.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.11.1.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.2.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.2.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.3.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.3.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.4.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.4.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.6.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.6.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js b/devtools/client/markupview/test/browser_markupview_events_jquery_1.7.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_1.7.js
diff --git a/browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js b/devtools/client/markupview/test/browser_markupview_events_jquery_2.1.1.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js
rename to devtools/client/markupview/test/browser_markupview_events_jquery_2.1.1.js
diff --git a/browser/devtools/markupview/test/browser_markupview_html_edit_01.js b/devtools/client/markupview/test/browser_markupview_html_edit_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_html_edit_01.js
rename to devtools/client/markupview/test/browser_markupview_html_edit_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_html_edit_02.js b/devtools/client/markupview/test/browser_markupview_html_edit_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_html_edit_02.js
rename to devtools/client/markupview/test/browser_markupview_html_edit_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_html_edit_03.js b/devtools/client/markupview/test/browser_markupview_html_edit_03.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_html_edit_03.js
rename to devtools/client/markupview/test/browser_markupview_html_edit_03.js
diff --git a/browser/devtools/markupview/test/browser_markupview_image_tooltip.js b/devtools/client/markupview/test/browser_markupview_image_tooltip.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_image_tooltip.js
rename to devtools/client/markupview/test/browser_markupview_image_tooltip.js
diff --git a/browser/devtools/markupview/test/browser_markupview_image_tooltip_mutations.js b/devtools/client/markupview/test/browser_markupview_image_tooltip_mutations.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_image_tooltip_mutations.js
rename to devtools/client/markupview/test/browser_markupview_image_tooltip_mutations.js
diff --git a/browser/devtools/markupview/test/browser_markupview_keybindings_01.js b/devtools/client/markupview/test/browser_markupview_keybindings_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_keybindings_01.js
rename to devtools/client/markupview/test/browser_markupview_keybindings_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_keybindings_02.js b/devtools/client/markupview/test/browser_markupview_keybindings_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_keybindings_02.js
rename to devtools/client/markupview/test/browser_markupview_keybindings_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_keybindings_03.js b/devtools/client/markupview/test/browser_markupview_keybindings_03.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_keybindings_03.js
rename to devtools/client/markupview/test/browser_markupview_keybindings_03.js
diff --git a/browser/devtools/markupview/test/browser_markupview_keybindings_04.js b/devtools/client/markupview/test/browser_markupview_keybindings_04.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_keybindings_04.js
rename to devtools/client/markupview/test/browser_markupview_keybindings_04.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_01.js b/devtools/client/markupview/test/browser_markupview_links_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_01.js
rename to devtools/client/markupview/test/browser_markupview_links_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_02.js b/devtools/client/markupview/test/browser_markupview_links_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_02.js
rename to devtools/client/markupview/test/browser_markupview_links_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_03.js b/devtools/client/markupview/test/browser_markupview_links_03.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_03.js
rename to devtools/client/markupview/test/browser_markupview_links_03.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_04.js b/devtools/client/markupview/test/browser_markupview_links_04.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_04.js
rename to devtools/client/markupview/test/browser_markupview_links_04.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_05.js b/devtools/client/markupview/test/browser_markupview_links_05.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_05.js
rename to devtools/client/markupview/test/browser_markupview_links_05.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_06.js b/devtools/client/markupview/test/browser_markupview_links_06.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_06.js
rename to devtools/client/markupview/test/browser_markupview_links_06.js
diff --git a/browser/devtools/markupview/test/browser_markupview_links_07.js b/devtools/client/markupview/test/browser_markupview_links_07.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_links_07.js
rename to devtools/client/markupview/test/browser_markupview_links_07.js
diff --git a/browser/devtools/markupview/test/browser_markupview_load_01.js b/devtools/client/markupview/test/browser_markupview_load_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_load_01.js
rename to devtools/client/markupview/test/browser_markupview_load_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_mutation_01.js b/devtools/client/markupview/test/browser_markupview_mutation_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_mutation_01.js
rename to devtools/client/markupview/test/browser_markupview_mutation_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_mutation_02.js b/devtools/client/markupview/test/browser_markupview_mutation_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_mutation_02.js
rename to devtools/client/markupview/test/browser_markupview_mutation_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_navigation.js b/devtools/client/markupview/test/browser_markupview_navigation.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_navigation.js
rename to devtools/client/markupview/test/browser_markupview_navigation.js
diff --git a/browser/devtools/markupview/test/browser_markupview_node_not_displayed_01.js b/devtools/client/markupview/test/browser_markupview_node_not_displayed_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_node_not_displayed_01.js
rename to devtools/client/markupview/test/browser_markupview_node_not_displayed_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_node_not_displayed_02.js b/devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_node_not_displayed_02.js
rename to devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_pagesize_01.js b/devtools/client/markupview/test/browser_markupview_pagesize_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_pagesize_01.js
rename to devtools/client/markupview/test/browser_markupview_pagesize_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_pagesize_02.js b/devtools/client/markupview/test/browser_markupview_pagesize_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_pagesize_02.js
rename to devtools/client/markupview/test/browser_markupview_pagesize_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_remove_xul_attributes.js b/devtools/client/markupview/test/browser_markupview_remove_xul_attributes.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_remove_xul_attributes.js
rename to devtools/client/markupview/test/browser_markupview_remove_xul_attributes.js
diff --git a/browser/devtools/markupview/test/browser_markupview_search_01.js b/devtools/client/markupview/test/browser_markupview_search_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_search_01.js
rename to devtools/client/markupview/test/browser_markupview_search_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_01.js b/devtools/client/markupview/test/browser_markupview_tag_edit_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_01.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_02.js b/devtools/client/markupview/test/browser_markupview_tag_edit_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_02.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_03.js b/devtools/client/markupview/test/browser_markupview_tag_edit_03.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_03.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_03.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_04.js b/devtools/client/markupview/test/browser_markupview_tag_edit_04.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_04.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_04.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_05.js b/devtools/client/markupview/test/browser_markupview_tag_edit_05.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_05.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_05.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_06.js b/devtools/client/markupview/test/browser_markupview_tag_edit_06.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_06.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_06.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_07.js b/devtools/client/markupview/test/browser_markupview_tag_edit_07.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_07.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_07.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_08.js b/devtools/client/markupview/test/browser_markupview_tag_edit_08.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_08.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_08.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_09.js b/devtools/client/markupview/test/browser_markupview_tag_edit_09.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_09.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_09.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_10.js b/devtools/client/markupview/test/browser_markupview_tag_edit_10.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_10.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_10.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_11.js b/devtools/client/markupview/test/browser_markupview_tag_edit_11.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_11.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_11.js
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_12.js b/devtools/client/markupview/test/browser_markupview_tag_edit_12.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_tag_edit_12.js
rename to devtools/client/markupview/test/browser_markupview_tag_edit_12.js
diff --git a/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js b/devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js
rename to devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_toggle_01.js b/devtools/client/markupview/test/browser_markupview_toggle_01.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_toggle_01.js
rename to devtools/client/markupview/test/browser_markupview_toggle_01.js
diff --git a/browser/devtools/markupview/test/browser_markupview_toggle_02.js b/devtools/client/markupview/test/browser_markupview_toggle_02.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_toggle_02.js
rename to devtools/client/markupview/test/browser_markupview_toggle_02.js
diff --git a/browser/devtools/markupview/test/browser_markupview_toggle_03.js b/devtools/client/markupview/test/browser_markupview_toggle_03.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_toggle_03.js
rename to devtools/client/markupview/test/browser_markupview_toggle_03.js
diff --git a/browser/devtools/markupview/test/browser_markupview_update-on-navigtion.js b/devtools/client/markupview/test/browser_markupview_update-on-navigtion.js
similarity index 100%
rename from browser/devtools/markupview/test/browser_markupview_update-on-navigtion.js
rename to devtools/client/markupview/test/browser_markupview_update-on-navigtion.js
diff --git a/browser/devtools/markupview/test/doc_markup_anonymous.html b/devtools/client/markupview/test/doc_markup_anonymous.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_anonymous.html
rename to devtools/client/markupview/test/doc_markup_anonymous.html
diff --git a/browser/devtools/markupview/test/doc_markup_dragdrop.html b/devtools/client/markupview/test/doc_markup_dragdrop.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_dragdrop.html
rename to devtools/client/markupview/test/doc_markup_dragdrop.html
diff --git a/browser/devtools/markupview/test/doc_markup_dragdrop_autoscroll.html b/devtools/client/markupview/test/doc_markup_dragdrop_autoscroll.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_dragdrop_autoscroll.html
rename to devtools/client/markupview/test/doc_markup_dragdrop_autoscroll.html
diff --git a/browser/devtools/markupview/test/doc_markup_edit.html b/devtools/client/markupview/test/doc_markup_edit.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_edit.html
rename to devtools/client/markupview/test/doc_markup_edit.html
diff --git a/browser/devtools/markupview/test/doc_markup_events-overflow.html b/devtools/client/markupview/test/doc_markup_events-overflow.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_events-overflow.html
rename to devtools/client/markupview/test/doc_markup_events-overflow.html
diff --git a/browser/devtools/markupview/test/doc_markup_events.html b/devtools/client/markupview/test/doc_markup_events.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_events.html
rename to devtools/client/markupview/test/doc_markup_events.html
diff --git a/browser/devtools/markupview/test/doc_markup_events_form.html b/devtools/client/markupview/test/doc_markup_events_form.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_events_form.html
rename to devtools/client/markupview/test/doc_markup_events_form.html
diff --git a/browser/devtools/markupview/test/doc_markup_events_jquery.html b/devtools/client/markupview/test/doc_markup_events_jquery.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_events_jquery.html
rename to devtools/client/markupview/test/doc_markup_events_jquery.html
diff --git a/browser/devtools/markupview/test/doc_markup_flashing.html b/devtools/client/markupview/test/doc_markup_flashing.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_flashing.html
rename to devtools/client/markupview/test/doc_markup_flashing.html
diff --git a/browser/devtools/markupview/test/doc_markup_links.html b/devtools/client/markupview/test/doc_markup_links.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_links.html
rename to devtools/client/markupview/test/doc_markup_links.html
diff --git a/browser/devtools/markupview/test/doc_markup_mutation.html b/devtools/client/markupview/test/doc_markup_mutation.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_mutation.html
rename to devtools/client/markupview/test/doc_markup_mutation.html
diff --git a/browser/devtools/markupview/test/doc_markup_navigation.html b/devtools/client/markupview/test/doc_markup_navigation.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_navigation.html
rename to devtools/client/markupview/test/doc_markup_navigation.html
diff --git a/browser/devtools/markupview/test/doc_markup_not_displayed.html b/devtools/client/markupview/test/doc_markup_not_displayed.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_not_displayed.html
rename to devtools/client/markupview/test/doc_markup_not_displayed.html
diff --git a/browser/devtools/markupview/test/doc_markup_pagesize_01.html b/devtools/client/markupview/test/doc_markup_pagesize_01.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_pagesize_01.html
rename to devtools/client/markupview/test/doc_markup_pagesize_01.html
diff --git a/browser/devtools/markupview/test/doc_markup_pagesize_02.html b/devtools/client/markupview/test/doc_markup_pagesize_02.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_pagesize_02.html
rename to devtools/client/markupview/test/doc_markup_pagesize_02.html
diff --git a/browser/devtools/markupview/test/doc_markup_search.html b/devtools/client/markupview/test/doc_markup_search.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_search.html
rename to devtools/client/markupview/test/doc_markup_search.html
diff --git a/browser/devtools/markupview/test/doc_markup_svg_attributes.html b/devtools/client/markupview/test/doc_markup_svg_attributes.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_svg_attributes.html
rename to devtools/client/markupview/test/doc_markup_svg_attributes.html
diff --git a/browser/devtools/markupview/test/doc_markup_toggle.html b/devtools/client/markupview/test/doc_markup_toggle.html
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_toggle.html
rename to devtools/client/markupview/test/doc_markup_toggle.html
diff --git a/browser/devtools/markupview/test/doc_markup_tooltip.png b/devtools/client/markupview/test/doc_markup_tooltip.png
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_tooltip.png
rename to devtools/client/markupview/test/doc_markup_tooltip.png
diff --git a/browser/devtools/markupview/test/doc_markup_xul.xul b/devtools/client/markupview/test/doc_markup_xul.xul
similarity index 100%
rename from browser/devtools/markupview/test/doc_markup_xul.xul
rename to devtools/client/markupview/test/doc_markup_xul.xul
diff --git a/browser/devtools/markupview/test/frame-script-utils.js b/devtools/client/markupview/test/frame-script-utils.js
similarity index 100%
rename from browser/devtools/markupview/test/frame-script-utils.js
rename to devtools/client/markupview/test/frame-script-utils.js
diff --git a/browser/devtools/markupview/test/head.js b/devtools/client/markupview/test/head.js
similarity index 100%
rename from browser/devtools/markupview/test/head.js
rename to devtools/client/markupview/test/head.js
diff --git a/browser/devtools/markupview/test/helper_attributes_test_runner.js b/devtools/client/markupview/test/helper_attributes_test_runner.js
similarity index 100%
rename from browser/devtools/markupview/test/helper_attributes_test_runner.js
rename to devtools/client/markupview/test/helper_attributes_test_runner.js
diff --git a/browser/devtools/markupview/test/helper_events_test_runner.js b/devtools/client/markupview/test/helper_events_test_runner.js
similarity index 100%
rename from browser/devtools/markupview/test/helper_events_test_runner.js
rename to devtools/client/markupview/test/helper_events_test_runner.js
diff --git a/browser/devtools/markupview/test/helper_outerhtml_test_runner.js b/devtools/client/markupview/test/helper_outerhtml_test_runner.js
similarity index 100%
rename from browser/devtools/markupview/test/helper_outerhtml_test_runner.js
rename to devtools/client/markupview/test/helper_outerhtml_test_runner.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.0.js b/devtools/client/markupview/test/lib_jquery_1.0.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.0.js
rename to devtools/client/markupview/test/lib_jquery_1.0.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.1.js b/devtools/client/markupview/test/lib_jquery_1.1.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.1.js
rename to devtools/client/markupview/test/lib_jquery_1.1.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.11.1_min.js b/devtools/client/markupview/test/lib_jquery_1.11.1_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.11.1_min.js
rename to devtools/client/markupview/test/lib_jquery_1.11.1_min.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.2_min.js b/devtools/client/markupview/test/lib_jquery_1.2_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.2_min.js
rename to devtools/client/markupview/test/lib_jquery_1.2_min.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.3_min.js b/devtools/client/markupview/test/lib_jquery_1.3_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.3_min.js
rename to devtools/client/markupview/test/lib_jquery_1.3_min.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.4_min.js b/devtools/client/markupview/test/lib_jquery_1.4_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.4_min.js
rename to devtools/client/markupview/test/lib_jquery_1.4_min.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.6_min.js b/devtools/client/markupview/test/lib_jquery_1.6_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.6_min.js
rename to devtools/client/markupview/test/lib_jquery_1.6_min.js
diff --git a/browser/devtools/markupview/test/lib_jquery_1.7_min.js b/devtools/client/markupview/test/lib_jquery_1.7_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_1.7_min.js
rename to devtools/client/markupview/test/lib_jquery_1.7_min.js
diff --git a/browser/devtools/markupview/test/lib_jquery_2.1.1_min.js b/devtools/client/markupview/test/lib_jquery_2.1.1_min.js
similarity index 100%
rename from browser/devtools/markupview/test/lib_jquery_2.1.1_min.js
rename to devtools/client/markupview/test/lib_jquery_2.1.1_min.js
diff --git a/browser/devtools/memory/controller.js b/devtools/client/memory/controller.js
similarity index 100%
rename from browser/devtools/memory/controller.js
rename to devtools/client/memory/controller.js
diff --git a/browser/devtools/memory/memory.xhtml b/devtools/client/memory/memory.xhtml
similarity index 100%
rename from browser/devtools/memory/memory.xhtml
rename to devtools/client/memory/memory.xhtml
diff --git a/browser/devtools/memory/modules/census-view.js b/devtools/client/memory/modules/census-view.js
similarity index 100%
rename from browser/devtools/memory/modules/census-view.js
rename to devtools/client/memory/modules/census-view.js
diff --git a/browser/devtools/memory/moz.build b/devtools/client/memory/moz.build
similarity index 100%
rename from browser/devtools/memory/moz.build
rename to devtools/client/memory/moz.build
diff --git a/browser/devtools/memory/panel.js b/devtools/client/memory/panel.js
similarity index 100%
rename from browser/devtools/memory/panel.js
rename to devtools/client/memory/panel.js
diff --git a/browser/devtools/memory/test/mochitest/chrome.ini b/devtools/client/memory/test/mochitest/chrome.ini
similarity index 100%
rename from browser/devtools/memory/test/mochitest/chrome.ini
rename to devtools/client/memory/test/mochitest/chrome.ini
diff --git a/browser/devtools/memory/test/mochitest/head.js b/devtools/client/memory/test/mochitest/head.js
similarity index 100%
rename from browser/devtools/memory/test/mochitest/head.js
rename to devtools/client/memory/test/mochitest/head.js
diff --git a/browser/devtools/memory/test/mochitest/test_census-view-01.html b/devtools/client/memory/test/mochitest/test_census-view-01.html
similarity index 100%
rename from browser/devtools/memory/test/mochitest/test_census-view-01.html
rename to devtools/client/memory/test/mochitest/test_census-view-01.html
diff --git a/browser/devtools/moz.build b/devtools/client/moz.build
similarity index 100%
rename from browser/devtools/moz.build
rename to devtools/client/moz.build
diff --git a/browser/devtools/netmonitor/har/har-automation.js b/devtools/client/netmonitor/har/har-automation.js
similarity index 100%
rename from browser/devtools/netmonitor/har/har-automation.js
rename to devtools/client/netmonitor/har/har-automation.js
diff --git a/browser/devtools/netmonitor/har/har-builder.js b/devtools/client/netmonitor/har/har-builder.js
similarity index 100%
rename from browser/devtools/netmonitor/har/har-builder.js
rename to devtools/client/netmonitor/har/har-builder.js
diff --git a/browser/devtools/netmonitor/har/har-collector.js b/devtools/client/netmonitor/har/har-collector.js
similarity index 100%
rename from browser/devtools/netmonitor/har/har-collector.js
rename to devtools/client/netmonitor/har/har-collector.js
diff --git a/browser/devtools/netmonitor/har/har-exporter.js b/devtools/client/netmonitor/har/har-exporter.js
similarity index 100%
rename from browser/devtools/netmonitor/har/har-exporter.js
rename to devtools/client/netmonitor/har/har-exporter.js
diff --git a/browser/devtools/netmonitor/har/har-utils.js b/devtools/client/netmonitor/har/har-utils.js
similarity index 100%
rename from browser/devtools/netmonitor/har/har-utils.js
rename to devtools/client/netmonitor/har/har-utils.js
diff --git a/browser/devtools/netmonitor/har/moz.build b/devtools/client/netmonitor/har/moz.build
similarity index 100%
rename from browser/devtools/netmonitor/har/moz.build
rename to devtools/client/netmonitor/har/moz.build
diff --git a/browser/devtools/netmonitor/har/test/browser.ini b/devtools/client/netmonitor/har/test/browser.ini
similarity index 100%
rename from browser/devtools/netmonitor/har/test/browser.ini
rename to devtools/client/netmonitor/har/test/browser.ini
diff --git a/browser/devtools/netmonitor/har/test/browser_net_har_copy_all_as_har.js b/devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js
similarity index 100%
rename from browser/devtools/netmonitor/har/test/browser_net_har_copy_all_as_har.js
rename to devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js
diff --git a/browser/devtools/netmonitor/har/test/browser_net_har_post_data.js b/devtools/client/netmonitor/har/test/browser_net_har_post_data.js
similarity index 100%
rename from browser/devtools/netmonitor/har/test/browser_net_har_post_data.js
rename to devtools/client/netmonitor/har/test/browser_net_har_post_data.js
diff --git a/browser/devtools/netmonitor/har/test/head.js b/devtools/client/netmonitor/har/test/head.js
similarity index 100%
rename from browser/devtools/netmonitor/har/test/head.js
rename to devtools/client/netmonitor/har/test/head.js
diff --git a/browser/devtools/netmonitor/har/test/html_har_post-data-test-page.html b/devtools/client/netmonitor/har/test/html_har_post-data-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/har/test/html_har_post-data-test-page.html
rename to devtools/client/netmonitor/har/test/html_har_post-data-test-page.html
diff --git a/browser/devtools/netmonitor/har/toolbox-overlay.js b/devtools/client/netmonitor/har/toolbox-overlay.js
similarity index 100%
rename from browser/devtools/netmonitor/har/toolbox-overlay.js
rename to devtools/client/netmonitor/har/toolbox-overlay.js
diff --git a/browser/devtools/netmonitor/moz.build b/devtools/client/netmonitor/moz.build
similarity index 100%
rename from browser/devtools/netmonitor/moz.build
rename to devtools/client/netmonitor/moz.build
diff --git a/browser/devtools/netmonitor/netmonitor-controller.js b/devtools/client/netmonitor/netmonitor-controller.js
similarity index 100%
rename from browser/devtools/netmonitor/netmonitor-controller.js
rename to devtools/client/netmonitor/netmonitor-controller.js
diff --git a/browser/devtools/netmonitor/netmonitor-view.js b/devtools/client/netmonitor/netmonitor-view.js
similarity index 100%
rename from browser/devtools/netmonitor/netmonitor-view.js
rename to devtools/client/netmonitor/netmonitor-view.js
diff --git a/browser/devtools/netmonitor/netmonitor.css b/devtools/client/netmonitor/netmonitor.css
similarity index 100%
rename from browser/devtools/netmonitor/netmonitor.css
rename to devtools/client/netmonitor/netmonitor.css
diff --git a/browser/devtools/netmonitor/netmonitor.xul b/devtools/client/netmonitor/netmonitor.xul
similarity index 100%
rename from browser/devtools/netmonitor/netmonitor.xul
rename to devtools/client/netmonitor/netmonitor.xul
diff --git a/browser/devtools/netmonitor/panel.js b/devtools/client/netmonitor/panel.js
similarity index 100%
rename from browser/devtools/netmonitor/panel.js
rename to devtools/client/netmonitor/panel.js
diff --git a/browser/devtools/netmonitor/test/.eslintrc b/devtools/client/netmonitor/test/.eslintrc
similarity index 100%
rename from browser/devtools/netmonitor/test/.eslintrc
rename to devtools/client/netmonitor/test/.eslintrc
diff --git a/browser/devtools/netmonitor/test/browser.ini b/devtools/client/netmonitor/test/browser.ini
similarity index 100%
rename from browser/devtools/netmonitor/test/browser.ini
rename to devtools/client/netmonitor/test/browser.ini
diff --git a/browser/devtools/netmonitor/test/browser_net_aaa_leaktest.js b/devtools/client/netmonitor/test/browser_net_aaa_leaktest.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_aaa_leaktest.js
rename to devtools/client/netmonitor/test/browser_net_aaa_leaktest.js
diff --git a/browser/devtools/netmonitor/test/browser_net_accessibility-01.js b/devtools/client/netmonitor/test/browser_net_accessibility-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_accessibility-01.js
rename to devtools/client/netmonitor/test/browser_net_accessibility-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_accessibility-02.js b/devtools/client/netmonitor/test/browser_net_accessibility-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_accessibility-02.js
rename to devtools/client/netmonitor/test/browser_net_accessibility-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_api-calls.js b/devtools/client/netmonitor/test/browser_net_api-calls.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_api-calls.js
rename to devtools/client/netmonitor/test/browser_net_api-calls.js
diff --git a/browser/devtools/netmonitor/test/browser_net_autoscroll.js b/devtools/client/netmonitor/test/browser_net_autoscroll.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_autoscroll.js
rename to devtools/client/netmonitor/test/browser_net_autoscroll.js
diff --git a/browser/devtools/netmonitor/test/browser_net_cached-status.js b/devtools/client/netmonitor/test/browser_net_cached-status.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_cached-status.js
rename to devtools/client/netmonitor/test/browser_net_cached-status.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-01.js b/devtools/client/netmonitor/test/browser_net_charts-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-01.js
rename to devtools/client/netmonitor/test/browser_net_charts-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-02.js b/devtools/client/netmonitor/test/browser_net_charts-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-02.js
rename to devtools/client/netmonitor/test/browser_net_charts-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-03.js b/devtools/client/netmonitor/test/browser_net_charts-03.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-03.js
rename to devtools/client/netmonitor/test/browser_net_charts-03.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-04.js b/devtools/client/netmonitor/test/browser_net_charts-04.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-04.js
rename to devtools/client/netmonitor/test/browser_net_charts-04.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-05.js b/devtools/client/netmonitor/test/browser_net_charts-05.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-05.js
rename to devtools/client/netmonitor/test/browser_net_charts-05.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-06.js b/devtools/client/netmonitor/test/browser_net_charts-06.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-06.js
rename to devtools/client/netmonitor/test/browser_net_charts-06.js
diff --git a/browser/devtools/netmonitor/test/browser_net_charts-07.js b/devtools/client/netmonitor/test/browser_net_charts-07.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_charts-07.js
rename to devtools/client/netmonitor/test/browser_net_charts-07.js
diff --git a/browser/devtools/netmonitor/test/browser_net_clear.js b/devtools/client/netmonitor/test/browser_net_clear.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_clear.js
rename to devtools/client/netmonitor/test/browser_net_clear.js
diff --git a/browser/devtools/netmonitor/test/browser_net_complex-params.js b/devtools/client/netmonitor/test/browser_net_complex-params.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_complex-params.js
rename to devtools/client/netmonitor/test/browser_net_complex-params.js
diff --git a/browser/devtools/netmonitor/test/browser_net_content-type.js b/devtools/client/netmonitor/test/browser_net_content-type.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_content-type.js
rename to devtools/client/netmonitor/test/browser_net_content-type.js
diff --git a/browser/devtools/netmonitor/test/browser_net_copy_as_curl.js b/devtools/client/netmonitor/test/browser_net_copy_as_curl.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_copy_as_curl.js
rename to devtools/client/netmonitor/test/browser_net_copy_as_curl.js
diff --git a/browser/devtools/netmonitor/test/browser_net_copy_headers.js b/devtools/client/netmonitor/test/browser_net_copy_headers.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_copy_headers.js
rename to devtools/client/netmonitor/test/browser_net_copy_headers.js
diff --git a/browser/devtools/netmonitor/test/browser_net_copy_image_as_data_uri.js b/devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_copy_image_as_data_uri.js
rename to devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js
diff --git a/browser/devtools/netmonitor/test/browser_net_copy_params.js b/devtools/client/netmonitor/test/browser_net_copy_params.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_copy_params.js
rename to devtools/client/netmonitor/test/browser_net_copy_params.js
diff --git a/browser/devtools/netmonitor/test/browser_net_copy_response.js b/devtools/client/netmonitor/test/browser_net_copy_response.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_copy_response.js
rename to devtools/client/netmonitor/test/browser_net_copy_response.js
diff --git a/browser/devtools/netmonitor/test/browser_net_copy_url.js b/devtools/client/netmonitor/test/browser_net_copy_url.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_copy_url.js
rename to devtools/client/netmonitor/test/browser_net_copy_url.js
diff --git a/browser/devtools/netmonitor/test/browser_net_curl-utils.js b/devtools/client/netmonitor/test/browser_net_curl-utils.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_curl-utils.js
rename to devtools/client/netmonitor/test/browser_net_curl-utils.js
diff --git a/browser/devtools/netmonitor/test/browser_net_cyrillic-01.js b/devtools/client/netmonitor/test/browser_net_cyrillic-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_cyrillic-01.js
rename to devtools/client/netmonitor/test/browser_net_cyrillic-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_cyrillic-02.js b/devtools/client/netmonitor/test/browser_net_cyrillic-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_cyrillic-02.js
rename to devtools/client/netmonitor/test/browser_net_cyrillic-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_details-no-duplicated-content.js b/devtools/client/netmonitor/test/browser_net_details-no-duplicated-content.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_details-no-duplicated-content.js
rename to devtools/client/netmonitor/test/browser_net_details-no-duplicated-content.js
diff --git a/browser/devtools/netmonitor/test/browser_net_filter-01.js b/devtools/client/netmonitor/test/browser_net_filter-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_filter-01.js
rename to devtools/client/netmonitor/test/browser_net_filter-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_filter-02.js b/devtools/client/netmonitor/test/browser_net_filter-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_filter-02.js
rename to devtools/client/netmonitor/test/browser_net_filter-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_filter-03.js b/devtools/client/netmonitor/test/browser_net_filter-03.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_filter-03.js
rename to devtools/client/netmonitor/test/browser_net_filter-03.js
diff --git a/browser/devtools/netmonitor/test/browser_net_filter-04.js b/devtools/client/netmonitor/test/browser_net_filter-04.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_filter-04.js
rename to devtools/client/netmonitor/test/browser_net_filter-04.js
diff --git a/browser/devtools/netmonitor/test/browser_net_footer-summary.js b/devtools/client/netmonitor/test/browser_net_footer-summary.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_footer-summary.js
rename to devtools/client/netmonitor/test/browser_net_footer-summary.js
diff --git a/browser/devtools/netmonitor/test/browser_net_html-preview.js b/devtools/client/netmonitor/test/browser_net_html-preview.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_html-preview.js
rename to devtools/client/netmonitor/test/browser_net_html-preview.js
diff --git a/browser/devtools/netmonitor/test/browser_net_icon-preview.js b/devtools/client/netmonitor/test/browser_net_icon-preview.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_icon-preview.js
rename to devtools/client/netmonitor/test/browser_net_icon-preview.js
diff --git a/browser/devtools/netmonitor/test/browser_net_image-tooltip.js b/devtools/client/netmonitor/test/browser_net_image-tooltip.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_image-tooltip.js
rename to devtools/client/netmonitor/test/browser_net_image-tooltip.js
diff --git a/browser/devtools/netmonitor/test/browser_net_json-long.js b/devtools/client/netmonitor/test/browser_net_json-long.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_json-long.js
rename to devtools/client/netmonitor/test/browser_net_json-long.js
diff --git a/browser/devtools/netmonitor/test/browser_net_json-malformed.js b/devtools/client/netmonitor/test/browser_net_json-malformed.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_json-malformed.js
rename to devtools/client/netmonitor/test/browser_net_json-malformed.js
diff --git a/browser/devtools/netmonitor/test/browser_net_json_custom_mime.js b/devtools/client/netmonitor/test/browser_net_json_custom_mime.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_json_custom_mime.js
rename to devtools/client/netmonitor/test/browser_net_json_custom_mime.js
diff --git a/browser/devtools/netmonitor/test/browser_net_json_text_mime.js b/devtools/client/netmonitor/test/browser_net_json_text_mime.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_json_text_mime.js
rename to devtools/client/netmonitor/test/browser_net_json_text_mime.js
diff --git a/browser/devtools/netmonitor/test/browser_net_jsonp.js b/devtools/client/netmonitor/test/browser_net_jsonp.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_jsonp.js
rename to devtools/client/netmonitor/test/browser_net_jsonp.js
diff --git a/browser/devtools/netmonitor/test/browser_net_large-response.js b/devtools/client/netmonitor/test/browser_net_large-response.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_large-response.js
rename to devtools/client/netmonitor/test/browser_net_large-response.js
diff --git a/browser/devtools/netmonitor/test/browser_net_open_request_in_tab.js b/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_open_request_in_tab.js
rename to devtools/client/netmonitor/test/browser_net_open_request_in_tab.js
diff --git a/browser/devtools/netmonitor/test/browser_net_page-nav.js b/devtools/client/netmonitor/test/browser_net_page-nav.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_page-nav.js
rename to devtools/client/netmonitor/test/browser_net_page-nav.js
diff --git a/browser/devtools/netmonitor/test/browser_net_pane-collapse.js b/devtools/client/netmonitor/test/browser_net_pane-collapse.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_pane-collapse.js
rename to devtools/client/netmonitor/test/browser_net_pane-collapse.js
diff --git a/browser/devtools/netmonitor/test/browser_net_pane-toggle.js b/devtools/client/netmonitor/test/browser_net_pane-toggle.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_pane-toggle.js
rename to devtools/client/netmonitor/test/browser_net_pane-toggle.js
diff --git a/browser/devtools/netmonitor/test/browser_net_persistent_logs.js b/devtools/client/netmonitor/test/browser_net_persistent_logs.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_persistent_logs.js
rename to devtools/client/netmonitor/test/browser_net_persistent_logs.js
diff --git a/browser/devtools/netmonitor/test/browser_net_post-data-01.js b/devtools/client/netmonitor/test/browser_net_post-data-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_post-data-01.js
rename to devtools/client/netmonitor/test/browser_net_post-data-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_post-data-02.js b/devtools/client/netmonitor/test/browser_net_post-data-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_post-data-02.js
rename to devtools/client/netmonitor/test/browser_net_post-data-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_post-data-03.js b/devtools/client/netmonitor/test/browser_net_post-data-03.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_post-data-03.js
rename to devtools/client/netmonitor/test/browser_net_post-data-03.js
diff --git a/browser/devtools/netmonitor/test/browser_net_prefs-and-l10n.js b/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_prefs-and-l10n.js
rename to devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js
diff --git a/browser/devtools/netmonitor/test/browser_net_prefs-reload.js b/devtools/client/netmonitor/test/browser_net_prefs-reload.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_prefs-reload.js
rename to devtools/client/netmonitor/test/browser_net_prefs-reload.js
diff --git a/browser/devtools/netmonitor/test/browser_net_raw_headers.js b/devtools/client/netmonitor/test/browser_net_raw_headers.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_raw_headers.js
rename to devtools/client/netmonitor/test/browser_net_raw_headers.js
diff --git a/browser/devtools/netmonitor/test/browser_net_reload-button.js b/devtools/client/netmonitor/test/browser_net_reload-button.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_reload-button.js
rename to devtools/client/netmonitor/test/browser_net_reload-button.js
diff --git a/browser/devtools/netmonitor/test/browser_net_req-resp-bodies.js b/devtools/client/netmonitor/test/browser_net_req-resp-bodies.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_req-resp-bodies.js
rename to devtools/client/netmonitor/test/browser_net_req-resp-bodies.js
diff --git a/browser/devtools/netmonitor/test/browser_net_resend.js b/devtools/client/netmonitor/test/browser_net_resend.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_resend.js
rename to devtools/client/netmonitor/test/browser_net_resend.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-details.js b/devtools/client/netmonitor/test/browser_net_security-details.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-details.js
rename to devtools/client/netmonitor/test/browser_net_security-details.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-error.js b/devtools/client/netmonitor/test/browser_net_security-error.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-error.js
rename to devtools/client/netmonitor/test/browser_net_security-error.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-icon-click.js b/devtools/client/netmonitor/test/browser_net_security-icon-click.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-icon-click.js
rename to devtools/client/netmonitor/test/browser_net_security-icon-click.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-redirect.js b/devtools/client/netmonitor/test/browser_net_security-redirect.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-redirect.js
rename to devtools/client/netmonitor/test/browser_net_security-redirect.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-state.js b/devtools/client/netmonitor/test/browser_net_security-state.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-state.js
rename to devtools/client/netmonitor/test/browser_net_security-state.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-tab-deselect.js b/devtools/client/netmonitor/test/browser_net_security-tab-deselect.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-tab-deselect.js
rename to devtools/client/netmonitor/test/browser_net_security-tab-deselect.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-tab-visibility.js b/devtools/client/netmonitor/test/browser_net_security-tab-visibility.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-tab-visibility.js
rename to devtools/client/netmonitor/test/browser_net_security-tab-visibility.js
diff --git a/browser/devtools/netmonitor/test/browser_net_security-warnings.js b/devtools/client/netmonitor/test/browser_net_security-warnings.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_security-warnings.js
rename to devtools/client/netmonitor/test/browser_net_security-warnings.js
diff --git a/browser/devtools/netmonitor/test/browser_net_send-beacon-other-tab.js b/devtools/client/netmonitor/test/browser_net_send-beacon-other-tab.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_send-beacon-other-tab.js
rename to devtools/client/netmonitor/test/browser_net_send-beacon-other-tab.js
diff --git a/browser/devtools/netmonitor/test/browser_net_send-beacon.js b/devtools/client/netmonitor/test/browser_net_send-beacon.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_send-beacon.js
rename to devtools/client/netmonitor/test/browser_net_send-beacon.js
diff --git a/browser/devtools/netmonitor/test/browser_net_simple-init.js b/devtools/client/netmonitor/test/browser_net_simple-init.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_simple-init.js
rename to devtools/client/netmonitor/test/browser_net_simple-init.js
diff --git a/browser/devtools/netmonitor/test/browser_net_simple-request-data.js b/devtools/client/netmonitor/test/browser_net_simple-request-data.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_simple-request-data.js
rename to devtools/client/netmonitor/test/browser_net_simple-request-data.js
diff --git a/browser/devtools/netmonitor/test/browser_net_simple-request-details.js b/devtools/client/netmonitor/test/browser_net_simple-request-details.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_simple-request-details.js
rename to devtools/client/netmonitor/test/browser_net_simple-request-details.js
diff --git a/browser/devtools/netmonitor/test/browser_net_simple-request.js b/devtools/client/netmonitor/test/browser_net_simple-request.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_simple-request.js
rename to devtools/client/netmonitor/test/browser_net_simple-request.js
diff --git a/browser/devtools/netmonitor/test/browser_net_sort-01.js b/devtools/client/netmonitor/test/browser_net_sort-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_sort-01.js
rename to devtools/client/netmonitor/test/browser_net_sort-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_sort-02.js b/devtools/client/netmonitor/test/browser_net_sort-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_sort-02.js
rename to devtools/client/netmonitor/test/browser_net_sort-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_sort-03.js b/devtools/client/netmonitor/test/browser_net_sort-03.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_sort-03.js
rename to devtools/client/netmonitor/test/browser_net_sort-03.js
diff --git a/browser/devtools/netmonitor/test/browser_net_statistics-01.js b/devtools/client/netmonitor/test/browser_net_statistics-01.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_statistics-01.js
rename to devtools/client/netmonitor/test/browser_net_statistics-01.js
diff --git a/browser/devtools/netmonitor/test/browser_net_statistics-02.js b/devtools/client/netmonitor/test/browser_net_statistics-02.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_statistics-02.js
rename to devtools/client/netmonitor/test/browser_net_statistics-02.js
diff --git a/browser/devtools/netmonitor/test/browser_net_statistics-03.js b/devtools/client/netmonitor/test/browser_net_statistics-03.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_statistics-03.js
rename to devtools/client/netmonitor/test/browser_net_statistics-03.js
diff --git a/browser/devtools/netmonitor/test/browser_net_status-codes.js b/devtools/client/netmonitor/test/browser_net_status-codes.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_status-codes.js
rename to devtools/client/netmonitor/test/browser_net_status-codes.js
diff --git a/browser/devtools/netmonitor/test/browser_net_timeline_ticks.js b/devtools/client/netmonitor/test/browser_net_timeline_ticks.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_timeline_ticks.js
rename to devtools/client/netmonitor/test/browser_net_timeline_ticks.js
diff --git a/browser/devtools/netmonitor/test/browser_net_timing-division.js b/devtools/client/netmonitor/test/browser_net_timing-division.js
similarity index 100%
rename from browser/devtools/netmonitor/test/browser_net_timing-division.js
rename to devtools/client/netmonitor/test/browser_net_timing-division.js
diff --git a/browser/devtools/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js
similarity index 100%
rename from browser/devtools/netmonitor/test/head.js
rename to devtools/client/netmonitor/test/head.js
diff --git a/browser/devtools/netmonitor/test/html_api-calls-test-page.html b/devtools/client/netmonitor/test/html_api-calls-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_api-calls-test-page.html
rename to devtools/client/netmonitor/test/html_api-calls-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_content-type-test-page.html b/devtools/client/netmonitor/test/html_content-type-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_content-type-test-page.html
rename to devtools/client/netmonitor/test/html_content-type-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_content-type-without-cache-test-page.html b/devtools/client/netmonitor/test/html_content-type-without-cache-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_content-type-without-cache-test-page.html
rename to devtools/client/netmonitor/test/html_content-type-without-cache-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_copy-as-curl.html b/devtools/client/netmonitor/test/html_copy-as-curl.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_copy-as-curl.html
rename to devtools/client/netmonitor/test/html_copy-as-curl.html
diff --git a/browser/devtools/netmonitor/test/html_curl-utils.html b/devtools/client/netmonitor/test/html_curl-utils.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_curl-utils.html
rename to devtools/client/netmonitor/test/html_curl-utils.html
diff --git a/browser/devtools/netmonitor/test/html_custom-get-page.html b/devtools/client/netmonitor/test/html_custom-get-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_custom-get-page.html
rename to devtools/client/netmonitor/test/html_custom-get-page.html
diff --git a/browser/devtools/netmonitor/test/html_cyrillic-test-page.html b/devtools/client/netmonitor/test/html_cyrillic-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_cyrillic-test-page.html
rename to devtools/client/netmonitor/test/html_cyrillic-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_filter-test-page.html b/devtools/client/netmonitor/test/html_filter-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_filter-test-page.html
rename to devtools/client/netmonitor/test/html_filter-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_har_post-data-test-page.html b/devtools/client/netmonitor/test/html_har_post-data-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_har_post-data-test-page.html
rename to devtools/client/netmonitor/test/html_har_post-data-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_infinite-get-page.html b/devtools/client/netmonitor/test/html_infinite-get-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_infinite-get-page.html
rename to devtools/client/netmonitor/test/html_infinite-get-page.html
diff --git a/browser/devtools/netmonitor/test/html_json-custom-mime-test-page.html b/devtools/client/netmonitor/test/html_json-custom-mime-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_json-custom-mime-test-page.html
rename to devtools/client/netmonitor/test/html_json-custom-mime-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_json-long-test-page.html b/devtools/client/netmonitor/test/html_json-long-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_json-long-test-page.html
rename to devtools/client/netmonitor/test/html_json-long-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_json-malformed-test-page.html b/devtools/client/netmonitor/test/html_json-malformed-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_json-malformed-test-page.html
rename to devtools/client/netmonitor/test/html_json-malformed-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_json-text-mime-test-page.html b/devtools/client/netmonitor/test/html_json-text-mime-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_json-text-mime-test-page.html
rename to devtools/client/netmonitor/test/html_json-text-mime-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_jsonp-test-page.html b/devtools/client/netmonitor/test/html_jsonp-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_jsonp-test-page.html
rename to devtools/client/netmonitor/test/html_jsonp-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_navigate-test-page.html b/devtools/client/netmonitor/test/html_navigate-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_navigate-test-page.html
rename to devtools/client/netmonitor/test/html_navigate-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_params-test-page.html b/devtools/client/netmonitor/test/html_params-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_params-test-page.html
rename to devtools/client/netmonitor/test/html_params-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_post-data-test-page.html b/devtools/client/netmonitor/test/html_post-data-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_post-data-test-page.html
rename to devtools/client/netmonitor/test/html_post-data-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_post-raw-test-page.html b/devtools/client/netmonitor/test/html_post-raw-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_post-raw-test-page.html
rename to devtools/client/netmonitor/test/html_post-raw-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_post-raw-with-headers-test-page.html b/devtools/client/netmonitor/test/html_post-raw-with-headers-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_post-raw-with-headers-test-page.html
rename to devtools/client/netmonitor/test/html_post-raw-with-headers-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_send-beacon.html b/devtools/client/netmonitor/test/html_send-beacon.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_send-beacon.html
rename to devtools/client/netmonitor/test/html_send-beacon.html
diff --git a/browser/devtools/netmonitor/test/html_simple-test-page.html b/devtools/client/netmonitor/test/html_simple-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_simple-test-page.html
rename to devtools/client/netmonitor/test/html_simple-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_single-get-page.html b/devtools/client/netmonitor/test/html_single-get-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_single-get-page.html
rename to devtools/client/netmonitor/test/html_single-get-page.html
diff --git a/browser/devtools/netmonitor/test/html_sorting-test-page.html b/devtools/client/netmonitor/test/html_sorting-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_sorting-test-page.html
rename to devtools/client/netmonitor/test/html_sorting-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_statistics-test-page.html b/devtools/client/netmonitor/test/html_statistics-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_statistics-test-page.html
rename to devtools/client/netmonitor/test/html_statistics-test-page.html
diff --git a/browser/devtools/netmonitor/test/html_status-codes-test-page.html b/devtools/client/netmonitor/test/html_status-codes-test-page.html
similarity index 100%
rename from browser/devtools/netmonitor/test/html_status-codes-test-page.html
rename to devtools/client/netmonitor/test/html_status-codes-test-page.html
diff --git a/browser/devtools/netmonitor/test/sjs_content-type-test-server.sjs b/devtools/client/netmonitor/test/sjs_content-type-test-server.sjs
similarity index 100%
rename from browser/devtools/netmonitor/test/sjs_content-type-test-server.sjs
rename to devtools/client/netmonitor/test/sjs_content-type-test-server.sjs
diff --git a/browser/devtools/netmonitor/test/sjs_cors-test-server.sjs b/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
similarity index 100%
rename from browser/devtools/netmonitor/test/sjs_cors-test-server.sjs
rename to devtools/client/netmonitor/test/sjs_cors-test-server.sjs
diff --git a/browser/devtools/netmonitor/test/sjs_https-redirect-test-server.sjs b/devtools/client/netmonitor/test/sjs_https-redirect-test-server.sjs
similarity index 100%
rename from browser/devtools/netmonitor/test/sjs_https-redirect-test-server.sjs
rename to devtools/client/netmonitor/test/sjs_https-redirect-test-server.sjs
diff --git a/browser/devtools/netmonitor/test/sjs_simple-test-server.sjs b/devtools/client/netmonitor/test/sjs_simple-test-server.sjs
similarity index 100%
rename from browser/devtools/netmonitor/test/sjs_simple-test-server.sjs
rename to devtools/client/netmonitor/test/sjs_simple-test-server.sjs
diff --git a/browser/devtools/netmonitor/test/sjs_sorting-test-server.sjs b/devtools/client/netmonitor/test/sjs_sorting-test-server.sjs
similarity index 100%
rename from browser/devtools/netmonitor/test/sjs_sorting-test-server.sjs
rename to devtools/client/netmonitor/test/sjs_sorting-test-server.sjs
diff --git a/browser/devtools/netmonitor/test/sjs_status-codes-test-server.sjs b/devtools/client/netmonitor/test/sjs_status-codes-test-server.sjs
similarity index 100%
rename from browser/devtools/netmonitor/test/sjs_status-codes-test-server.sjs
rename to devtools/client/netmonitor/test/sjs_status-codes-test-server.sjs
diff --git a/browser/devtools/netmonitor/test/test-image.png b/devtools/client/netmonitor/test/test-image.png
similarity index 100%
rename from browser/devtools/netmonitor/test/test-image.png
rename to devtools/client/netmonitor/test/test-image.png
diff --git a/browser/devtools/performance/docs/markers.md b/devtools/client/performance/docs/markers.md
similarity index 100%
rename from browser/devtools/performance/docs/markers.md
rename to devtools/client/performance/docs/markers.md
diff --git a/browser/devtools/performance/events.js b/devtools/client/performance/events.js
similarity index 100%
rename from browser/devtools/performance/events.js
rename to devtools/client/performance/events.js
diff --git a/browser/devtools/performance/modules/global.js b/devtools/client/performance/modules/global.js
similarity index 100%
rename from browser/devtools/performance/modules/global.js
rename to devtools/client/performance/modules/global.js
diff --git a/browser/devtools/performance/modules/logic/frame-utils.js b/devtools/client/performance/modules/logic/frame-utils.js
similarity index 100%
rename from browser/devtools/performance/modules/logic/frame-utils.js
rename to devtools/client/performance/modules/logic/frame-utils.js
diff --git a/browser/devtools/performance/modules/logic/jit.js b/devtools/client/performance/modules/logic/jit.js
similarity index 100%
rename from browser/devtools/performance/modules/logic/jit.js
rename to devtools/client/performance/modules/logic/jit.js
diff --git a/browser/devtools/performance/modules/logic/marker-utils.js b/devtools/client/performance/modules/logic/marker-utils.js
similarity index 100%
rename from browser/devtools/performance/modules/logic/marker-utils.js
rename to devtools/client/performance/modules/logic/marker-utils.js
diff --git a/browser/devtools/performance/modules/logic/telemetry.js b/devtools/client/performance/modules/logic/telemetry.js
similarity index 100%
rename from browser/devtools/performance/modules/logic/telemetry.js
rename to devtools/client/performance/modules/logic/telemetry.js
diff --git a/browser/devtools/performance/modules/logic/tree-model.js b/devtools/client/performance/modules/logic/tree-model.js
similarity index 100%
rename from browser/devtools/performance/modules/logic/tree-model.js
rename to devtools/client/performance/modules/logic/tree-model.js
diff --git a/browser/devtools/performance/modules/logic/waterfall-utils.js b/devtools/client/performance/modules/logic/waterfall-utils.js
similarity index 100%
rename from browser/devtools/performance/modules/logic/waterfall-utils.js
rename to devtools/client/performance/modules/logic/waterfall-utils.js
diff --git a/browser/devtools/performance/modules/markers.js b/devtools/client/performance/modules/markers.js
similarity index 100%
rename from browser/devtools/performance/modules/markers.js
rename to devtools/client/performance/modules/markers.js
diff --git a/browser/devtools/performance/modules/widgets/graphs.js b/devtools/client/performance/modules/widgets/graphs.js
similarity index 100%
rename from browser/devtools/performance/modules/widgets/graphs.js
rename to devtools/client/performance/modules/widgets/graphs.js
diff --git a/browser/devtools/performance/modules/widgets/marker-details.js b/devtools/client/performance/modules/widgets/marker-details.js
similarity index 100%
rename from browser/devtools/performance/modules/widgets/marker-details.js
rename to devtools/client/performance/modules/widgets/marker-details.js
diff --git a/browser/devtools/performance/modules/widgets/marker-view.js b/devtools/client/performance/modules/widgets/marker-view.js
similarity index 100%
rename from browser/devtools/performance/modules/widgets/marker-view.js
rename to devtools/client/performance/modules/widgets/marker-view.js
diff --git a/browser/devtools/performance/modules/widgets/markers-overview.js b/devtools/client/performance/modules/widgets/markers-overview.js
similarity index 100%
rename from browser/devtools/performance/modules/widgets/markers-overview.js
rename to devtools/client/performance/modules/widgets/markers-overview.js
diff --git a/browser/devtools/performance/modules/widgets/tree-view.js b/devtools/client/performance/modules/widgets/tree-view.js
similarity index 100%
rename from browser/devtools/performance/modules/widgets/tree-view.js
rename to devtools/client/performance/modules/widgets/tree-view.js
diff --git a/browser/devtools/performance/modules/widgets/waterfall-ticks.js b/devtools/client/performance/modules/widgets/waterfall-ticks.js
similarity index 100%
rename from browser/devtools/performance/modules/widgets/waterfall-ticks.js
rename to devtools/client/performance/modules/widgets/waterfall-ticks.js
diff --git a/browser/devtools/performance/moz.build b/devtools/client/performance/moz.build
similarity index 100%
rename from browser/devtools/performance/moz.build
rename to devtools/client/performance/moz.build
diff --git a/browser/devtools/performance/panel.js b/devtools/client/performance/panel.js
similarity index 100%
rename from browser/devtools/performance/panel.js
rename to devtools/client/performance/panel.js
diff --git a/browser/devtools/performance/performance-controller.js b/devtools/client/performance/performance-controller.js
similarity index 100%
rename from browser/devtools/performance/performance-controller.js
rename to devtools/client/performance/performance-controller.js
diff --git a/browser/devtools/performance/performance-view.js b/devtools/client/performance/performance-view.js
similarity index 100%
rename from browser/devtools/performance/performance-view.js
rename to devtools/client/performance/performance-view.js
diff --git a/browser/devtools/performance/performance.xul b/devtools/client/performance/performance.xul
similarity index 100%
rename from browser/devtools/performance/performance.xul
rename to devtools/client/performance/performance.xul
diff --git a/browser/devtools/performance/test/.eslintrc b/devtools/client/performance/test/.eslintrc
similarity index 100%
rename from browser/devtools/performance/test/.eslintrc
rename to devtools/client/performance/test/.eslintrc
diff --git a/browser/devtools/performance/test/browser.ini b/devtools/client/performance/test/browser.ini
similarity index 100%
rename from browser/devtools/performance/test/browser.ini
rename to devtools/client/performance/test/browser.ini
diff --git a/browser/devtools/performance/test/browser_aaa-run-first-leaktest.js b/devtools/client/performance/test/browser_aaa-run-first-leaktest.js
similarity index 100%
rename from browser/devtools/performance/test/browser_aaa-run-first-leaktest.js
rename to devtools/client/performance/test/browser_aaa-run-first-leaktest.js
diff --git a/browser/devtools/performance/test/browser_perf-categories-js-calltree.js b/devtools/client/performance/test/browser_perf-categories-js-calltree.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-categories-js-calltree.js
rename to devtools/client/performance/test/browser_perf-categories-js-calltree.js
diff --git a/browser/devtools/performance/test/browser_perf-clear-01.js b/devtools/client/performance/test/browser_perf-clear-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-clear-01.js
rename to devtools/client/performance/test/browser_perf-clear-01.js
diff --git a/browser/devtools/performance/test/browser_perf-clear-02.js b/devtools/client/performance/test/browser_perf-clear-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-clear-02.js
rename to devtools/client/performance/test/browser_perf-clear-02.js
diff --git a/browser/devtools/performance/test/browser_perf-columns-js-calltree.js b/devtools/client/performance/test/browser_perf-columns-js-calltree.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-columns-js-calltree.js
rename to devtools/client/performance/test/browser_perf-columns-js-calltree.js
diff --git a/browser/devtools/performance/test/browser_perf-columns-memory-calltree.js b/devtools/client/performance/test/browser_perf-columns-memory-calltree.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-columns-memory-calltree.js
rename to devtools/client/performance/test/browser_perf-columns-memory-calltree.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-01.js b/devtools/client/performance/test/browser_perf-console-record-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-01.js
rename to devtools/client/performance/test/browser_perf-console-record-01.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-02.js b/devtools/client/performance/test/browser_perf-console-record-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-02.js
rename to devtools/client/performance/test/browser_perf-console-record-02.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-03.js b/devtools/client/performance/test/browser_perf-console-record-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-03.js
rename to devtools/client/performance/test/browser_perf-console-record-03.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-04.js b/devtools/client/performance/test/browser_perf-console-record-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-04.js
rename to devtools/client/performance/test/browser_perf-console-record-04.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-05.js b/devtools/client/performance/test/browser_perf-console-record-05.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-05.js
rename to devtools/client/performance/test/browser_perf-console-record-05.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-06.js b/devtools/client/performance/test/browser_perf-console-record-06.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-06.js
rename to devtools/client/performance/test/browser_perf-console-record-06.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-07.js b/devtools/client/performance/test/browser_perf-console-record-07.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-07.js
rename to devtools/client/performance/test/browser_perf-console-record-07.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-08.js b/devtools/client/performance/test/browser_perf-console-record-08.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-08.js
rename to devtools/client/performance/test/browser_perf-console-record-08.js
diff --git a/browser/devtools/performance/test/browser_perf-console-record-09.js b/devtools/client/performance/test/browser_perf-console-record-09.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-console-record-09.js
rename to devtools/client/performance/test/browser_perf-console-record-09.js
diff --git a/browser/devtools/performance/test/browser_perf-details-01.js b/devtools/client/performance/test/browser_perf-details-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-01.js
rename to devtools/client/performance/test/browser_perf-details-01.js
diff --git a/browser/devtools/performance/test/browser_perf-details-02.js b/devtools/client/performance/test/browser_perf-details-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-02.js
rename to devtools/client/performance/test/browser_perf-details-02.js
diff --git a/browser/devtools/performance/test/browser_perf-details-03.js b/devtools/client/performance/test/browser_perf-details-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-03.js
rename to devtools/client/performance/test/browser_perf-details-03.js
diff --git a/browser/devtools/performance/test/browser_perf-details-04.js b/devtools/client/performance/test/browser_perf-details-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-04.js
rename to devtools/client/performance/test/browser_perf-details-04.js
diff --git a/browser/devtools/performance/test/browser_perf-details-05.js b/devtools/client/performance/test/browser_perf-details-05.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-05.js
rename to devtools/client/performance/test/browser_perf-details-05.js
diff --git a/browser/devtools/performance/test/browser_perf-details-06.js b/devtools/client/performance/test/browser_perf-details-06.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-06.js
rename to devtools/client/performance/test/browser_perf-details-06.js
diff --git a/browser/devtools/performance/test/browser_perf-details-07.js b/devtools/client/performance/test/browser_perf-details-07.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-07.js
rename to devtools/client/performance/test/browser_perf-details-07.js
diff --git a/browser/devtools/performance/test/browser_perf-details-calltree-render.js b/devtools/client/performance/test/browser_perf-details-calltree-render.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-calltree-render.js
rename to devtools/client/performance/test/browser_perf-details-calltree-render.js
diff --git a/browser/devtools/performance/test/browser_perf-details-flamegraph-render.js b/devtools/client/performance/test/browser_perf-details-flamegraph-render.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-flamegraph-render.js
rename to devtools/client/performance/test/browser_perf-details-flamegraph-render.js
diff --git a/browser/devtools/performance/test/browser_perf-details-memory-calltree-render.js b/devtools/client/performance/test/browser_perf-details-memory-calltree-render.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-memory-calltree-render.js
rename to devtools/client/performance/test/browser_perf-details-memory-calltree-render.js
diff --git a/browser/devtools/performance/test/browser_perf-details-memory-flamegraph-render.js b/devtools/client/performance/test/browser_perf-details-memory-flamegraph-render.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-memory-flamegraph-render.js
rename to devtools/client/performance/test/browser_perf-details-memory-flamegraph-render.js
diff --git a/browser/devtools/performance/test/browser_perf-details-waterfall-gc-snap.js b/devtools/client/performance/test/browser_perf-details-waterfall-gc-snap.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-waterfall-gc-snap.js
rename to devtools/client/performance/test/browser_perf-details-waterfall-gc-snap.js
diff --git a/browser/devtools/performance/test/browser_perf-details-waterfall-render.js b/devtools/client/performance/test/browser_perf-details-waterfall-render.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-details-waterfall-render.js
rename to devtools/client/performance/test/browser_perf-details-waterfall-render.js
diff --git a/browser/devtools/performance/test/browser_perf-events-calltree.js b/devtools/client/performance/test/browser_perf-events-calltree.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-events-calltree.js
rename to devtools/client/performance/test/browser_perf-events-calltree.js
diff --git a/browser/devtools/performance/test/browser_perf-highlighted.js b/devtools/client/performance/test/browser_perf-highlighted.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-highlighted.js
rename to devtools/client/performance/test/browser_perf-highlighted.js
diff --git a/browser/devtools/performance/test/browser_perf-jit-view-01.js b/devtools/client/performance/test/browser_perf-jit-view-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-jit-view-01.js
rename to devtools/client/performance/test/browser_perf-jit-view-01.js
diff --git a/browser/devtools/performance/test/browser_perf-jit-view-02.js b/devtools/client/performance/test/browser_perf-jit-view-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-jit-view-02.js
rename to devtools/client/performance/test/browser_perf-jit-view-02.js
diff --git a/browser/devtools/performance/test/browser_perf-legacy-front-01.js b/devtools/client/performance/test/browser_perf-legacy-front-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-legacy-front-01.js
rename to devtools/client/performance/test/browser_perf-legacy-front-01.js
diff --git a/browser/devtools/performance/test/browser_perf-legacy-front-02.js b/devtools/client/performance/test/browser_perf-legacy-front-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-legacy-front-02.js
rename to devtools/client/performance/test/browser_perf-legacy-front-02.js
diff --git a/browser/devtools/performance/test/browser_perf-legacy-front-03.js b/devtools/client/performance/test/browser_perf-legacy-front-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-legacy-front-03.js
rename to devtools/client/performance/test/browser_perf-legacy-front-03.js
diff --git a/browser/devtools/performance/test/browser_perf-legacy-front-04.js b/devtools/client/performance/test/browser_perf-legacy-front-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-legacy-front-04.js
rename to devtools/client/performance/test/browser_perf-legacy-front-04.js
diff --git a/browser/devtools/performance/test/browser_perf-legacy-front-05.js b/devtools/client/performance/test/browser_perf-legacy-front-05.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-legacy-front-05.js
rename to devtools/client/performance/test/browser_perf-legacy-front-05.js
diff --git a/browser/devtools/performance/test/browser_perf-legacy-front-06.js b/devtools/client/performance/test/browser_perf-legacy-front-06.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-legacy-front-06.js
rename to devtools/client/performance/test/browser_perf-legacy-front-06.js
diff --git a/browser/devtools/performance/test/browser_perf-loading-01.js b/devtools/client/performance/test/browser_perf-loading-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-loading-01.js
rename to devtools/client/performance/test/browser_perf-loading-01.js
diff --git a/browser/devtools/performance/test/browser_perf-loading-02.js b/devtools/client/performance/test/browser_perf-loading-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-loading-02.js
rename to devtools/client/performance/test/browser_perf-loading-02.js
diff --git a/browser/devtools/performance/test/browser_perf-marker-details-01.js b/devtools/client/performance/test/browser_perf-marker-details-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-marker-details-01.js
rename to devtools/client/performance/test/browser_perf-marker-details-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-01.js b/devtools/client/performance/test/browser_perf-options-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-01.js
rename to devtools/client/performance/test/browser_perf-options-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-02.js b/devtools/client/performance/test/browser_perf-options-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-02.js
rename to devtools/client/performance/test/browser_perf-options-02.js
diff --git a/browser/devtools/performance/test/browser_perf-options-03.js b/devtools/client/performance/test/browser_perf-options-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-03.js
rename to devtools/client/performance/test/browser_perf-options-03.js
diff --git a/browser/devtools/performance/test/browser_perf-options-allocations.js b/devtools/client/performance/test/browser_perf-options-allocations.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-allocations.js
rename to devtools/client/performance/test/browser_perf-options-allocations.js
diff --git a/browser/devtools/performance/test/browser_perf-options-enable-framerate.js b/devtools/client/performance/test/browser_perf-options-enable-framerate.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-enable-framerate.js
rename to devtools/client/performance/test/browser_perf-options-enable-framerate.js
diff --git a/browser/devtools/performance/test/browser_perf-options-enable-memory-01.js b/devtools/client/performance/test/browser_perf-options-enable-memory-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-enable-memory-01.js
rename to devtools/client/performance/test/browser_perf-options-enable-memory-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-enable-memory-02.js b/devtools/client/performance/test/browser_perf-options-enable-memory-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-enable-memory-02.js
rename to devtools/client/performance/test/browser_perf-options-enable-memory-02.js
diff --git a/browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-01.js b/devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-01.js
rename to devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-02.js b/devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-02.js
rename to devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-02.js
diff --git a/browser/devtools/performance/test/browser_perf-options-invert-call-tree-01.js b/devtools/client/performance/test/browser_perf-options-invert-call-tree-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-invert-call-tree-01.js
rename to devtools/client/performance/test/browser_perf-options-invert-call-tree-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-invert-call-tree-02.js b/devtools/client/performance/test/browser_perf-options-invert-call-tree-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-invert-call-tree-02.js
rename to devtools/client/performance/test/browser_perf-options-invert-call-tree-02.js
diff --git a/browser/devtools/performance/test/browser_perf-options-invert-flame-graph-01.js b/devtools/client/performance/test/browser_perf-options-invert-flame-graph-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-invert-flame-graph-01.js
rename to devtools/client/performance/test/browser_perf-options-invert-flame-graph-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-invert-flame-graph-02.js b/devtools/client/performance/test/browser_perf-options-invert-flame-graph-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-invert-flame-graph-02.js
rename to devtools/client/performance/test/browser_perf-options-invert-flame-graph-02.js
diff --git a/browser/devtools/performance/test/browser_perf-options-profiler.js b/devtools/client/performance/test/browser_perf-options-profiler.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-profiler.js
rename to devtools/client/performance/test/browser_perf-options-profiler.js
diff --git a/browser/devtools/performance/test/browser_perf-options-show-idle-blocks-01.js b/devtools/client/performance/test/browser_perf-options-show-idle-blocks-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-show-idle-blocks-01.js
rename to devtools/client/performance/test/browser_perf-options-show-idle-blocks-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-show-idle-blocks-02.js b/devtools/client/performance/test/browser_perf-options-show-idle-blocks-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-show-idle-blocks-02.js
rename to devtools/client/performance/test/browser_perf-options-show-idle-blocks-02.js
diff --git a/browser/devtools/performance/test/browser_perf-options-show-platform-data-01.js b/devtools/client/performance/test/browser_perf-options-show-platform-data-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-show-platform-data-01.js
rename to devtools/client/performance/test/browser_perf-options-show-platform-data-01.js
diff --git a/browser/devtools/performance/test/browser_perf-options-show-platform-data-02.js b/devtools/client/performance/test/browser_perf-options-show-platform-data-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-options-show-platform-data-02.js
rename to devtools/client/performance/test/browser_perf-options-show-platform-data-02.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-render-01.js b/devtools/client/performance/test/browser_perf-overview-render-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-render-01.js
rename to devtools/client/performance/test/browser_perf-overview-render-01.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-render-02.js b/devtools/client/performance/test/browser_perf-overview-render-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-render-02.js
rename to devtools/client/performance/test/browser_perf-overview-render-02.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-render-03.js b/devtools/client/performance/test/browser_perf-overview-render-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-render-03.js
rename to devtools/client/performance/test/browser_perf-overview-render-03.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-render-04.js b/devtools/client/performance/test/browser_perf-overview-render-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-render-04.js
rename to devtools/client/performance/test/browser_perf-overview-render-04.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-selection-01.js b/devtools/client/performance/test/browser_perf-overview-selection-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-selection-01.js
rename to devtools/client/performance/test/browser_perf-overview-selection-01.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-selection-02.js b/devtools/client/performance/test/browser_perf-overview-selection-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-selection-02.js
rename to devtools/client/performance/test/browser_perf-overview-selection-02.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-selection-03.js b/devtools/client/performance/test/browser_perf-overview-selection-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-selection-03.js
rename to devtools/client/performance/test/browser_perf-overview-selection-03.js
diff --git a/browser/devtools/performance/test/browser_perf-overview-time-interval.js b/devtools/client/performance/test/browser_perf-overview-time-interval.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-overview-time-interval.js
rename to devtools/client/performance/test/browser_perf-overview-time-interval.js
diff --git a/browser/devtools/performance/test/browser_perf-range-changed-render.js b/devtools/client/performance/test/browser_perf-range-changed-render.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-range-changed-render.js
rename to devtools/client/performance/test/browser_perf-range-changed-render.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-notices-01.js b/devtools/client/performance/test/browser_perf-recording-notices-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-notices-01.js
rename to devtools/client/performance/test/browser_perf-recording-notices-01.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-notices-02.js b/devtools/client/performance/test/browser_perf-recording-notices-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-notices-02.js
rename to devtools/client/performance/test/browser_perf-recording-notices-02.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-notices-03.js b/devtools/client/performance/test/browser_perf-recording-notices-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-notices-03.js
rename to devtools/client/performance/test/browser_perf-recording-notices-03.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-notices-04.js b/devtools/client/performance/test/browser_perf-recording-notices-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-notices-04.js
rename to devtools/client/performance/test/browser_perf-recording-notices-04.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-notices-05.js b/devtools/client/performance/test/browser_perf-recording-notices-05.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-notices-05.js
rename to devtools/client/performance/test/browser_perf-recording-notices-05.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-selected-01.js b/devtools/client/performance/test/browser_perf-recording-selected-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-selected-01.js
rename to devtools/client/performance/test/browser_perf-recording-selected-01.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-selected-02.js b/devtools/client/performance/test/browser_perf-recording-selected-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-selected-02.js
rename to devtools/client/performance/test/browser_perf-recording-selected-02.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-selected-03.js b/devtools/client/performance/test/browser_perf-recording-selected-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-selected-03.js
rename to devtools/client/performance/test/browser_perf-recording-selected-03.js
diff --git a/browser/devtools/performance/test/browser_perf-recording-selected-04.js b/devtools/client/performance/test/browser_perf-recording-selected-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recording-selected-04.js
rename to devtools/client/performance/test/browser_perf-recording-selected-04.js
diff --git a/browser/devtools/performance/test/browser_perf-recordings-io-01.js b/devtools/client/performance/test/browser_perf-recordings-io-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recordings-io-01.js
rename to devtools/client/performance/test/browser_perf-recordings-io-01.js
diff --git a/browser/devtools/performance/test/browser_perf-recordings-io-02.js b/devtools/client/performance/test/browser_perf-recordings-io-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recordings-io-02.js
rename to devtools/client/performance/test/browser_perf-recordings-io-02.js
diff --git a/browser/devtools/performance/test/browser_perf-recordings-io-03.js b/devtools/client/performance/test/browser_perf-recordings-io-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recordings-io-03.js
rename to devtools/client/performance/test/browser_perf-recordings-io-03.js
diff --git a/browser/devtools/performance/test/browser_perf-recordings-io-04.js b/devtools/client/performance/test/browser_perf-recordings-io-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recordings-io-04.js
rename to devtools/client/performance/test/browser_perf-recordings-io-04.js
diff --git a/browser/devtools/performance/test/browser_perf-recordings-io-05.js b/devtools/client/performance/test/browser_perf-recordings-io-05.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recordings-io-05.js
rename to devtools/client/performance/test/browser_perf-recordings-io-05.js
diff --git a/browser/devtools/performance/test/browser_perf-recordings-io-06.js b/devtools/client/performance/test/browser_perf-recordings-io-06.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-recordings-io-06.js
rename to devtools/client/performance/test/browser_perf-recordings-io-06.js
diff --git a/browser/devtools/performance/test/browser_perf-refresh.js b/devtools/client/performance/test/browser_perf-refresh.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-refresh.js
rename to devtools/client/performance/test/browser_perf-refresh.js
diff --git a/browser/devtools/performance/test/browser_perf-states.js b/devtools/client/performance/test/browser_perf-states.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-states.js
rename to devtools/client/performance/test/browser_perf-states.js
diff --git a/browser/devtools/performance/test/browser_perf-telemetry.js b/devtools/client/performance/test/browser_perf-telemetry.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-telemetry.js
rename to devtools/client/performance/test/browser_perf-telemetry.js
diff --git a/browser/devtools/performance/test/browser_perf-theme-toggle-01.js b/devtools/client/performance/test/browser_perf-theme-toggle-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-theme-toggle-01.js
rename to devtools/client/performance/test/browser_perf-theme-toggle-01.js
diff --git a/browser/devtools/performance/test/browser_perf-ui-recording.js b/devtools/client/performance/test/browser_perf-ui-recording.js
similarity index 100%
rename from browser/devtools/performance/test/browser_perf-ui-recording.js
rename to devtools/client/performance/test/browser_perf-ui-recording.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-abstract-01.js b/devtools/client/performance/test/browser_profiler_tree-abstract-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-abstract-01.js
rename to devtools/client/performance/test/browser_profiler_tree-abstract-01.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-abstract-02.js b/devtools/client/performance/test/browser_profiler_tree-abstract-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-abstract-02.js
rename to devtools/client/performance/test/browser_profiler_tree-abstract-02.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-abstract-03.js b/devtools/client/performance/test/browser_profiler_tree-abstract-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-abstract-03.js
rename to devtools/client/performance/test/browser_profiler_tree-abstract-03.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-abstract-04.js b/devtools/client/performance/test/browser_profiler_tree-abstract-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-abstract-04.js
rename to devtools/client/performance/test/browser_profiler_tree-abstract-04.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-01.js b/devtools/client/performance/test/browser_profiler_tree-view-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-01.js
rename to devtools/client/performance/test/browser_profiler_tree-view-01.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-02.js b/devtools/client/performance/test/browser_profiler_tree-view-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-02.js
rename to devtools/client/performance/test/browser_profiler_tree-view-02.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-03.js b/devtools/client/performance/test/browser_profiler_tree-view-03.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-03.js
rename to devtools/client/performance/test/browser_profiler_tree-view-03.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-04.js b/devtools/client/performance/test/browser_profiler_tree-view-04.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-04.js
rename to devtools/client/performance/test/browser_profiler_tree-view-04.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-05.js b/devtools/client/performance/test/browser_profiler_tree-view-05.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-05.js
rename to devtools/client/performance/test/browser_profiler_tree-view-05.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-06.js b/devtools/client/performance/test/browser_profiler_tree-view-06.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-06.js
rename to devtools/client/performance/test/browser_profiler_tree-view-06.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-07.js b/devtools/client/performance/test/browser_profiler_tree-view-07.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-07.js
rename to devtools/client/performance/test/browser_profiler_tree-view-07.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-08.js b/devtools/client/performance/test/browser_profiler_tree-view-08.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-08.js
rename to devtools/client/performance/test/browser_profiler_tree-view-08.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-09.js b/devtools/client/performance/test/browser_profiler_tree-view-09.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-09.js
rename to devtools/client/performance/test/browser_profiler_tree-view-09.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-10.js b/devtools/client/performance/test/browser_profiler_tree-view-10.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-10.js
rename to devtools/client/performance/test/browser_profiler_tree-view-10.js
diff --git a/browser/devtools/performance/test/browser_profiler_tree-view-11.js b/devtools/client/performance/test/browser_profiler_tree-view-11.js
similarity index 100%
rename from browser/devtools/performance/test/browser_profiler_tree-view-11.js
rename to devtools/client/performance/test/browser_profiler_tree-view-11.js
diff --git a/browser/devtools/performance/test/browser_timeline-filters-01.js b/devtools/client/performance/test/browser_timeline-filters-01.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline-filters-01.js
rename to devtools/client/performance/test/browser_timeline-filters-01.js
diff --git a/browser/devtools/performance/test/browser_timeline-filters-02.js b/devtools/client/performance/test/browser_timeline-filters-02.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline-filters-02.js
rename to devtools/client/performance/test/browser_timeline-filters-02.js
diff --git a/browser/devtools/performance/test/browser_timeline-waterfall-background.js b/devtools/client/performance/test/browser_timeline-waterfall-background.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline-waterfall-background.js
rename to devtools/client/performance/test/browser_timeline-waterfall-background.js
diff --git a/browser/devtools/performance/test/browser_timeline-waterfall-generic.js b/devtools/client/performance/test/browser_timeline-waterfall-generic.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline-waterfall-generic.js
rename to devtools/client/performance/test/browser_timeline-waterfall-generic.js
diff --git a/browser/devtools/performance/test/browser_timeline-waterfall-rerender.js b/devtools/client/performance/test/browser_timeline-waterfall-rerender.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline-waterfall-rerender.js
rename to devtools/client/performance/test/browser_timeline-waterfall-rerender.js
diff --git a/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js b/devtools/client/performance/test/browser_timeline-waterfall-sidebar.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
rename to devtools/client/performance/test/browser_timeline-waterfall-sidebar.js
diff --git a/browser/devtools/performance/test/doc_allocs.html b/devtools/client/performance/test/doc_allocs.html
similarity index 100%
rename from browser/devtools/performance/test/doc_allocs.html
rename to devtools/client/performance/test/doc_allocs.html
diff --git a/browser/devtools/performance/test/doc_innerHTML.html b/devtools/client/performance/test/doc_innerHTML.html
similarity index 100%
rename from browser/devtools/performance/test/doc_innerHTML.html
rename to devtools/client/performance/test/doc_innerHTML.html
diff --git a/browser/devtools/performance/test/doc_markers.html b/devtools/client/performance/test/doc_markers.html
similarity index 100%
rename from browser/devtools/performance/test/doc_markers.html
rename to devtools/client/performance/test/doc_markers.html
diff --git a/browser/devtools/performance/test/doc_simple-test.html b/devtools/client/performance/test/doc_simple-test.html
similarity index 100%
rename from browser/devtools/performance/test/doc_simple-test.html
rename to devtools/client/performance/test/doc_simple-test.html
diff --git a/browser/devtools/performance/test/head.js b/devtools/client/performance/test/head.js
similarity index 100%
rename from browser/devtools/performance/test/head.js
rename to devtools/client/performance/test/head.js
diff --git a/browser/devtools/performance/test/unit/head.js b/devtools/client/performance/test/unit/head.js
similarity index 100%
rename from browser/devtools/performance/test/unit/head.js
rename to devtools/client/performance/test/unit/head.js
diff --git a/browser/devtools/performance/test/unit/test_frame-utils-01.js b/devtools/client/performance/test/unit/test_frame-utils-01.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_frame-utils-01.js
rename to devtools/client/performance/test/unit/test_frame-utils-01.js
diff --git a/browser/devtools/performance/test/unit/test_frame-utils-02.js b/devtools/client/performance/test/unit/test_frame-utils-02.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_frame-utils-02.js
rename to devtools/client/performance/test/unit/test_frame-utils-02.js
diff --git a/browser/devtools/performance/test/unit/test_jit-graph-data.js b/devtools/client/performance/test/unit/test_jit-graph-data.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_jit-graph-data.js
rename to devtools/client/performance/test/unit/test_jit-graph-data.js
diff --git a/browser/devtools/performance/test/unit/test_jit-model-01.js b/devtools/client/performance/test/unit/test_jit-model-01.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_jit-model-01.js
rename to devtools/client/performance/test/unit/test_jit-model-01.js
diff --git a/browser/devtools/performance/test/unit/test_jit-model-02.js b/devtools/client/performance/test/unit/test_jit-model-02.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_jit-model-02.js
rename to devtools/client/performance/test/unit/test_jit-model-02.js
diff --git a/browser/devtools/performance/test/unit/test_marker-blueprint.js b/devtools/client/performance/test/unit/test_marker-blueprint.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_marker-blueprint.js
rename to devtools/client/performance/test/unit/test_marker-blueprint.js
diff --git a/browser/devtools/performance/test/unit/test_marker-utils.js b/devtools/client/performance/test/unit/test_marker-utils.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_marker-utils.js
rename to devtools/client/performance/test/unit/test_marker-utils.js
diff --git a/browser/devtools/performance/test/unit/test_perf-utils-allocations-to-samples.js b/devtools/client/performance/test/unit/test_perf-utils-allocations-to-samples.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_perf-utils-allocations-to-samples.js
rename to devtools/client/performance/test/unit/test_perf-utils-allocations-to-samples.js
diff --git a/browser/devtools/performance/test/unit/test_profiler-categories.js b/devtools/client/performance/test/unit/test_profiler-categories.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_profiler-categories.js
rename to devtools/client/performance/test/unit/test_profiler-categories.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-01.js b/devtools/client/performance/test/unit/test_tree-model-01.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-01.js
rename to devtools/client/performance/test/unit/test_tree-model-01.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-02.js b/devtools/client/performance/test/unit/test_tree-model-02.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-02.js
rename to devtools/client/performance/test/unit/test_tree-model-02.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-03.js b/devtools/client/performance/test/unit/test_tree-model-03.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-03.js
rename to devtools/client/performance/test/unit/test_tree-model-03.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-04.js b/devtools/client/performance/test/unit/test_tree-model-04.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-04.js
rename to devtools/client/performance/test/unit/test_tree-model-04.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-05.js b/devtools/client/performance/test/unit/test_tree-model-05.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-05.js
rename to devtools/client/performance/test/unit/test_tree-model-05.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-06.js b/devtools/client/performance/test/unit/test_tree-model-06.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-06.js
rename to devtools/client/performance/test/unit/test_tree-model-06.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-07.js b/devtools/client/performance/test/unit/test_tree-model-07.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-07.js
rename to devtools/client/performance/test/unit/test_tree-model-07.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-08.js b/devtools/client/performance/test/unit/test_tree-model-08.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-08.js
rename to devtools/client/performance/test/unit/test_tree-model-08.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-09.js b/devtools/client/performance/test/unit/test_tree-model-09.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-09.js
rename to devtools/client/performance/test/unit/test_tree-model-09.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-10.js b/devtools/client/performance/test/unit/test_tree-model-10.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-10.js
rename to devtools/client/performance/test/unit/test_tree-model-10.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-11.js b/devtools/client/performance/test/unit/test_tree-model-11.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-11.js
rename to devtools/client/performance/test/unit/test_tree-model-11.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-12.js b/devtools/client/performance/test/unit/test_tree-model-12.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-12.js
rename to devtools/client/performance/test/unit/test_tree-model-12.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-13.js b/devtools/client/performance/test/unit/test_tree-model-13.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-13.js
rename to devtools/client/performance/test/unit/test_tree-model-13.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-allocations-01.js b/devtools/client/performance/test/unit/test_tree-model-allocations-01.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-allocations-01.js
rename to devtools/client/performance/test/unit/test_tree-model-allocations-01.js
diff --git a/browser/devtools/performance/test/unit/test_tree-model-allocations-02.js b/devtools/client/performance/test/unit/test_tree-model-allocations-02.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_tree-model-allocations-02.js
rename to devtools/client/performance/test/unit/test_tree-model-allocations-02.js
diff --git a/browser/devtools/performance/test/unit/test_waterfall-utils-collapse-01.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-01.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_waterfall-utils-collapse-01.js
rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-01.js
diff --git a/browser/devtools/performance/test/unit/test_waterfall-utils-collapse-02.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-02.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_waterfall-utils-collapse-02.js
rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-02.js
diff --git a/browser/devtools/performance/test/unit/test_waterfall-utils-collapse-03.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-03.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_waterfall-utils-collapse-03.js
rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-03.js
diff --git a/browser/devtools/performance/test/unit/test_waterfall-utils-collapse-04.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-04.js
similarity index 100%
rename from browser/devtools/performance/test/unit/test_waterfall-utils-collapse-04.js
rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-04.js
diff --git a/browser/devtools/performance/test/unit/xpcshell.ini b/devtools/client/performance/test/unit/xpcshell.ini
similarity index 100%
rename from browser/devtools/performance/test/unit/xpcshell.ini
rename to devtools/client/performance/test/unit/xpcshell.ini
diff --git a/browser/devtools/performance/views/details-abstract-subview.js b/devtools/client/performance/views/details-abstract-subview.js
similarity index 100%
rename from browser/devtools/performance/views/details-abstract-subview.js
rename to devtools/client/performance/views/details-abstract-subview.js
diff --git a/browser/devtools/performance/views/details-js-call-tree.js b/devtools/client/performance/views/details-js-call-tree.js
similarity index 100%
rename from browser/devtools/performance/views/details-js-call-tree.js
rename to devtools/client/performance/views/details-js-call-tree.js
diff --git a/browser/devtools/performance/views/details-js-flamegraph.js b/devtools/client/performance/views/details-js-flamegraph.js
similarity index 100%
rename from browser/devtools/performance/views/details-js-flamegraph.js
rename to devtools/client/performance/views/details-js-flamegraph.js
diff --git a/browser/devtools/performance/views/details-memory-call-tree.js b/devtools/client/performance/views/details-memory-call-tree.js
similarity index 100%
rename from browser/devtools/performance/views/details-memory-call-tree.js
rename to devtools/client/performance/views/details-memory-call-tree.js
diff --git a/browser/devtools/performance/views/details-memory-flamegraph.js b/devtools/client/performance/views/details-memory-flamegraph.js
similarity index 100%
rename from browser/devtools/performance/views/details-memory-flamegraph.js
rename to devtools/client/performance/views/details-memory-flamegraph.js
diff --git a/browser/devtools/performance/views/details-waterfall.js b/devtools/client/performance/views/details-waterfall.js
similarity index 100%
rename from browser/devtools/performance/views/details-waterfall.js
rename to devtools/client/performance/views/details-waterfall.js
diff --git a/browser/devtools/performance/views/details.js b/devtools/client/performance/views/details.js
similarity index 100%
rename from browser/devtools/performance/views/details.js
rename to devtools/client/performance/views/details.js
diff --git a/browser/devtools/performance/views/optimizations-list.js b/devtools/client/performance/views/optimizations-list.js
similarity index 100%
rename from browser/devtools/performance/views/optimizations-list.js
rename to devtools/client/performance/views/optimizations-list.js
diff --git a/browser/devtools/performance/views/overview.js b/devtools/client/performance/views/overview.js
similarity index 100%
rename from browser/devtools/performance/views/overview.js
rename to devtools/client/performance/views/overview.js
diff --git a/browser/devtools/performance/views/recordings.js b/devtools/client/performance/views/recordings.js
similarity index 100%
rename from browser/devtools/performance/views/recordings.js
rename to devtools/client/performance/views/recordings.js
diff --git a/browser/devtools/performance/views/toolbar.js b/devtools/client/performance/views/toolbar.js
similarity index 100%
rename from browser/devtools/performance/views/toolbar.js
rename to devtools/client/performance/views/toolbar.js
diff --git a/browser/devtools/projecteditor/chrome/content/projecteditor-loader.js b/devtools/client/projecteditor/chrome/content/projecteditor-loader.js
similarity index 100%
rename from browser/devtools/projecteditor/chrome/content/projecteditor-loader.js
rename to devtools/client/projecteditor/chrome/content/projecteditor-loader.js
diff --git a/browser/devtools/projecteditor/chrome/content/projecteditor-loader.xul b/devtools/client/projecteditor/chrome/content/projecteditor-loader.xul
similarity index 100%
rename from browser/devtools/projecteditor/chrome/content/projecteditor-loader.xul
rename to devtools/client/projecteditor/chrome/content/projecteditor-loader.xul
diff --git a/browser/devtools/projecteditor/chrome/content/projecteditor-test.xul b/devtools/client/projecteditor/chrome/content/projecteditor-test.xul
similarity index 100%
rename from browser/devtools/projecteditor/chrome/content/projecteditor-test.xul
rename to devtools/client/projecteditor/chrome/content/projecteditor-test.xul
diff --git a/browser/devtools/projecteditor/chrome/content/projecteditor.xul b/devtools/client/projecteditor/chrome/content/projecteditor.xul
similarity index 100%
rename from browser/devtools/projecteditor/chrome/content/projecteditor.xul
rename to devtools/client/projecteditor/chrome/content/projecteditor.xul
diff --git a/browser/devtools/projecteditor/lib/editors.js b/devtools/client/projecteditor/lib/editors.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/editors.js
rename to devtools/client/projecteditor/lib/editors.js
diff --git a/browser/devtools/projecteditor/lib/helpers/event.js b/devtools/client/projecteditor/lib/helpers/event.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/helpers/event.js
rename to devtools/client/projecteditor/lib/helpers/event.js
diff --git a/browser/devtools/projecteditor/lib/helpers/file-picker.js b/devtools/client/projecteditor/lib/helpers/file-picker.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/helpers/file-picker.js
rename to devtools/client/projecteditor/lib/helpers/file-picker.js
diff --git a/browser/devtools/projecteditor/lib/helpers/l10n.js b/devtools/client/projecteditor/lib/helpers/l10n.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/helpers/l10n.js
rename to devtools/client/projecteditor/lib/helpers/l10n.js
diff --git a/browser/devtools/projecteditor/lib/helpers/prompts.js b/devtools/client/projecteditor/lib/helpers/prompts.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/helpers/prompts.js
rename to devtools/client/projecteditor/lib/helpers/prompts.js
diff --git a/browser/devtools/projecteditor/lib/helpers/readdir.js b/devtools/client/projecteditor/lib/helpers/readdir.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/helpers/readdir.js
rename to devtools/client/projecteditor/lib/helpers/readdir.js
diff --git a/browser/devtools/projecteditor/lib/plugins/app-manager/app-project-editor.js b/devtools/client/projecteditor/lib/plugins/app-manager/app-project-editor.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/app-manager/app-project-editor.js
rename to devtools/client/projecteditor/lib/plugins/app-manager/app-project-editor.js
diff --git a/browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js b/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js
rename to devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
diff --git a/browser/devtools/projecteditor/lib/plugins/core.js b/devtools/client/projecteditor/lib/plugins/core.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/core.js
rename to devtools/client/projecteditor/lib/plugins/core.js
diff --git a/browser/devtools/projecteditor/lib/plugins/delete/delete.js b/devtools/client/projecteditor/lib/plugins/delete/delete.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/delete/delete.js
rename to devtools/client/projecteditor/lib/plugins/delete/delete.js
diff --git a/browser/devtools/projecteditor/lib/plugins/dirty/dirty.js b/devtools/client/projecteditor/lib/plugins/dirty/dirty.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/dirty/dirty.js
rename to devtools/client/projecteditor/lib/plugins/dirty/dirty.js
diff --git a/browser/devtools/projecteditor/lib/plugins/image-view/image-editor.js b/devtools/client/projecteditor/lib/plugins/image-view/image-editor.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/image-view/image-editor.js
rename to devtools/client/projecteditor/lib/plugins/image-view/image-editor.js
diff --git a/browser/devtools/projecteditor/lib/plugins/image-view/plugin.js b/devtools/client/projecteditor/lib/plugins/image-view/plugin.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/image-view/plugin.js
rename to devtools/client/projecteditor/lib/plugins/image-view/plugin.js
diff --git a/browser/devtools/projecteditor/lib/plugins/logging/logging.js b/devtools/client/projecteditor/lib/plugins/logging/logging.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/logging/logging.js
rename to devtools/client/projecteditor/lib/plugins/logging/logging.js
diff --git a/browser/devtools/projecteditor/lib/plugins/new/new.js b/devtools/client/projecteditor/lib/plugins/new/new.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/new/new.js
rename to devtools/client/projecteditor/lib/plugins/new/new.js
diff --git a/browser/devtools/projecteditor/lib/plugins/rename/rename.js b/devtools/client/projecteditor/lib/plugins/rename/rename.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/rename/rename.js
rename to devtools/client/projecteditor/lib/plugins/rename/rename.js
diff --git a/browser/devtools/projecteditor/lib/plugins/save/save.js b/devtools/client/projecteditor/lib/plugins/save/save.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/save/save.js
rename to devtools/client/projecteditor/lib/plugins/save/save.js
diff --git a/browser/devtools/projecteditor/lib/plugins/status-bar/plugin.js b/devtools/client/projecteditor/lib/plugins/status-bar/plugin.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/plugins/status-bar/plugin.js
rename to devtools/client/projecteditor/lib/plugins/status-bar/plugin.js
diff --git a/browser/devtools/projecteditor/lib/project.js b/devtools/client/projecteditor/lib/project.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/project.js
rename to devtools/client/projecteditor/lib/project.js
diff --git a/browser/devtools/projecteditor/lib/projecteditor.js b/devtools/client/projecteditor/lib/projecteditor.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/projecteditor.js
rename to devtools/client/projecteditor/lib/projecteditor.js
diff --git a/browser/devtools/projecteditor/lib/shells.js b/devtools/client/projecteditor/lib/shells.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/shells.js
rename to devtools/client/projecteditor/lib/shells.js
diff --git a/browser/devtools/projecteditor/lib/stores/base.js b/devtools/client/projecteditor/lib/stores/base.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/stores/base.js
rename to devtools/client/projecteditor/lib/stores/base.js
diff --git a/browser/devtools/projecteditor/lib/stores/local.js b/devtools/client/projecteditor/lib/stores/local.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/stores/local.js
rename to devtools/client/projecteditor/lib/stores/local.js
diff --git a/browser/devtools/projecteditor/lib/stores/resource.js b/devtools/client/projecteditor/lib/stores/resource.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/stores/resource.js
rename to devtools/client/projecteditor/lib/stores/resource.js
diff --git a/browser/devtools/projecteditor/lib/tree.js b/devtools/client/projecteditor/lib/tree.js
similarity index 100%
rename from browser/devtools/projecteditor/lib/tree.js
rename to devtools/client/projecteditor/lib/tree.js
diff --git a/browser/devtools/projecteditor/moz.build b/devtools/client/projecteditor/moz.build
similarity index 100%
rename from browser/devtools/projecteditor/moz.build
rename to devtools/client/projecteditor/moz.build
diff --git a/browser/devtools/projecteditor/test/.eslintrc b/devtools/client/projecteditor/test/.eslintrc
similarity index 100%
rename from browser/devtools/projecteditor/test/.eslintrc
rename to devtools/client/projecteditor/test/.eslintrc
diff --git a/browser/devtools/projecteditor/test/browser.ini b/devtools/client/projecteditor/test/browser.ini
similarity index 100%
rename from browser/devtools/projecteditor/test/browser.ini
rename to devtools/client/projecteditor/test/browser.ini
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_app_options.js b/devtools/client/projecteditor/test/browser_projecteditor_app_options.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_app_options.js
rename to devtools/client/projecteditor/test/browser_projecteditor_app_options.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_confirm_unsaved.js b/devtools/client/projecteditor/test/browser_projecteditor_confirm_unsaved.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_confirm_unsaved.js
rename to devtools/client/projecteditor/test/browser_projecteditor_confirm_unsaved.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_contextmenu_01.js b/devtools/client/projecteditor/test/browser_projecteditor_contextmenu_01.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_contextmenu_01.js
rename to devtools/client/projecteditor/test/browser_projecteditor_contextmenu_01.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_contextmenu_02.js b/devtools/client/projecteditor/test/browser_projecteditor_contextmenu_02.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_contextmenu_02.js
rename to devtools/client/projecteditor/test/browser_projecteditor_contextmenu_02.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_delete_file.js b/devtools/client/projecteditor/test/browser_projecteditor_delete_file.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_delete_file.js
rename to devtools/client/projecteditor/test/browser_projecteditor_delete_file.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js b/devtools/client/projecteditor/test/browser_projecteditor_editing_01.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js
rename to devtools/client/projecteditor/test/browser_projecteditor_editing_01.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_editors_image.js b/devtools/client/projecteditor/test/browser_projecteditor_editors_image.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_editors_image.js
rename to devtools/client/projecteditor/test/browser_projecteditor_editors_image.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_external_change.js b/devtools/client/projecteditor/test/browser_projecteditor_external_change.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_external_change.js
rename to devtools/client/projecteditor/test/browser_projecteditor_external_change.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_immediate_destroy.js b/devtools/client/projecteditor/test/browser_projecteditor_immediate_destroy.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_immediate_destroy.js
rename to devtools/client/projecteditor/test/browser_projecteditor_immediate_destroy.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_init.js b/devtools/client/projecteditor/test/browser_projecteditor_init.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_init.js
rename to devtools/client/projecteditor/test/browser_projecteditor_init.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_menubar_01.js b/devtools/client/projecteditor/test/browser_projecteditor_menubar_01.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_menubar_01.js
rename to devtools/client/projecteditor/test/browser_projecteditor_menubar_01.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_menubar_02.js b/devtools/client/projecteditor/test/browser_projecteditor_menubar_02.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_menubar_02.js
rename to devtools/client/projecteditor/test/browser_projecteditor_menubar_02.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_new_file.js b/devtools/client/projecteditor/test/browser_projecteditor_new_file.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_new_file.js
rename to devtools/client/projecteditor/test/browser_projecteditor_new_file.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js b/devtools/client/projecteditor/test/browser_projecteditor_rename_file.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js
rename to devtools/client/projecteditor/test/browser_projecteditor_rename_file.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_stores.js b/devtools/client/projecteditor/test/browser_projecteditor_stores.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_stores.js
rename to devtools/client/projecteditor/test/browser_projecteditor_stores.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js b/devtools/client/projecteditor/test/browser_projecteditor_tree_selection_01.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js
rename to devtools/client/projecteditor/test/browser_projecteditor_tree_selection_01.js
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_02.js b/devtools/client/projecteditor/test/browser_projecteditor_tree_selection_02.js
similarity index 100%
rename from browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_02.js
rename to devtools/client/projecteditor/test/browser_projecteditor_tree_selection_02.js
diff --git a/browser/devtools/projecteditor/test/head.js b/devtools/client/projecteditor/test/head.js
similarity index 100%
rename from browser/devtools/projecteditor/test/head.js
rename to devtools/client/projecteditor/test/head.js
diff --git a/browser/devtools/projecteditor/test/helper_edits.js b/devtools/client/projecteditor/test/helper_edits.js
similarity index 100%
rename from browser/devtools/projecteditor/test/helper_edits.js
rename to devtools/client/projecteditor/test/helper_edits.js
diff --git a/browser/devtools/projecteditor/test/helper_homepage.html b/devtools/client/projecteditor/test/helper_homepage.html
similarity index 100%
rename from browser/devtools/projecteditor/test/helper_homepage.html
rename to devtools/client/projecteditor/test/helper_homepage.html
diff --git a/browser/devtools/promisedebugger/moz.build b/devtools/client/promisedebugger/moz.build
similarity index 100%
rename from browser/devtools/promisedebugger/moz.build
rename to devtools/client/promisedebugger/moz.build
diff --git a/browser/devtools/promisedebugger/promise-controller.js b/devtools/client/promisedebugger/promise-controller.js
similarity index 100%
rename from browser/devtools/promisedebugger/promise-controller.js
rename to devtools/client/promisedebugger/promise-controller.js
diff --git a/browser/devtools/promisedebugger/promise-debugger.xhtml b/devtools/client/promisedebugger/promise-debugger.xhtml
similarity index 100%
rename from browser/devtools/promisedebugger/promise-debugger.xhtml
rename to devtools/client/promisedebugger/promise-debugger.xhtml
diff --git a/browser/devtools/promisedebugger/promise-panel.js b/devtools/client/promisedebugger/promise-panel.js
similarity index 100%
rename from browser/devtools/promisedebugger/promise-panel.js
rename to devtools/client/promisedebugger/promise-panel.js
diff --git a/browser/devtools/promisedebugger/test/.eslintrc b/devtools/client/promisedebugger/test/.eslintrc
similarity index 100%
rename from browser/devtools/promisedebugger/test/.eslintrc
rename to devtools/client/promisedebugger/test/.eslintrc
diff --git a/browser/devtools/promisedebugger/test/browser.ini b/devtools/client/promisedebugger/test/browser.ini
similarity index 100%
rename from browser/devtools/promisedebugger/test/browser.ini
rename to devtools/client/promisedebugger/test/browser.ini
diff --git a/browser/devtools/promisedebugger/test/head.js b/devtools/client/promisedebugger/test/head.js
similarity index 100%
rename from browser/devtools/promisedebugger/test/head.js
rename to devtools/client/promisedebugger/test/head.js
diff --git a/browser/devtools/responsivedesign/moz.build b/devtools/client/responsivedesign/moz.build
similarity index 100%
rename from browser/devtools/responsivedesign/moz.build
rename to devtools/client/responsivedesign/moz.build
diff --git a/browser/devtools/responsivedesign/resize-commands.js b/devtools/client/responsivedesign/resize-commands.js
similarity index 100%
rename from browser/devtools/responsivedesign/resize-commands.js
rename to devtools/client/responsivedesign/resize-commands.js
diff --git a/browser/devtools/responsivedesign/responsivedesign-child.js b/devtools/client/responsivedesign/responsivedesign-child.js
similarity index 100%
rename from browser/devtools/responsivedesign/responsivedesign-child.js
rename to devtools/client/responsivedesign/responsivedesign-child.js
diff --git a/browser/devtools/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.jsm
similarity index 100%
rename from browser/devtools/responsivedesign/responsivedesign.jsm
rename to devtools/client/responsivedesign/responsivedesign.jsm
diff --git a/browser/devtools/responsivedesign/test/.eslintrc b/devtools/client/responsivedesign/test/.eslintrc
similarity index 100%
rename from browser/devtools/responsivedesign/test/.eslintrc
rename to devtools/client/responsivedesign/test/.eslintrc
diff --git a/browser/devtools/responsivedesign/test/browser.ini b/devtools/client/responsivedesign/test/browser.ini
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser.ini
rename to devtools/client/responsivedesign/test/browser.ini
diff --git a/browser/devtools/responsivedesign/test/browser_responsive_cmd.js b/devtools/client/responsivedesign/test/browser_responsive_cmd.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsive_cmd.js
rename to devtools/client/responsivedesign/test/browser_responsive_cmd.js
diff --git a/browser/devtools/responsivedesign/test/browser_responsive_devicewidth.js b/devtools/client/responsivedesign/test/browser_responsive_devicewidth.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsive_devicewidth.js
rename to devtools/client/responsivedesign/test/browser_responsive_devicewidth.js
diff --git a/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js b/devtools/client/responsivedesign/test/browser_responsivecomputedview.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
rename to devtools/client/responsivedesign/test/browser_responsivecomputedview.js
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveruleview.js b/devtools/client/responsivedesign/test/browser_responsiveruleview.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsiveruleview.js
rename to devtools/client/responsivedesign/test/browser_responsiveruleview.js
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveui.js b/devtools/client/responsivedesign/test/browser_responsiveui.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsiveui.js
rename to devtools/client/responsivedesign/test/browser_responsiveui.js
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveui_touch.js b/devtools/client/responsivedesign/test/browser_responsiveui_touch.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsiveui_touch.js
rename to devtools/client/responsivedesign/test/browser_responsiveui_touch.js
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveuiaddcustompreset.js b/devtools/client/responsivedesign/test/browser_responsiveuiaddcustompreset.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/browser_responsiveuiaddcustompreset.js
rename to devtools/client/responsivedesign/test/browser_responsiveuiaddcustompreset.js
diff --git a/browser/devtools/responsivedesign/test/head.js b/devtools/client/responsivedesign/test/head.js
similarity index 100%
rename from browser/devtools/responsivedesign/test/head.js
rename to devtools/client/responsivedesign/test/head.js
diff --git a/browser/devtools/responsivedesign/test/touch.html b/devtools/client/responsivedesign/test/touch.html
similarity index 100%
rename from browser/devtools/responsivedesign/test/touch.html
rename to devtools/client/responsivedesign/test/touch.html
diff --git a/browser/devtools/scratchpad/moz.build b/devtools/client/scratchpad/moz.build
similarity index 100%
rename from browser/devtools/scratchpad/moz.build
rename to devtools/client/scratchpad/moz.build
diff --git a/browser/devtools/scratchpad/scratchpad-commands.js b/devtools/client/scratchpad/scratchpad-commands.js
similarity index 100%
rename from browser/devtools/scratchpad/scratchpad-commands.js
rename to devtools/client/scratchpad/scratchpad-commands.js
diff --git a/browser/devtools/scratchpad/scratchpad-manager.jsm b/devtools/client/scratchpad/scratchpad-manager.jsm
similarity index 100%
rename from browser/devtools/scratchpad/scratchpad-manager.jsm
rename to devtools/client/scratchpad/scratchpad-manager.jsm
diff --git a/browser/devtools/scratchpad/scratchpad-panel.js b/devtools/client/scratchpad/scratchpad-panel.js
similarity index 100%
rename from browser/devtools/scratchpad/scratchpad-panel.js
rename to devtools/client/scratchpad/scratchpad-panel.js
diff --git a/browser/devtools/scratchpad/scratchpad.js b/devtools/client/scratchpad/scratchpad.js
similarity index 100%
rename from browser/devtools/scratchpad/scratchpad.js
rename to devtools/client/scratchpad/scratchpad.js
diff --git a/browser/devtools/scratchpad/scratchpad.xul b/devtools/client/scratchpad/scratchpad.xul
similarity index 100%
rename from browser/devtools/scratchpad/scratchpad.xul
rename to devtools/client/scratchpad/scratchpad.xul
diff --git a/browser/devtools/scratchpad/test/.eslintrc b/devtools/client/scratchpad/test/.eslintrc
similarity index 100%
rename from browser/devtools/scratchpad/test/.eslintrc
rename to devtools/client/scratchpad/test/.eslintrc
diff --git a/browser/devtools/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt b/devtools/client/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt
similarity index 100%
rename from browser/devtools/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt
rename to devtools/client/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt
diff --git a/browser/devtools/scratchpad/test/browser.ini b/devtools/client/scratchpad/test/browser.ini
similarity index 100%
rename from browser/devtools/scratchpad/test/browser.ini
rename to devtools/client/scratchpad/test/browser.ini
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_autocomplete.js b/devtools/client/scratchpad/test/browser_scratchpad_autocomplete.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_autocomplete.js
rename to devtools/client/scratchpad/test/browser_scratchpad_autocomplete.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_browser_last_window_closing.js b/devtools/client/scratchpad/test/browser_scratchpad_browser_last_window_closing.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_browser_last_window_closing.js
rename to devtools/client/scratchpad/test/browser_scratchpad_browser_last_window_closing.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_chrome_context_pref.js b/devtools/client/scratchpad/test/browser_scratchpad_chrome_context_pref.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_chrome_context_pref.js
rename to devtools/client/scratchpad/test/browser_scratchpad_chrome_context_pref.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_close_toolbox.js b/devtools/client/scratchpad/test/browser_scratchpad_close_toolbox.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_close_toolbox.js
rename to devtools/client/scratchpad/test/browser_scratchpad_close_toolbox.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js b/devtools/client/scratchpad/test/browser_scratchpad_confirm_close.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_confirm_close.js
rename to devtools/client/scratchpad/test/browser_scratchpad_confirm_close.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_contexts.js b/devtools/client/scratchpad/test/browser_scratchpad_contexts.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_contexts.js
rename to devtools/client/scratchpad/test/browser_scratchpad_contexts.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_disable_view_menu_items.js b/devtools/client/scratchpad/test/browser_scratchpad_disable_view_menu_items.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_disable_view_menu_items.js
rename to devtools/client/scratchpad/test/browser_scratchpad_disable_view_menu_items.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_display_non_error_exceptions.js b/devtools/client/scratchpad/test/browser_scratchpad_display_non_error_exceptions.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_display_non_error_exceptions.js
rename to devtools/client/scratchpad/test/browser_scratchpad_display_non_error_exceptions.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_display_outputs_errors.js b/devtools/client/scratchpad/test/browser_scratchpad_display_outputs_errors.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_display_outputs_errors.js
rename to devtools/client/scratchpad/test/browser_scratchpad_display_outputs_errors.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_edit_ui_updates.js b/devtools/client/scratchpad/test/browser_scratchpad_edit_ui_updates.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_edit_ui_updates.js
rename to devtools/client/scratchpad/test/browser_scratchpad_edit_ui_updates.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_eval_func.js b/devtools/client/scratchpad/test/browser_scratchpad_eval_func.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_eval_func.js
rename to devtools/client/scratchpad/test/browser_scratchpad_eval_func.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js b/devtools/client/scratchpad/test/browser_scratchpad_execute_print.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js
rename to devtools/client/scratchpad/test/browser_scratchpad_execute_print.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_falsy.js b/devtools/client/scratchpad/test/browser_scratchpad_falsy.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_falsy.js
rename to devtools/client/scratchpad/test/browser_scratchpad_falsy.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_files.js b/devtools/client/scratchpad/test/browser_scratchpad_files.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_files.js
rename to devtools/client/scratchpad/test/browser_scratchpad_files.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_goto_line_ui.js b/devtools/client/scratchpad/test/browser_scratchpad_goto_line_ui.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_goto_line_ui.js
rename to devtools/client/scratchpad/test/browser_scratchpad_goto_line_ui.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_help_key.js b/devtools/client/scratchpad/test/browser_scratchpad_help_key.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_help_key.js
rename to devtools/client/scratchpad/test/browser_scratchpad_help_key.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_initialization.js b/devtools/client/scratchpad/test/browser_scratchpad_initialization.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_initialization.js
rename to devtools/client/scratchpad/test/browser_scratchpad_initialization.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_inspect.js b/devtools/client/scratchpad/test/browser_scratchpad_inspect.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_inspect.js
rename to devtools/client/scratchpad/test/browser_scratchpad_inspect.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_inspect_primitives.js b/devtools/client/scratchpad/test/browser_scratchpad_inspect_primitives.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_inspect_primitives.js
rename to devtools/client/scratchpad/test/browser_scratchpad_inspect_primitives.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_long_string.js b/devtools/client/scratchpad/test/browser_scratchpad_long_string.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_long_string.js
rename to devtools/client/scratchpad/test/browser_scratchpad_long_string.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_modeline.js b/devtools/client/scratchpad/test/browser_scratchpad_modeline.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_modeline.js
rename to devtools/client/scratchpad/test/browser_scratchpad_modeline.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_open.js b/devtools/client/scratchpad/test/browser_scratchpad_open.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_open.js
rename to devtools/client/scratchpad/test/browser_scratchpad_open.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_open_error_console.js b/devtools/client/scratchpad/test/browser_scratchpad_open_error_console.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_open_error_console.js
rename to devtools/client/scratchpad/test/browser_scratchpad_open_error_console.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_pprint-02.js b/devtools/client/scratchpad/test/browser_scratchpad_pprint-02.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_pprint-02.js
rename to devtools/client/scratchpad/test/browser_scratchpad_pprint-02.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_pprint.js b/devtools/client/scratchpad/test/browser_scratchpad_pprint.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_pprint.js
rename to devtools/client/scratchpad/test/browser_scratchpad_pprint.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_pprint_error_goto_line.js b/devtools/client/scratchpad/test/browser_scratchpad_pprint_error_goto_line.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_pprint_error_goto_line.js
rename to devtools/client/scratchpad/test/browser_scratchpad_pprint_error_goto_line.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_recent_files.js b/devtools/client/scratchpad/test/browser_scratchpad_recent_files.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_recent_files.js
rename to devtools/client/scratchpad/test/browser_scratchpad_recent_files.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_reload_and_run.js b/devtools/client/scratchpad/test/browser_scratchpad_reload_and_run.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_reload_and_run.js
rename to devtools/client/scratchpad/test/browser_scratchpad_reload_and_run.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_remember_view_options.js b/devtools/client/scratchpad/test/browser_scratchpad_remember_view_options.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_remember_view_options.js
rename to devtools/client/scratchpad/test/browser_scratchpad_remember_view_options.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_reset_undo.js b/devtools/client/scratchpad/test/browser_scratchpad_reset_undo.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_reset_undo.js
rename to devtools/client/scratchpad/test/browser_scratchpad_reset_undo.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_restore.js b/devtools/client/scratchpad/test/browser_scratchpad_restore.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_restore.js
rename to devtools/client/scratchpad/test/browser_scratchpad_restore.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_revert_to_saved.js b/devtools/client/scratchpad/test/browser_scratchpad_revert_to_saved.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_revert_to_saved.js
rename to devtools/client/scratchpad/test/browser_scratchpad_revert_to_saved.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_run_error_goto_line.js b/devtools/client/scratchpad/test/browser_scratchpad_run_error_goto_line.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_run_error_goto_line.js
rename to devtools/client/scratchpad/test/browser_scratchpad_run_error_goto_line.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_tab.js b/devtools/client/scratchpad/test/browser_scratchpad_tab.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_tab.js
rename to devtools/client/scratchpad/test/browser_scratchpad_tab.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_tab_switch.js b/devtools/client/scratchpad/test/browser_scratchpad_tab_switch.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_tab_switch.js
rename to devtools/client/scratchpad/test/browser_scratchpad_tab_switch.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_throw_output.js b/devtools/client/scratchpad/test/browser_scratchpad_throw_output.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_throw_output.js
rename to devtools/client/scratchpad/test/browser_scratchpad_throw_output.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_ui.js b/devtools/client/scratchpad/test/browser_scratchpad_ui.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_ui.js
rename to devtools/client/scratchpad/test/browser_scratchpad_ui.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_unsaved.js b/devtools/client/scratchpad/test/browser_scratchpad_unsaved.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_unsaved.js
rename to devtools/client/scratchpad/test/browser_scratchpad_unsaved.js
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_wrong_window_focus.js b/devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js
similarity index 100%
rename from browser/devtools/scratchpad/test/browser_scratchpad_wrong_window_focus.js
rename to devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js
diff --git a/browser/devtools/scratchpad/test/head.js b/devtools/client/scratchpad/test/head.js
similarity index 100%
rename from browser/devtools/scratchpad/test/head.js
rename to devtools/client/scratchpad/test/head.js
diff --git a/browser/devtools/shadereditor/moz.build b/devtools/client/shadereditor/moz.build
similarity index 100%
rename from browser/devtools/shadereditor/moz.build
rename to devtools/client/shadereditor/moz.build
diff --git a/browser/devtools/shadereditor/panel.js b/devtools/client/shadereditor/panel.js
similarity index 100%
rename from browser/devtools/shadereditor/panel.js
rename to devtools/client/shadereditor/panel.js
diff --git a/browser/devtools/shadereditor/shadereditor.js b/devtools/client/shadereditor/shadereditor.js
similarity index 100%
rename from browser/devtools/shadereditor/shadereditor.js
rename to devtools/client/shadereditor/shadereditor.js
diff --git a/browser/devtools/shadereditor/shadereditor.xul b/devtools/client/shadereditor/shadereditor.xul
similarity index 100%
rename from browser/devtools/shadereditor/shadereditor.xul
rename to devtools/client/shadereditor/shadereditor.xul
diff --git a/browser/devtools/shadereditor/test/.eslintrc b/devtools/client/shadereditor/test/.eslintrc
similarity index 100%
rename from browser/devtools/shadereditor/test/.eslintrc
rename to devtools/client/shadereditor/test/.eslintrc
diff --git a/browser/devtools/shadereditor/test/browser.ini b/devtools/client/shadereditor/test/browser.ini
similarity index 100%
rename from browser/devtools/shadereditor/test/browser.ini
rename to devtools/client/shadereditor/test/browser.ini
diff --git a/browser/devtools/shadereditor/test/browser_se_aaa_run_first_leaktest.js b/devtools/client/shadereditor/test/browser_se_aaa_run_first_leaktest.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_aaa_run_first_leaktest.js
rename to devtools/client/shadereditor/test/browser_se_aaa_run_first_leaktest.js
diff --git a/browser/devtools/shadereditor/test/browser_se_bfcache.js b/devtools/client/shadereditor/test/browser_se_bfcache.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_bfcache.js
rename to devtools/client/shadereditor/test/browser_se_bfcache.js
diff --git a/browser/devtools/shadereditor/test/browser_se_editors-contents.js b/devtools/client/shadereditor/test/browser_se_editors-contents.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_editors-contents.js
rename to devtools/client/shadereditor/test/browser_se_editors-contents.js
diff --git a/browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js b/devtools/client/shadereditor/test/browser_se_editors-error-gutter.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js
rename to devtools/client/shadereditor/test/browser_se_editors-error-gutter.js
diff --git a/browser/devtools/shadereditor/test/browser_se_editors-error-tooltip.js b/devtools/client/shadereditor/test/browser_se_editors-error-tooltip.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_editors-error-tooltip.js
rename to devtools/client/shadereditor/test/browser_se_editors-error-tooltip.js
diff --git a/browser/devtools/shadereditor/test/browser_se_editors-lazy-init.js b/devtools/client/shadereditor/test/browser_se_editors-lazy-init.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_editors-lazy-init.js
rename to devtools/client/shadereditor/test/browser_se_editors-lazy-init.js
diff --git a/browser/devtools/shadereditor/test/browser_se_first-run.js b/devtools/client/shadereditor/test/browser_se_first-run.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_first-run.js
rename to devtools/client/shadereditor/test/browser_se_first-run.js
diff --git a/browser/devtools/shadereditor/test/browser_se_navigation.js b/devtools/client/shadereditor/test/browser_se_navigation.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_navigation.js
rename to devtools/client/shadereditor/test/browser_se_navigation.js
diff --git a/browser/devtools/shadereditor/test/browser_se_programs-blackbox-01.js b/devtools/client/shadereditor/test/browser_se_programs-blackbox-01.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_programs-blackbox-01.js
rename to devtools/client/shadereditor/test/browser_se_programs-blackbox-01.js
diff --git a/browser/devtools/shadereditor/test/browser_se_programs-blackbox-02.js b/devtools/client/shadereditor/test/browser_se_programs-blackbox-02.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_programs-blackbox-02.js
rename to devtools/client/shadereditor/test/browser_se_programs-blackbox-02.js
diff --git a/browser/devtools/shadereditor/test/browser_se_programs-cache.js b/devtools/client/shadereditor/test/browser_se_programs-cache.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_programs-cache.js
rename to devtools/client/shadereditor/test/browser_se_programs-cache.js
diff --git a/browser/devtools/shadereditor/test/browser_se_programs-highlight-01.js b/devtools/client/shadereditor/test/browser_se_programs-highlight-01.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_programs-highlight-01.js
rename to devtools/client/shadereditor/test/browser_se_programs-highlight-01.js
diff --git a/browser/devtools/shadereditor/test/browser_se_programs-highlight-02.js b/devtools/client/shadereditor/test/browser_se_programs-highlight-02.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_programs-highlight-02.js
rename to devtools/client/shadereditor/test/browser_se_programs-highlight-02.js
diff --git a/browser/devtools/shadereditor/test/browser_se_programs-list.js b/devtools/client/shadereditor/test/browser_se_programs-list.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_programs-list.js
rename to devtools/client/shadereditor/test/browser_se_programs-list.js
diff --git a/browser/devtools/shadereditor/test/browser_se_shaders-edit-01.js b/devtools/client/shadereditor/test/browser_se_shaders-edit-01.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_shaders-edit-01.js
rename to devtools/client/shadereditor/test/browser_se_shaders-edit-01.js
diff --git a/browser/devtools/shadereditor/test/browser_se_shaders-edit-02.js b/devtools/client/shadereditor/test/browser_se_shaders-edit-02.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_shaders-edit-02.js
rename to devtools/client/shadereditor/test/browser_se_shaders-edit-02.js
diff --git a/browser/devtools/shadereditor/test/browser_se_shaders-edit-03.js b/devtools/client/shadereditor/test/browser_se_shaders-edit-03.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_se_shaders-edit-03.js
rename to devtools/client/shadereditor/test/browser_se_shaders-edit-03.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-01.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-01.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-01.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-01.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-02.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-02.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-02.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-02.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-03.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-03.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-03.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-03.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-04.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-04.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-04.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-04.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-05.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-05.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-05.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-05.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-06.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-06.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-06.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-06.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-07.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-07.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-07.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-07.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-08.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-08.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-08.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-08.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-09.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-09.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-09.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-09.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-10.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-10.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-10.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-10.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-11.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-11.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-11.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-11.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-12.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-12.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-12.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-12.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-13.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-13.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-13.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-13.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-14.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-14.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-14.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-14.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-15.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-15.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-15.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-15.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-16.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-16.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-16.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-16.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-17.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-17.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-17.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-17.js
diff --git a/browser/devtools/shadereditor/test/browser_webgl-actor-test-18.js b/devtools/client/shadereditor/test/browser_webgl-actor-test-18.js
similarity index 100%
rename from browser/devtools/shadereditor/test/browser_webgl-actor-test-18.js
rename to devtools/client/shadereditor/test/browser_webgl-actor-test-18.js
diff --git a/browser/devtools/shadereditor/test/doc_blended-geometry.html b/devtools/client/shadereditor/test/doc_blended-geometry.html
similarity index 100%
rename from browser/devtools/shadereditor/test/doc_blended-geometry.html
rename to devtools/client/shadereditor/test/doc_blended-geometry.html
diff --git a/browser/devtools/shadereditor/test/doc_multiple-contexts.html b/devtools/client/shadereditor/test/doc_multiple-contexts.html
similarity index 100%
rename from browser/devtools/shadereditor/test/doc_multiple-contexts.html
rename to devtools/client/shadereditor/test/doc_multiple-contexts.html
diff --git a/browser/devtools/shadereditor/test/doc_overlapping-geometry.html b/devtools/client/shadereditor/test/doc_overlapping-geometry.html
similarity index 100%
rename from browser/devtools/shadereditor/test/doc_overlapping-geometry.html
rename to devtools/client/shadereditor/test/doc_overlapping-geometry.html
diff --git a/browser/devtools/shadereditor/test/doc_shader-order.html b/devtools/client/shadereditor/test/doc_shader-order.html
similarity index 100%
rename from browser/devtools/shadereditor/test/doc_shader-order.html
rename to devtools/client/shadereditor/test/doc_shader-order.html
diff --git a/browser/devtools/shadereditor/test/doc_simple-canvas.html b/devtools/client/shadereditor/test/doc_simple-canvas.html
similarity index 100%
rename from browser/devtools/shadereditor/test/doc_simple-canvas.html
rename to devtools/client/shadereditor/test/doc_simple-canvas.html
diff --git a/browser/devtools/shadereditor/test/head.js b/devtools/client/shadereditor/test/head.js
similarity index 100%
rename from browser/devtools/shadereditor/test/head.js
rename to devtools/client/shadereditor/test/head.js
diff --git a/browser/devtools/shared/AppCacheUtils.jsm b/devtools/client/shared/AppCacheUtils.jsm
similarity index 100%
rename from browser/devtools/shared/AppCacheUtils.jsm
rename to devtools/client/shared/AppCacheUtils.jsm
diff --git a/browser/devtools/shared/Curl.jsm b/devtools/client/shared/Curl.jsm
similarity index 100%
rename from browser/devtools/shared/Curl.jsm
rename to devtools/client/shared/Curl.jsm
diff --git a/browser/devtools/shared/DOMHelpers.jsm b/devtools/client/shared/DOMHelpers.jsm
similarity index 100%
rename from browser/devtools/shared/DOMHelpers.jsm
rename to devtools/client/shared/DOMHelpers.jsm
diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/devtools/client/shared/DeveloperToolbar.jsm
similarity index 100%
rename from browser/devtools/shared/DeveloperToolbar.jsm
rename to devtools/client/shared/DeveloperToolbar.jsm
diff --git a/browser/devtools/shared/Jsbeautify.jsm b/devtools/client/shared/Jsbeautify.jsm
similarity index 100%
rename from browser/devtools/shared/Jsbeautify.jsm
rename to devtools/client/shared/Jsbeautify.jsm
diff --git a/browser/devtools/shared/Parser.jsm b/devtools/client/shared/Parser.jsm
similarity index 100%
rename from browser/devtools/shared/Parser.jsm
rename to devtools/client/shared/Parser.jsm
diff --git a/browser/devtools/shared/SplitView.jsm b/devtools/client/shared/SplitView.jsm
similarity index 100%
rename from browser/devtools/shared/SplitView.jsm
rename to devtools/client/shared/SplitView.jsm
diff --git a/browser/devtools/shared/autocomplete-popup.js b/devtools/client/shared/autocomplete-popup.js
similarity index 100%
rename from browser/devtools/shared/autocomplete-popup.js
rename to devtools/client/shared/autocomplete-popup.js
diff --git a/browser/devtools/shared/browser-loader.js b/devtools/client/shared/browser-loader.js
similarity index 100%
rename from browser/devtools/shared/browser-loader.js
rename to devtools/client/shared/browser-loader.js
diff --git a/browser/devtools/shared/devices.js b/devtools/client/shared/devices.js
similarity index 100%
rename from browser/devtools/shared/devices.js
rename to devtools/client/shared/devices.js
diff --git a/browser/devtools/shared/doorhanger.js b/devtools/client/shared/doorhanger.js
similarity index 100%
rename from browser/devtools/shared/doorhanger.js
rename to devtools/client/shared/doorhanger.js
diff --git a/browser/devtools/shared/frame-script-utils.js b/devtools/client/shared/frame-script-utils.js
similarity index 100%
rename from browser/devtools/shared/frame-script-utils.js
rename to devtools/client/shared/frame-script-utils.js
diff --git a/browser/devtools/shared/getjson.js b/devtools/client/shared/getjson.js
similarity index 100%
rename from browser/devtools/shared/getjson.js
rename to devtools/client/shared/getjson.js
diff --git a/browser/devtools/shared/inplace-editor.js b/devtools/client/shared/inplace-editor.js
similarity index 100%
rename from browser/devtools/shared/inplace-editor.js
rename to devtools/client/shared/inplace-editor.js
diff --git a/browser/devtools/shared/moz.build b/devtools/client/shared/moz.build
similarity index 100%
rename from browser/devtools/shared/moz.build
rename to devtools/client/shared/moz.build
diff --git a/browser/devtools/shared/node-attribute-parser.js b/devtools/client/shared/node-attribute-parser.js
similarity index 100%
rename from browser/devtools/shared/node-attribute-parser.js
rename to devtools/client/shared/node-attribute-parser.js
diff --git a/browser/devtools/shared/observable-object.js b/devtools/client/shared/observable-object.js
similarity index 100%
rename from browser/devtools/shared/observable-object.js
rename to devtools/client/shared/observable-object.js
diff --git a/browser/devtools/shared/options-view.js b/devtools/client/shared/options-view.js
similarity index 100%
rename from browser/devtools/shared/options-view.js
rename to devtools/client/shared/options-view.js
diff --git a/browser/devtools/shared/poller.js b/devtools/client/shared/poller.js
similarity index 100%
rename from browser/devtools/shared/poller.js
rename to devtools/client/shared/poller.js
diff --git a/browser/devtools/shared/redux/create-store.js b/devtools/client/shared/redux/create-store.js
similarity index 100%
rename from browser/devtools/shared/redux/create-store.js
rename to devtools/client/shared/redux/create-store.js
diff --git a/browser/devtools/shared/redux/middleware/log.js b/devtools/client/shared/redux/middleware/log.js
similarity index 100%
rename from browser/devtools/shared/redux/middleware/log.js
rename to devtools/client/shared/redux/middleware/log.js
diff --git a/browser/devtools/shared/redux/middleware/thunk.js b/devtools/client/shared/redux/middleware/thunk.js
similarity index 100%
rename from browser/devtools/shared/redux/middleware/thunk.js
rename to devtools/client/shared/redux/middleware/thunk.js
diff --git a/browser/devtools/shared/redux/middleware/wait-service.js b/devtools/client/shared/redux/middleware/wait-service.js
similarity index 100%
rename from browser/devtools/shared/redux/middleware/wait-service.js
rename to devtools/client/shared/redux/middleware/wait-service.js
diff --git a/browser/devtools/shared/redux/moz.build b/devtools/client/shared/redux/moz.build
similarity index 100%
rename from browser/devtools/shared/redux/moz.build
rename to devtools/client/shared/redux/moz.build
diff --git a/browser/devtools/shared/redux/reducers.js b/devtools/client/shared/redux/reducers.js
similarity index 100%
rename from browser/devtools/shared/redux/reducers.js
rename to devtools/client/shared/redux/reducers.js
diff --git a/browser/devtools/shared/source-utils.js b/devtools/client/shared/source-utils.js
similarity index 100%
rename from browser/devtools/shared/source-utils.js
rename to devtools/client/shared/source-utils.js
diff --git a/browser/devtools/shared/splitview.css b/devtools/client/shared/splitview.css
similarity index 100%
rename from browser/devtools/shared/splitview.css
rename to devtools/client/shared/splitview.css
diff --git a/browser/devtools/shared/telemetry.js b/devtools/client/shared/telemetry.js
similarity index 100%
rename from browser/devtools/shared/telemetry.js
rename to devtools/client/shared/telemetry.js
diff --git a/browser/devtools/shared/test/.eslintrc b/devtools/client/shared/test/.eslintrc
similarity index 100%
rename from browser/devtools/shared/test/.eslintrc
rename to devtools/client/shared/test/.eslintrc
diff --git a/browser/devtools/shared/test/browser.ini b/devtools/client/shared/test/browser.ini
similarity index 100%
rename from browser/devtools/shared/test/browser.ini
rename to devtools/client/shared/test/browser.ini
diff --git a/browser/devtools/shared/test/browser_css_color.js b/devtools/client/shared/test/browser_css_color.js
similarity index 100%
rename from browser/devtools/shared/test/browser_css_color.js
rename to devtools/client/shared/test/browser_css_color.js
diff --git a/browser/devtools/shared/test/browser_cubic-bezier-01.js b/devtools/client/shared/test/browser_cubic-bezier-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_cubic-bezier-01.js
rename to devtools/client/shared/test/browser_cubic-bezier-01.js
diff --git a/browser/devtools/shared/test/browser_cubic-bezier-02.js b/devtools/client/shared/test/browser_cubic-bezier-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_cubic-bezier-02.js
rename to devtools/client/shared/test/browser_cubic-bezier-02.js
diff --git a/browser/devtools/shared/test/browser_cubic-bezier-03.js b/devtools/client/shared/test/browser_cubic-bezier-03.js
similarity index 100%
rename from browser/devtools/shared/test/browser_cubic-bezier-03.js
rename to devtools/client/shared/test/browser_cubic-bezier-03.js
diff --git a/browser/devtools/shared/test/browser_cubic-bezier-04.js b/devtools/client/shared/test/browser_cubic-bezier-04.js
similarity index 100%
rename from browser/devtools/shared/test/browser_cubic-bezier-04.js
rename to devtools/client/shared/test/browser_cubic-bezier-04.js
diff --git a/browser/devtools/shared/test/browser_cubic-bezier-05.js b/devtools/client/shared/test/browser_cubic-bezier-05.js
similarity index 100%
rename from browser/devtools/shared/test/browser_cubic-bezier-05.js
rename to devtools/client/shared/test/browser_cubic-bezier-05.js
diff --git a/browser/devtools/shared/test/browser_cubic-bezier-06.js b/devtools/client/shared/test/browser_cubic-bezier-06.js
similarity index 100%
rename from browser/devtools/shared/test/browser_cubic-bezier-06.js
rename to devtools/client/shared/test/browser_cubic-bezier-06.js
diff --git a/browser/devtools/shared/test/browser_devices.js b/devtools/client/shared/test/browser_devices.js
similarity index 100%
rename from browser/devtools/shared/test/browser_devices.js
rename to devtools/client/shared/test/browser_devices.js
diff --git a/browser/devtools/shared/test/browser_devices.json b/devtools/client/shared/test/browser_devices.json
similarity index 100%
rename from browser/devtools/shared/test/browser_devices.json
rename to devtools/client/shared/test/browser_devices.json
diff --git a/browser/devtools/shared/test/browser_filter-editor-01.js b/devtools/client/shared/test/browser_filter-editor-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-01.js
rename to devtools/client/shared/test/browser_filter-editor-01.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-02.js b/devtools/client/shared/test/browser_filter-editor-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-02.js
rename to devtools/client/shared/test/browser_filter-editor-02.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-03.js b/devtools/client/shared/test/browser_filter-editor-03.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-03.js
rename to devtools/client/shared/test/browser_filter-editor-03.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-04.js b/devtools/client/shared/test/browser_filter-editor-04.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-04.js
rename to devtools/client/shared/test/browser_filter-editor-04.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-05.js b/devtools/client/shared/test/browser_filter-editor-05.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-05.js
rename to devtools/client/shared/test/browser_filter-editor-05.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-06.js b/devtools/client/shared/test/browser_filter-editor-06.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-06.js
rename to devtools/client/shared/test/browser_filter-editor-06.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-07.js b/devtools/client/shared/test/browser_filter-editor-07.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-07.js
rename to devtools/client/shared/test/browser_filter-editor-07.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-08.js b/devtools/client/shared/test/browser_filter-editor-08.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-08.js
rename to devtools/client/shared/test/browser_filter-editor-08.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-09.js b/devtools/client/shared/test/browser_filter-editor-09.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-09.js
rename to devtools/client/shared/test/browser_filter-editor-09.js
diff --git a/browser/devtools/shared/test/browser_filter-editor-10.js b/devtools/client/shared/test/browser_filter-editor-10.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-editor-10.js
rename to devtools/client/shared/test/browser_filter-editor-10.js
diff --git a/browser/devtools/shared/test/browser_filter-presets-01.js b/devtools/client/shared/test/browser_filter-presets-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-presets-01.js
rename to devtools/client/shared/test/browser_filter-presets-01.js
diff --git a/browser/devtools/shared/test/browser_filter-presets-02.js b/devtools/client/shared/test/browser_filter-presets-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-presets-02.js
rename to devtools/client/shared/test/browser_filter-presets-02.js
diff --git a/browser/devtools/shared/test/browser_filter-presets-03.js b/devtools/client/shared/test/browser_filter-presets-03.js
similarity index 100%
rename from browser/devtools/shared/test/browser_filter-presets-03.js
rename to devtools/client/shared/test/browser_filter-presets-03.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-01.js b/devtools/client/shared/test/browser_flame-graph-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-01.js
rename to devtools/client/shared/test/browser_flame-graph-01.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-02.js b/devtools/client/shared/test/browser_flame-graph-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-02.js
rename to devtools/client/shared/test/browser_flame-graph-02.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-03a.js b/devtools/client/shared/test/browser_flame-graph-03a.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-03a.js
rename to devtools/client/shared/test/browser_flame-graph-03a.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-03b.js b/devtools/client/shared/test/browser_flame-graph-03b.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-03b.js
rename to devtools/client/shared/test/browser_flame-graph-03b.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-03c.js b/devtools/client/shared/test/browser_flame-graph-03c.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-03c.js
rename to devtools/client/shared/test/browser_flame-graph-03c.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-04.js b/devtools/client/shared/test/browser_flame-graph-04.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-04.js
rename to devtools/client/shared/test/browser_flame-graph-04.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-01.js b/devtools/client/shared/test/browser_flame-graph-utils-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-01.js
rename to devtools/client/shared/test/browser_flame-graph-utils-01.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-02.js b/devtools/client/shared/test/browser_flame-graph-utils-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-02.js
rename to devtools/client/shared/test/browser_flame-graph-utils-02.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-03.js b/devtools/client/shared/test/browser_flame-graph-utils-03.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-03.js
rename to devtools/client/shared/test/browser_flame-graph-utils-03.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-04.js b/devtools/client/shared/test/browser_flame-graph-utils-04.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-04.js
rename to devtools/client/shared/test/browser_flame-graph-utils-04.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-05.js b/devtools/client/shared/test/browser_flame-graph-utils-05.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-05.js
rename to devtools/client/shared/test/browser_flame-graph-utils-05.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-06.js b/devtools/client/shared/test/browser_flame-graph-utils-06.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-06.js
rename to devtools/client/shared/test/browser_flame-graph-utils-06.js
diff --git a/browser/devtools/shared/test/browser_flame-graph-utils-hash.js b/devtools/client/shared/test/browser_flame-graph-utils-hash.js
similarity index 100%
rename from browser/devtools/shared/test/browser_flame-graph-utils-hash.js
rename to devtools/client/shared/test/browser_flame-graph-utils-hash.js
diff --git a/browser/devtools/shared/test/browser_graphs-01.js b/devtools/client/shared/test/browser_graphs-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-01.js
rename to devtools/client/shared/test/browser_graphs-01.js
diff --git a/browser/devtools/shared/test/browser_graphs-02.js b/devtools/client/shared/test/browser_graphs-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-02.js
rename to devtools/client/shared/test/browser_graphs-02.js
diff --git a/browser/devtools/shared/test/browser_graphs-03.js b/devtools/client/shared/test/browser_graphs-03.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-03.js
rename to devtools/client/shared/test/browser_graphs-03.js
diff --git a/browser/devtools/shared/test/browser_graphs-04.js b/devtools/client/shared/test/browser_graphs-04.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-04.js
rename to devtools/client/shared/test/browser_graphs-04.js
diff --git a/browser/devtools/shared/test/browser_graphs-05.js b/devtools/client/shared/test/browser_graphs-05.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-05.js
rename to devtools/client/shared/test/browser_graphs-05.js
diff --git a/browser/devtools/shared/test/browser_graphs-06.js b/devtools/client/shared/test/browser_graphs-06.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-06.js
rename to devtools/client/shared/test/browser_graphs-06.js
diff --git a/browser/devtools/shared/test/browser_graphs-07a.js b/devtools/client/shared/test/browser_graphs-07a.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-07a.js
rename to devtools/client/shared/test/browser_graphs-07a.js
diff --git a/browser/devtools/shared/test/browser_graphs-07b.js b/devtools/client/shared/test/browser_graphs-07b.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-07b.js
rename to devtools/client/shared/test/browser_graphs-07b.js
diff --git a/browser/devtools/shared/test/browser_graphs-07c.js b/devtools/client/shared/test/browser_graphs-07c.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-07c.js
rename to devtools/client/shared/test/browser_graphs-07c.js
diff --git a/browser/devtools/shared/test/browser_graphs-07d.js b/devtools/client/shared/test/browser_graphs-07d.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-07d.js
rename to devtools/client/shared/test/browser_graphs-07d.js
diff --git a/browser/devtools/shared/test/browser_graphs-07e.js b/devtools/client/shared/test/browser_graphs-07e.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-07e.js
rename to devtools/client/shared/test/browser_graphs-07e.js
diff --git a/browser/devtools/shared/test/browser_graphs-08.js b/devtools/client/shared/test/browser_graphs-08.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-08.js
rename to devtools/client/shared/test/browser_graphs-08.js
diff --git a/browser/devtools/shared/test/browser_graphs-09a.js b/devtools/client/shared/test/browser_graphs-09a.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-09a.js
rename to devtools/client/shared/test/browser_graphs-09a.js
diff --git a/browser/devtools/shared/test/browser_graphs-09b.js b/devtools/client/shared/test/browser_graphs-09b.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-09b.js
rename to devtools/client/shared/test/browser_graphs-09b.js
diff --git a/browser/devtools/shared/test/browser_graphs-09c.js b/devtools/client/shared/test/browser_graphs-09c.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-09c.js
rename to devtools/client/shared/test/browser_graphs-09c.js
diff --git a/browser/devtools/shared/test/browser_graphs-09d.js b/devtools/client/shared/test/browser_graphs-09d.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-09d.js
rename to devtools/client/shared/test/browser_graphs-09d.js
diff --git a/browser/devtools/shared/test/browser_graphs-09e.js b/devtools/client/shared/test/browser_graphs-09e.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-09e.js
rename to devtools/client/shared/test/browser_graphs-09e.js
diff --git a/browser/devtools/shared/test/browser_graphs-09f.js b/devtools/client/shared/test/browser_graphs-09f.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-09f.js
rename to devtools/client/shared/test/browser_graphs-09f.js
diff --git a/browser/devtools/shared/test/browser_graphs-10a.js b/devtools/client/shared/test/browser_graphs-10a.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-10a.js
rename to devtools/client/shared/test/browser_graphs-10a.js
diff --git a/browser/devtools/shared/test/browser_graphs-10b.js b/devtools/client/shared/test/browser_graphs-10b.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-10b.js
rename to devtools/client/shared/test/browser_graphs-10b.js
diff --git a/browser/devtools/shared/test/browser_graphs-10c.js b/devtools/client/shared/test/browser_graphs-10c.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-10c.js
rename to devtools/client/shared/test/browser_graphs-10c.js
diff --git a/browser/devtools/shared/test/browser_graphs-11a.js b/devtools/client/shared/test/browser_graphs-11a.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-11a.js
rename to devtools/client/shared/test/browser_graphs-11a.js
diff --git a/browser/devtools/shared/test/browser_graphs-11b.js b/devtools/client/shared/test/browser_graphs-11b.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-11b.js
rename to devtools/client/shared/test/browser_graphs-11b.js
diff --git a/browser/devtools/shared/test/browser_graphs-12.js b/devtools/client/shared/test/browser_graphs-12.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-12.js
rename to devtools/client/shared/test/browser_graphs-12.js
diff --git a/browser/devtools/shared/test/browser_graphs-13.js b/devtools/client/shared/test/browser_graphs-13.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-13.js
rename to devtools/client/shared/test/browser_graphs-13.js
diff --git a/browser/devtools/shared/test/browser_graphs-14.js b/devtools/client/shared/test/browser_graphs-14.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-14.js
rename to devtools/client/shared/test/browser_graphs-14.js
diff --git a/browser/devtools/shared/test/browser_graphs-15.js b/devtools/client/shared/test/browser_graphs-15.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-15.js
rename to devtools/client/shared/test/browser_graphs-15.js
diff --git a/browser/devtools/shared/test/browser_graphs-16.js b/devtools/client/shared/test/browser_graphs-16.js
similarity index 100%
rename from browser/devtools/shared/test/browser_graphs-16.js
rename to devtools/client/shared/test/browser_graphs-16.js
diff --git a/browser/devtools/shared/test/browser_inplace-editor-01.js b/devtools/client/shared/test/browser_inplace-editor-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_inplace-editor-01.js
rename to devtools/client/shared/test/browser_inplace-editor-01.js
diff --git a/browser/devtools/shared/test/browser_inplace-editor-02.js b/devtools/client/shared/test/browser_inplace-editor-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_inplace-editor-02.js
rename to devtools/client/shared/test/browser_inplace-editor-02.js
diff --git a/browser/devtools/shared/test/browser_layoutHelpers-getBoxQuads.html b/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.html
similarity index 100%
rename from browser/devtools/shared/test/browser_layoutHelpers-getBoxQuads.html
rename to devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.html
diff --git a/browser/devtools/shared/test/browser_layoutHelpers-getBoxQuads.js b/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
similarity index 100%
rename from browser/devtools/shared/test/browser_layoutHelpers-getBoxQuads.js
rename to devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js
diff --git a/browser/devtools/shared/test/browser_layoutHelpers.html b/devtools/client/shared/test/browser_layoutHelpers.html
similarity index 100%
rename from browser/devtools/shared/test/browser_layoutHelpers.html
rename to devtools/client/shared/test/browser_layoutHelpers.html
diff --git a/browser/devtools/shared/test/browser_layoutHelpers.js b/devtools/client/shared/test/browser_layoutHelpers.js
similarity index 100%
rename from browser/devtools/shared/test/browser_layoutHelpers.js
rename to devtools/client/shared/test/browser_layoutHelpers.js
diff --git a/browser/devtools/shared/test/browser_mdn-docs-01.js b/devtools/client/shared/test/browser_mdn-docs-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_mdn-docs-01.js
rename to devtools/client/shared/test/browser_mdn-docs-01.js
diff --git a/browser/devtools/shared/test/browser_mdn-docs-02.js b/devtools/client/shared/test/browser_mdn-docs-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_mdn-docs-02.js
rename to devtools/client/shared/test/browser_mdn-docs-02.js
diff --git a/browser/devtools/shared/test/browser_mdn-docs-03.js b/devtools/client/shared/test/browser_mdn-docs-03.js
similarity index 100%
rename from browser/devtools/shared/test/browser_mdn-docs-03.js
rename to devtools/client/shared/test/browser_mdn-docs-03.js
diff --git a/browser/devtools/shared/test/browser_num-l10n.js b/devtools/client/shared/test/browser_num-l10n.js
similarity index 100%
rename from browser/devtools/shared/test/browser_num-l10n.js
rename to devtools/client/shared/test/browser_num-l10n.js
diff --git a/browser/devtools/shared/test/browser_observableobject.js b/devtools/client/shared/test/browser_observableobject.js
similarity index 100%
rename from browser/devtools/shared/test/browser_observableobject.js
rename to devtools/client/shared/test/browser_observableobject.js
diff --git a/browser/devtools/shared/test/browser_options-view-01.js b/devtools/client/shared/test/browser_options-view-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_options-view-01.js
rename to devtools/client/shared/test/browser_options-view-01.js
diff --git a/browser/devtools/shared/test/browser_outputparser.js b/devtools/client/shared/test/browser_outputparser.js
similarity index 100%
rename from browser/devtools/shared/test/browser_outputparser.js
rename to devtools/client/shared/test/browser_outputparser.js
diff --git a/browser/devtools/shared/test/browser_poller.js b/devtools/client/shared/test/browser_poller.js
similarity index 100%
rename from browser/devtools/shared/test/browser_poller.js
rename to devtools/client/shared/test/browser_poller.js
diff --git a/browser/devtools/shared/test/browser_prefs-01.js b/devtools/client/shared/test/browser_prefs-01.js
similarity index 100%
rename from browser/devtools/shared/test/browser_prefs-01.js
rename to devtools/client/shared/test/browser_prefs-01.js
diff --git a/browser/devtools/shared/test/browser_prefs-02.js b/devtools/client/shared/test/browser_prefs-02.js
similarity index 100%
rename from browser/devtools/shared/test/browser_prefs-02.js
rename to devtools/client/shared/test/browser_prefs-02.js
diff --git a/browser/devtools/shared/test/browser_spectrum.js b/devtools/client/shared/test/browser_spectrum.js
similarity index 100%
rename from browser/devtools/shared/test/browser_spectrum.js
rename to devtools/client/shared/test/browser_spectrum.js
diff --git a/browser/devtools/shared/test/browser_tableWidget_basic.js b/devtools/client/shared/test/browser_tableWidget_basic.js
similarity index 100%
rename from browser/devtools/shared/test/browser_tableWidget_basic.js
rename to devtools/client/shared/test/browser_tableWidget_basic.js
diff --git a/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js b/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
similarity index 100%
rename from browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js
rename to devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
diff --git a/browser/devtools/shared/test/browser_tableWidget_mouse_interaction.js b/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
similarity index 100%
rename from browser/devtools/shared/test/browser_tableWidget_mouse_interaction.js
rename to devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
diff --git a/browser/devtools/shared/test/browser_telemetry_button_eyedropper.js b/devtools/client/shared/test/browser_telemetry_button_eyedropper.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_button_eyedropper.js
rename to devtools/client/shared/test/browser_telemetry_button_eyedropper.js
diff --git a/browser/devtools/shared/test/browser_telemetry_button_paintflashing.js b/devtools/client/shared/test/browser_telemetry_button_paintflashing.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_button_paintflashing.js
rename to devtools/client/shared/test/browser_telemetry_button_paintflashing.js
diff --git a/browser/devtools/shared/test/browser_telemetry_button_responsive.js b/devtools/client/shared/test/browser_telemetry_button_responsive.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_button_responsive.js
rename to devtools/client/shared/test/browser_telemetry_button_responsive.js
diff --git a/browser/devtools/shared/test/browser_telemetry_button_scratchpad.js b/devtools/client/shared/test/browser_telemetry_button_scratchpad.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_button_scratchpad.js
rename to devtools/client/shared/test/browser_telemetry_button_scratchpad.js
diff --git a/browser/devtools/shared/test/browser_telemetry_button_tilt.js b/devtools/client/shared/test/browser_telemetry_button_tilt.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_button_tilt.js
rename to devtools/client/shared/test/browser_telemetry_button_tilt.js
diff --git a/browser/devtools/shared/test/browser_telemetry_sidebar.js b/devtools/client/shared/test/browser_telemetry_sidebar.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_sidebar.js
rename to devtools/client/shared/test/browser_telemetry_sidebar.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolbox.js b/devtools/client/shared/test/browser_telemetry_toolbox.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolbox.js
rename to devtools/client/shared/test/browser_telemetry_toolbox.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_inspector.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_inspector.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_options.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_options.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_shadereditor.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_storage.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_storage.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js b/devtools/client/shared/test/browser_telemetry_toolboxtabs_webconsole.js
similarity index 100%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
rename to devtools/client/shared/test/browser_telemetry_toolboxtabs_webconsole.js
diff --git a/browser/devtools/shared/test/browser_templater_basic.html b/devtools/client/shared/test/browser_templater_basic.html
similarity index 100%
rename from browser/devtools/shared/test/browser_templater_basic.html
rename to devtools/client/shared/test/browser_templater_basic.html
diff --git a/browser/devtools/shared/test/browser_templater_basic.js b/devtools/client/shared/test/browser_templater_basic.js
similarity index 100%
rename from browser/devtools/shared/test/browser_templater_basic.js
rename to devtools/client/shared/test/browser_templater_basic.js
diff --git a/browser/devtools/shared/test/browser_theme.js b/devtools/client/shared/test/browser_theme.js
similarity index 100%
rename from browser/devtools/shared/test/browser_theme.js
rename to devtools/client/shared/test/browser_theme.js
diff --git a/browser/devtools/shared/test/browser_toolbar_basic.html b/devtools/client/shared/test/browser_toolbar_basic.html
similarity index 100%
rename from browser/devtools/shared/test/browser_toolbar_basic.html
rename to devtools/client/shared/test/browser_toolbar_basic.html
diff --git a/browser/devtools/shared/test/browser_toolbar_basic.js b/devtools/client/shared/test/browser_toolbar_basic.js
similarity index 100%
rename from browser/devtools/shared/test/browser_toolbar_basic.js
rename to devtools/client/shared/test/browser_toolbar_basic.js
diff --git a/browser/devtools/shared/test/browser_toolbar_tooltip.js b/devtools/client/shared/test/browser_toolbar_tooltip.js
similarity index 100%
rename from browser/devtools/shared/test/browser_toolbar_tooltip.js
rename to devtools/client/shared/test/browser_toolbar_tooltip.js
diff --git a/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.html b/devtools/client/shared/test/browser_toolbar_webconsole_errors_count.html
similarity index 100%
rename from browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.html
rename to devtools/client/shared/test/browser_toolbar_webconsole_errors_count.html
diff --git a/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js b/devtools/client/shared/test/browser_toolbar_webconsole_errors_count.js
similarity index 100%
rename from browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
rename to devtools/client/shared/test/browser_toolbar_webconsole_errors_count.js
diff --git a/browser/devtools/shared/test/browser_treeWidget_basic.js b/devtools/client/shared/test/browser_treeWidget_basic.js
similarity index 100%
rename from browser/devtools/shared/test/browser_treeWidget_basic.js
rename to devtools/client/shared/test/browser_treeWidget_basic.js
diff --git a/browser/devtools/shared/test/browser_treeWidget_keyboard_interaction.js b/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
similarity index 100%
rename from browser/devtools/shared/test/browser_treeWidget_keyboard_interaction.js
rename to devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
diff --git a/browser/devtools/shared/test/browser_treeWidget_mouse_interaction.js b/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
similarity index 100%
rename from browser/devtools/shared/test/browser_treeWidget_mouse_interaction.js
rename to devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
diff --git a/browser/devtools/shared/test/doc_options-view.xul b/devtools/client/shared/test/doc_options-view.xul
similarity index 100%
rename from browser/devtools/shared/test/doc_options-view.xul
rename to devtools/client/shared/test/doc_options-view.xul
diff --git a/browser/devtools/shared/test/head.js b/devtools/client/shared/test/head.js
similarity index 100%
rename from browser/devtools/shared/test/head.js
rename to devtools/client/shared/test/head.js
diff --git a/browser/devtools/shared/test/html-mdn-css-basic-testing.html b/devtools/client/shared/test/html-mdn-css-basic-testing.html
similarity index 100%
rename from browser/devtools/shared/test/html-mdn-css-basic-testing.html
rename to devtools/client/shared/test/html-mdn-css-basic-testing.html
diff --git a/browser/devtools/shared/test/html-mdn-css-no-summary-or-syntax.html b/devtools/client/shared/test/html-mdn-css-no-summary-or-syntax.html
similarity index 100%
rename from browser/devtools/shared/test/html-mdn-css-no-summary-or-syntax.html
rename to devtools/client/shared/test/html-mdn-css-no-summary-or-syntax.html
diff --git a/browser/devtools/shared/test/html-mdn-css-no-summary.html b/devtools/client/shared/test/html-mdn-css-no-summary.html
similarity index 100%
rename from browser/devtools/shared/test/html-mdn-css-no-summary.html
rename to devtools/client/shared/test/html-mdn-css-no-summary.html
diff --git a/browser/devtools/shared/test/html-mdn-css-no-syntax.html b/devtools/client/shared/test/html-mdn-css-no-syntax.html
similarity index 100%
rename from browser/devtools/shared/test/html-mdn-css-no-syntax.html
rename to devtools/client/shared/test/html-mdn-css-no-syntax.html
diff --git a/browser/devtools/shared/test/html-mdn-css-syntax-old-style.html b/devtools/client/shared/test/html-mdn-css-syntax-old-style.html
similarity index 100%
rename from browser/devtools/shared/test/html-mdn-css-syntax-old-style.html
rename to devtools/client/shared/test/html-mdn-css-syntax-old-style.html
diff --git a/browser/devtools/shared/test/leakhunt.js b/devtools/client/shared/test/leakhunt.js
similarity index 100%
rename from browser/devtools/shared/test/leakhunt.js
rename to devtools/client/shared/test/leakhunt.js
diff --git a/browser/devtools/shared/test/test-actor-registry.js b/devtools/client/shared/test/test-actor-registry.js
similarity index 100%
rename from browser/devtools/shared/test/test-actor-registry.js
rename to devtools/client/shared/test/test-actor-registry.js
diff --git a/browser/devtools/shared/test/test-actor.js b/devtools/client/shared/test/test-actor.js
similarity index 100%
rename from browser/devtools/shared/test/test-actor.js
rename to devtools/client/shared/test/test-actor.js
diff --git a/browser/devtools/shared/test/unit/.eslintrc b/devtools/client/shared/test/unit/.eslintrc
similarity index 100%
rename from browser/devtools/shared/test/unit/.eslintrc
rename to devtools/client/shared/test/unit/.eslintrc
diff --git a/browser/devtools/shared/test/unit/test_VariablesView_filtering-without-controller.js b/devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_VariablesView_filtering-without-controller.js
rename to devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
diff --git a/browser/devtools/shared/test/unit/test_VariablesView_getString_promise.js b/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_VariablesView_getString_promise.js
rename to devtools/client/shared/test/unit/test_VariablesView_getString_promise.js
diff --git a/browser/devtools/shared/test/unit/test_advanceValidate.js b/devtools/client/shared/test/unit/test_advanceValidate.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_advanceValidate.js
rename to devtools/client/shared/test/unit/test_advanceValidate.js
diff --git a/browser/devtools/shared/test/unit/test_attribute-parsing-01.js b/devtools/client/shared/test/unit/test_attribute-parsing-01.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_attribute-parsing-01.js
rename to devtools/client/shared/test/unit/test_attribute-parsing-01.js
diff --git a/browser/devtools/shared/test/unit/test_attribute-parsing-02.js b/devtools/client/shared/test/unit/test_attribute-parsing-02.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_attribute-parsing-02.js
rename to devtools/client/shared/test/unit/test_attribute-parsing-02.js
diff --git a/browser/devtools/shared/test/unit/test_bezierCanvas.js b/devtools/client/shared/test/unit/test_bezierCanvas.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_bezierCanvas.js
rename to devtools/client/shared/test/unit/test_bezierCanvas.js
diff --git a/browser/devtools/shared/test/unit/test_cubicBezier.js b/devtools/client/shared/test/unit/test_cubicBezier.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_cubicBezier.js
rename to devtools/client/shared/test/unit/test_cubicBezier.js
diff --git a/browser/devtools/shared/test/unit/test_undoStack.js b/devtools/client/shared/test/unit/test_undoStack.js
similarity index 100%
rename from browser/devtools/shared/test/unit/test_undoStack.js
rename to devtools/client/shared/test/unit/test_undoStack.js
diff --git a/browser/devtools/shared/test/unit/xpcshell.ini b/devtools/client/shared/test/unit/xpcshell.ini
similarity index 100%
rename from browser/devtools/shared/test/unit/xpcshell.ini
rename to devtools/client/shared/test/unit/xpcshell.ini
diff --git a/browser/devtools/shared/theme-switching.js b/devtools/client/shared/theme-switching.js
similarity index 100%
rename from browser/devtools/shared/theme-switching.js
rename to devtools/client/shared/theme-switching.js
diff --git a/browser/devtools/shared/theme.js b/devtools/client/shared/theme.js
similarity index 100%
rename from browser/devtools/shared/theme.js
rename to devtools/client/shared/theme.js
diff --git a/browser/devtools/shared/undo.js b/devtools/client/shared/undo.js
similarity index 100%
rename from browser/devtools/shared/undo.js
rename to devtools/client/shared/undo.js
diff --git a/browser/devtools/shared/vendor/D3_LICENSE b/devtools/client/shared/vendor/D3_LICENSE
similarity index 100%
rename from browser/devtools/shared/vendor/D3_LICENSE
rename to devtools/client/shared/vendor/D3_LICENSE
diff --git a/browser/devtools/shared/vendor/DAGRE_D3_LICENSE b/devtools/client/shared/vendor/DAGRE_D3_LICENSE
similarity index 100%
rename from browser/devtools/shared/vendor/DAGRE_D3_LICENSE
rename to devtools/client/shared/vendor/DAGRE_D3_LICENSE
diff --git a/browser/devtools/shared/vendor/REDUX_LICENSE b/devtools/client/shared/vendor/REDUX_LICENSE
similarity index 100%
rename from browser/devtools/shared/vendor/REDUX_LICENSE
rename to devtools/client/shared/vendor/REDUX_LICENSE
diff --git a/browser/devtools/shared/vendor/d3.js b/devtools/client/shared/vendor/d3.js
similarity index 100%
rename from browser/devtools/shared/vendor/d3.js
rename to devtools/client/shared/vendor/d3.js
diff --git a/browser/devtools/shared/vendor/dagre-d3.js b/devtools/client/shared/vendor/dagre-d3.js
similarity index 100%
rename from browser/devtools/shared/vendor/dagre-d3.js
rename to devtools/client/shared/vendor/dagre-d3.js
diff --git a/browser/devtools/shared/vendor/moz.build b/devtools/client/shared/vendor/moz.build
similarity index 100%
rename from browser/devtools/shared/vendor/moz.build
rename to devtools/client/shared/vendor/moz.build
diff --git a/browser/devtools/shared/vendor/react-dev.js b/devtools/client/shared/vendor/react-dev.js
similarity index 100%
rename from browser/devtools/shared/vendor/react-dev.js
rename to devtools/client/shared/vendor/react-dev.js
diff --git a/browser/devtools/shared/vendor/react.js b/devtools/client/shared/vendor/react.js
similarity index 100%
rename from browser/devtools/shared/vendor/react.js
rename to devtools/client/shared/vendor/react.js
diff --git a/browser/devtools/shared/vendor/redux.js b/devtools/client/shared/vendor/redux.js
similarity index 100%
rename from browser/devtools/shared/vendor/redux.js
rename to devtools/client/shared/vendor/redux.js
diff --git a/browser/devtools/shared/widgets/AbstractTreeItem.jsm b/devtools/client/shared/widgets/AbstractTreeItem.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/AbstractTreeItem.jsm
rename to devtools/client/shared/widgets/AbstractTreeItem.jsm
diff --git a/browser/devtools/shared/widgets/BarGraphWidget.js b/devtools/client/shared/widgets/BarGraphWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/BarGraphWidget.js
rename to devtools/client/shared/widgets/BarGraphWidget.js
diff --git a/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm b/devtools/client/shared/widgets/BreadcrumbsWidget.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/BreadcrumbsWidget.jsm
rename to devtools/client/shared/widgets/BreadcrumbsWidget.jsm
diff --git a/browser/devtools/shared/widgets/Chart.jsm b/devtools/client/shared/widgets/Chart.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/Chart.jsm
rename to devtools/client/shared/widgets/Chart.jsm
diff --git a/browser/devtools/shared/widgets/CubicBezierPresets.js b/devtools/client/shared/widgets/CubicBezierPresets.js
similarity index 100%
rename from browser/devtools/shared/widgets/CubicBezierPresets.js
rename to devtools/client/shared/widgets/CubicBezierPresets.js
diff --git a/browser/devtools/shared/widgets/CubicBezierWidget.js b/devtools/client/shared/widgets/CubicBezierWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/CubicBezierWidget.js
rename to devtools/client/shared/widgets/CubicBezierWidget.js
diff --git a/browser/devtools/shared/widgets/FastListWidget.js b/devtools/client/shared/widgets/FastListWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/FastListWidget.js
rename to devtools/client/shared/widgets/FastListWidget.js
diff --git a/browser/devtools/shared/widgets/FilterWidget.js b/devtools/client/shared/widgets/FilterWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/FilterWidget.js
rename to devtools/client/shared/widgets/FilterWidget.js
diff --git a/browser/devtools/shared/widgets/FlameGraph.js b/devtools/client/shared/widgets/FlameGraph.js
similarity index 100%
rename from browser/devtools/shared/widgets/FlameGraph.js
rename to devtools/client/shared/widgets/FlameGraph.js
diff --git a/browser/devtools/shared/widgets/Graphs.js b/devtools/client/shared/widgets/Graphs.js
similarity index 100%
rename from browser/devtools/shared/widgets/Graphs.js
rename to devtools/client/shared/widgets/Graphs.js
diff --git a/browser/devtools/shared/widgets/GraphsWorker.js b/devtools/client/shared/widgets/GraphsWorker.js
similarity index 100%
rename from browser/devtools/shared/widgets/GraphsWorker.js
rename to devtools/client/shared/widgets/GraphsWorker.js
diff --git a/browser/devtools/shared/widgets/LineGraphWidget.js b/devtools/client/shared/widgets/LineGraphWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/LineGraphWidget.js
rename to devtools/client/shared/widgets/LineGraphWidget.js
diff --git a/browser/devtools/shared/widgets/MdnDocsWidget.js b/devtools/client/shared/widgets/MdnDocsWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/MdnDocsWidget.js
rename to devtools/client/shared/widgets/MdnDocsWidget.js
diff --git a/browser/devtools/shared/widgets/MountainGraphWidget.js b/devtools/client/shared/widgets/MountainGraphWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/MountainGraphWidget.js
rename to devtools/client/shared/widgets/MountainGraphWidget.js
diff --git a/browser/devtools/shared/widgets/SideMenuWidget.jsm b/devtools/client/shared/widgets/SideMenuWidget.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/SideMenuWidget.jsm
rename to devtools/client/shared/widgets/SideMenuWidget.jsm
diff --git a/browser/devtools/shared/widgets/SimpleListWidget.jsm b/devtools/client/shared/widgets/SimpleListWidget.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/SimpleListWidget.jsm
rename to devtools/client/shared/widgets/SimpleListWidget.jsm
diff --git a/browser/devtools/shared/widgets/Spectrum.js b/devtools/client/shared/widgets/Spectrum.js
similarity index 100%
rename from browser/devtools/shared/widgets/Spectrum.js
rename to devtools/client/shared/widgets/Spectrum.js
diff --git a/browser/devtools/shared/widgets/TableWidget.js b/devtools/client/shared/widgets/TableWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/TableWidget.js
rename to devtools/client/shared/widgets/TableWidget.js
diff --git a/browser/devtools/shared/widgets/Tooltip.js b/devtools/client/shared/widgets/Tooltip.js
similarity index 100%
rename from browser/devtools/shared/widgets/Tooltip.js
rename to devtools/client/shared/widgets/Tooltip.js
diff --git a/browser/devtools/shared/widgets/TreeWidget.js b/devtools/client/shared/widgets/TreeWidget.js
similarity index 100%
rename from browser/devtools/shared/widgets/TreeWidget.js
rename to devtools/client/shared/widgets/TreeWidget.js
diff --git a/browser/devtools/shared/widgets/VariablesView.jsm b/devtools/client/shared/widgets/VariablesView.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/VariablesView.jsm
rename to devtools/client/shared/widgets/VariablesView.jsm
diff --git a/browser/devtools/shared/widgets/VariablesView.xul b/devtools/client/shared/widgets/VariablesView.xul
similarity index 100%
rename from browser/devtools/shared/widgets/VariablesView.xul
rename to devtools/client/shared/widgets/VariablesView.xul
diff --git a/browser/devtools/shared/widgets/VariablesViewController.jsm b/devtools/client/shared/widgets/VariablesViewController.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/VariablesViewController.jsm
rename to devtools/client/shared/widgets/VariablesViewController.jsm
diff --git a/browser/devtools/shared/widgets/ViewHelpers.jsm b/devtools/client/shared/widgets/ViewHelpers.jsm
similarity index 100%
rename from browser/devtools/shared/widgets/ViewHelpers.jsm
rename to devtools/client/shared/widgets/ViewHelpers.jsm
diff --git a/browser/devtools/shared/widgets/cubic-bezier-frame.xhtml b/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
similarity index 100%
rename from browser/devtools/shared/widgets/cubic-bezier-frame.xhtml
rename to devtools/client/shared/widgets/cubic-bezier-frame.xhtml
diff --git a/browser/devtools/shared/widgets/cubic-bezier.css b/devtools/client/shared/widgets/cubic-bezier.css
similarity index 100%
rename from browser/devtools/shared/widgets/cubic-bezier.css
rename to devtools/client/shared/widgets/cubic-bezier.css
diff --git a/browser/devtools/shared/widgets/filter-frame.xhtml b/devtools/client/shared/widgets/filter-frame.xhtml
similarity index 100%
rename from browser/devtools/shared/widgets/filter-frame.xhtml
rename to devtools/client/shared/widgets/filter-frame.xhtml
diff --git a/browser/devtools/shared/widgets/filter-widget.css b/devtools/client/shared/widgets/filter-widget.css
similarity index 100%
rename from browser/devtools/shared/widgets/filter-widget.css
rename to devtools/client/shared/widgets/filter-widget.css
diff --git a/browser/devtools/shared/widgets/graphs-frame.xhtml b/devtools/client/shared/widgets/graphs-frame.xhtml
similarity index 100%
rename from browser/devtools/shared/widgets/graphs-frame.xhtml
rename to devtools/client/shared/widgets/graphs-frame.xhtml
diff --git a/browser/devtools/shared/widgets/mdn-docs-frame.xhtml b/devtools/client/shared/widgets/mdn-docs-frame.xhtml
similarity index 100%
rename from browser/devtools/shared/widgets/mdn-docs-frame.xhtml
rename to devtools/client/shared/widgets/mdn-docs-frame.xhtml
diff --git a/browser/devtools/shared/widgets/mdn-docs.css b/devtools/client/shared/widgets/mdn-docs.css
similarity index 100%
rename from browser/devtools/shared/widgets/mdn-docs.css
rename to devtools/client/shared/widgets/mdn-docs.css
diff --git a/browser/devtools/shared/widgets/spectrum-frame.xhtml b/devtools/client/shared/widgets/spectrum-frame.xhtml
similarity index 100%
rename from browser/devtools/shared/widgets/spectrum-frame.xhtml
rename to devtools/client/shared/widgets/spectrum-frame.xhtml
diff --git a/browser/devtools/shared/widgets/spectrum.css b/devtools/client/shared/widgets/spectrum.css
similarity index 100%
rename from browser/devtools/shared/widgets/spectrum.css
rename to devtools/client/shared/widgets/spectrum.css
diff --git a/browser/devtools/shared/widgets/widgets.css b/devtools/client/shared/widgets/widgets.css
similarity index 100%
rename from browser/devtools/shared/widgets/widgets.css
rename to devtools/client/shared/widgets/widgets.css
diff --git a/browser/devtools/sourceeditor/autocomplete.js b/devtools/client/sourceeditor/autocomplete.js
similarity index 100%
rename from browser/devtools/sourceeditor/autocomplete.js
rename to devtools/client/sourceeditor/autocomplete.js
diff --git a/browser/devtools/sourceeditor/codemirror/LICENSE b/devtools/client/sourceeditor/codemirror/LICENSE
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/LICENSE
rename to devtools/client/sourceeditor/codemirror/LICENSE
diff --git a/browser/devtools/sourceeditor/codemirror/README b/devtools/client/sourceeditor/codemirror/README
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/README
rename to devtools/client/sourceeditor/codemirror/README
diff --git a/browser/devtools/sourceeditor/codemirror/codemirror.css b/devtools/client/sourceeditor/codemirror/codemirror.css
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/codemirror.css
rename to devtools/client/sourceeditor/codemirror/codemirror.css
diff --git a/browser/devtools/sourceeditor/codemirror/codemirror.js b/devtools/client/sourceeditor/codemirror/codemirror.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/codemirror.js
rename to devtools/client/sourceeditor/codemirror/codemirror.js
diff --git a/browser/devtools/sourceeditor/codemirror/comment/comment.js b/devtools/client/sourceeditor/codemirror/comment/comment.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/comment/comment.js
rename to devtools/client/sourceeditor/codemirror/comment/comment.js
diff --git a/browser/devtools/sourceeditor/codemirror/comment/continuecomment.js b/devtools/client/sourceeditor/codemirror/comment/continuecomment.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/comment/continuecomment.js
rename to devtools/client/sourceeditor/codemirror/comment/continuecomment.js
diff --git a/browser/devtools/sourceeditor/codemirror/dialog/dialog.css b/devtools/client/sourceeditor/codemirror/dialog/dialog.css
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/dialog/dialog.css
rename to devtools/client/sourceeditor/codemirror/dialog/dialog.css
diff --git a/browser/devtools/sourceeditor/codemirror/dialog/dialog.js b/devtools/client/sourceeditor/codemirror/dialog/dialog.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/dialog/dialog.js
rename to devtools/client/sourceeditor/codemirror/dialog/dialog.js
diff --git a/browser/devtools/sourceeditor/codemirror/edit/closebrackets.js b/devtools/client/sourceeditor/codemirror/edit/closebrackets.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/edit/closebrackets.js
rename to devtools/client/sourceeditor/codemirror/edit/closebrackets.js
diff --git a/browser/devtools/sourceeditor/codemirror/edit/closetag.js b/devtools/client/sourceeditor/codemirror/edit/closetag.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/edit/closetag.js
rename to devtools/client/sourceeditor/codemirror/edit/closetag.js
diff --git a/browser/devtools/sourceeditor/codemirror/edit/continuelist.js b/devtools/client/sourceeditor/codemirror/edit/continuelist.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/edit/continuelist.js
rename to devtools/client/sourceeditor/codemirror/edit/continuelist.js
diff --git a/browser/devtools/sourceeditor/codemirror/edit/matchbrackets.js b/devtools/client/sourceeditor/codemirror/edit/matchbrackets.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/edit/matchbrackets.js
rename to devtools/client/sourceeditor/codemirror/edit/matchbrackets.js
diff --git a/browser/devtools/sourceeditor/codemirror/edit/matchtags.js b/devtools/client/sourceeditor/codemirror/edit/matchtags.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/edit/matchtags.js
rename to devtools/client/sourceeditor/codemirror/edit/matchtags.js
diff --git a/browser/devtools/sourceeditor/codemirror/edit/trailingspace.js b/devtools/client/sourceeditor/codemirror/edit/trailingspace.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/edit/trailingspace.js
rename to devtools/client/sourceeditor/codemirror/edit/trailingspace.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/brace-fold.js b/devtools/client/sourceeditor/codemirror/fold/brace-fold.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/brace-fold.js
rename to devtools/client/sourceeditor/codemirror/fold/brace-fold.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/comment-fold.js b/devtools/client/sourceeditor/codemirror/fold/comment-fold.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/comment-fold.js
rename to devtools/client/sourceeditor/codemirror/fold/comment-fold.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/foldcode.js b/devtools/client/sourceeditor/codemirror/fold/foldcode.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/foldcode.js
rename to devtools/client/sourceeditor/codemirror/fold/foldcode.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/foldgutter.css b/devtools/client/sourceeditor/codemirror/fold/foldgutter.css
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/foldgutter.css
rename to devtools/client/sourceeditor/codemirror/fold/foldgutter.css
diff --git a/browser/devtools/sourceeditor/codemirror/fold/foldgutter.js b/devtools/client/sourceeditor/codemirror/fold/foldgutter.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/foldgutter.js
rename to devtools/client/sourceeditor/codemirror/fold/foldgutter.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/indent-fold.js b/devtools/client/sourceeditor/codemirror/fold/indent-fold.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/indent-fold.js
rename to devtools/client/sourceeditor/codemirror/fold/indent-fold.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/markdown-fold.js b/devtools/client/sourceeditor/codemirror/fold/markdown-fold.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/markdown-fold.js
rename to devtools/client/sourceeditor/codemirror/fold/markdown-fold.js
diff --git a/browser/devtools/sourceeditor/codemirror/fold/xml-fold.js b/devtools/client/sourceeditor/codemirror/fold/xml-fold.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/fold/xml-fold.js
rename to devtools/client/sourceeditor/codemirror/fold/xml-fold.js
diff --git a/browser/devtools/sourceeditor/codemirror/hint/show-hint.js b/devtools/client/sourceeditor/codemirror/hint/show-hint.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/hint/show-hint.js
rename to devtools/client/sourceeditor/codemirror/hint/show-hint.js
diff --git a/browser/devtools/sourceeditor/codemirror/keymap/emacs.js b/devtools/client/sourceeditor/codemirror/keymap/emacs.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/keymap/emacs.js
rename to devtools/client/sourceeditor/codemirror/keymap/emacs.js
diff --git a/browser/devtools/sourceeditor/codemirror/keymap/sublime.js b/devtools/client/sourceeditor/codemirror/keymap/sublime.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/keymap/sublime.js
rename to devtools/client/sourceeditor/codemirror/keymap/sublime.js
diff --git a/browser/devtools/sourceeditor/codemirror/keymap/vim.js b/devtools/client/sourceeditor/codemirror/keymap/vim.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/keymap/vim.js
rename to devtools/client/sourceeditor/codemirror/keymap/vim.js
diff --git a/browser/devtools/sourceeditor/codemirror/mode/clike.js b/devtools/client/sourceeditor/codemirror/mode/clike.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/mode/clike.js
rename to devtools/client/sourceeditor/codemirror/mode/clike.js
diff --git a/browser/devtools/sourceeditor/codemirror/mode/css.js b/devtools/client/sourceeditor/codemirror/mode/css.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/mode/css.js
rename to devtools/client/sourceeditor/codemirror/mode/css.js
diff --git a/browser/devtools/sourceeditor/codemirror/mode/htmlmixed.js b/devtools/client/sourceeditor/codemirror/mode/htmlmixed.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/mode/htmlmixed.js
rename to devtools/client/sourceeditor/codemirror/mode/htmlmixed.js
diff --git a/browser/devtools/sourceeditor/codemirror/mode/javascript.js b/devtools/client/sourceeditor/codemirror/mode/javascript.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/mode/javascript.js
rename to devtools/client/sourceeditor/codemirror/mode/javascript.js
diff --git a/browser/devtools/sourceeditor/codemirror/mode/xml.js b/devtools/client/sourceeditor/codemirror/mode/xml.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/mode/xml.js
rename to devtools/client/sourceeditor/codemirror/mode/xml.js
diff --git a/browser/devtools/sourceeditor/codemirror/mozilla.css b/devtools/client/sourceeditor/codemirror/mozilla.css
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/mozilla.css
rename to devtools/client/sourceeditor/codemirror/mozilla.css
diff --git a/browser/devtools/sourceeditor/codemirror/search/match-highlighter.js b/devtools/client/sourceeditor/codemirror/search/match-highlighter.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/search/match-highlighter.js
rename to devtools/client/sourceeditor/codemirror/search/match-highlighter.js
diff --git a/browser/devtools/sourceeditor/codemirror/search/search.js b/devtools/client/sourceeditor/codemirror/search/search.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/search/search.js
rename to devtools/client/sourceeditor/codemirror/search/search.js
diff --git a/browser/devtools/sourceeditor/codemirror/search/searchcursor.js b/devtools/client/sourceeditor/codemirror/search/searchcursor.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/search/searchcursor.js
rename to devtools/client/sourceeditor/codemirror/search/searchcursor.js
diff --git a/browser/devtools/sourceeditor/codemirror/selection/active-line.js b/devtools/client/sourceeditor/codemirror/selection/active-line.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/selection/active-line.js
rename to devtools/client/sourceeditor/codemirror/selection/active-line.js
diff --git a/browser/devtools/sourceeditor/codemirror/selection/mark-selection.js b/devtools/client/sourceeditor/codemirror/selection/mark-selection.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/selection/mark-selection.js
rename to devtools/client/sourceeditor/codemirror/selection/mark-selection.js
diff --git a/browser/devtools/sourceeditor/codemirror/tern/tern.css b/devtools/client/sourceeditor/codemirror/tern/tern.css
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/tern/tern.css
rename to devtools/client/sourceeditor/codemirror/tern/tern.css
diff --git a/browser/devtools/sourceeditor/codemirror/tern/tern.js b/devtools/client/sourceeditor/codemirror/tern/tern.js
similarity index 100%
rename from browser/devtools/sourceeditor/codemirror/tern/tern.js
rename to devtools/client/sourceeditor/codemirror/tern/tern.js
diff --git a/browser/devtools/sourceeditor/css-autocompleter.js b/devtools/client/sourceeditor/css-autocompleter.js
similarity index 100%
rename from browser/devtools/sourceeditor/css-autocompleter.js
rename to devtools/client/sourceeditor/css-autocompleter.js
diff --git a/browser/devtools/sourceeditor/css-tokenizer.js b/devtools/client/sourceeditor/css-tokenizer.js
similarity index 100%
rename from browser/devtools/sourceeditor/css-tokenizer.js
rename to devtools/client/sourceeditor/css-tokenizer.js
diff --git a/browser/devtools/sourceeditor/debugger.js b/devtools/client/sourceeditor/debugger.js
similarity index 100%
rename from browser/devtools/sourceeditor/debugger.js
rename to devtools/client/sourceeditor/debugger.js
diff --git a/browser/devtools/sourceeditor/editor.js b/devtools/client/sourceeditor/editor.js
similarity index 100%
rename from browser/devtools/sourceeditor/editor.js
rename to devtools/client/sourceeditor/editor.js
diff --git a/browser/devtools/sourceeditor/moz.build b/devtools/client/sourceeditor/moz.build
similarity index 100%
rename from browser/devtools/sourceeditor/moz.build
rename to devtools/client/sourceeditor/moz.build
diff --git a/browser/devtools/sourceeditor/test/.eslintrc b/devtools/client/sourceeditor/test/.eslintrc
similarity index 100%
rename from browser/devtools/sourceeditor/test/.eslintrc
rename to devtools/client/sourceeditor/test/.eslintrc
diff --git a/browser/devtools/sourceeditor/test/browser.ini b/devtools/client/sourceeditor/test/browser.ini
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser.ini
rename to devtools/client/sourceeditor/test/browser.ini
diff --git a/browser/devtools/sourceeditor/test/browser_codemirror.js b/devtools/client/sourceeditor/test/browser_codemirror.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_codemirror.js
rename to devtools/client/sourceeditor/test/browser_codemirror.js
diff --git a/browser/devtools/sourceeditor/test/browser_css_autocompletion.js b/devtools/client/sourceeditor/test/browser_css_autocompletion.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_css_autocompletion.js
rename to devtools/client/sourceeditor/test/browser_css_autocompletion.js
diff --git a/browser/devtools/sourceeditor/test/browser_css_getInfo.js b/devtools/client/sourceeditor/test/browser_css_getInfo.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_css_getInfo.js
rename to devtools/client/sourceeditor/test/browser_css_getInfo.js
diff --git a/browser/devtools/sourceeditor/test/browser_css_statemachine.js b/devtools/client/sourceeditor/test/browser_css_statemachine.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_css_statemachine.js
rename to devtools/client/sourceeditor/test/browser_css_statemachine.js
diff --git a/browser/devtools/sourceeditor/test/browser_detectindent.js b/devtools/client/sourceeditor/test/browser_detectindent.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_detectindent.js
rename to devtools/client/sourceeditor/test/browser_detectindent.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_addons.js b/devtools/client/sourceeditor/test/browser_editor_addons.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_addons.js
rename to devtools/client/sourceeditor/test/browser_editor_addons.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_autocomplete_basic.js b/devtools/client/sourceeditor/test/browser_editor_autocomplete_basic.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_autocomplete_basic.js
rename to devtools/client/sourceeditor/test/browser_editor_autocomplete_basic.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_autocomplete_events.js b/devtools/client/sourceeditor/test/browser_editor_autocomplete_events.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_autocomplete_events.js
rename to devtools/client/sourceeditor/test/browser_editor_autocomplete_events.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_autocomplete_js.js b/devtools/client/sourceeditor/test/browser_editor_autocomplete_js.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_autocomplete_js.js
rename to devtools/client/sourceeditor/test/browser_editor_autocomplete_js.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_basic.js b/devtools/client/sourceeditor/test/browser_editor_basic.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_basic.js
rename to devtools/client/sourceeditor/test/browser_editor_basic.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_cursor.js b/devtools/client/sourceeditor/test/browser_editor_cursor.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_cursor.js
rename to devtools/client/sourceeditor/test/browser_editor_cursor.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_find_again.js b/devtools/client/sourceeditor/test/browser_editor_find_again.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_find_again.js
rename to devtools/client/sourceeditor/test/browser_editor_find_again.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_goto_line.js b/devtools/client/sourceeditor/test/browser_editor_goto_line.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_goto_line.js
rename to devtools/client/sourceeditor/test/browser_editor_goto_line.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_history.js b/devtools/client/sourceeditor/test/browser_editor_history.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_history.js
rename to devtools/client/sourceeditor/test/browser_editor_history.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_markers.js b/devtools/client/sourceeditor/test/browser_editor_markers.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_markers.js
rename to devtools/client/sourceeditor/test/browser_editor_markers.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_movelines.js b/devtools/client/sourceeditor/test/browser_editor_movelines.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_movelines.js
rename to devtools/client/sourceeditor/test/browser_editor_movelines.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_prefs.js b/devtools/client/sourceeditor/test/browser_editor_prefs.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_prefs.js
rename to devtools/client/sourceeditor/test/browser_editor_prefs.js
diff --git a/browser/devtools/sourceeditor/test/browser_editor_script_injection.js b/devtools/client/sourceeditor/test/browser_editor_script_injection.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_editor_script_injection.js
rename to devtools/client/sourceeditor/test/browser_editor_script_injection.js
diff --git a/browser/devtools/sourceeditor/test/browser_vimemacs.js b/devtools/client/sourceeditor/test/browser_vimemacs.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/browser_vimemacs.js
rename to devtools/client/sourceeditor/test/browser_vimemacs.js
diff --git a/browser/devtools/sourceeditor/test/cm_comment_test.js b/devtools/client/sourceeditor/test/cm_comment_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_comment_test.js
rename to devtools/client/sourceeditor/test/cm_comment_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_doc_test.js b/devtools/client/sourceeditor/test/cm_doc_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_doc_test.js
rename to devtools/client/sourceeditor/test/cm_doc_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_driver.js b/devtools/client/sourceeditor/test/cm_driver.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_driver.js
rename to devtools/client/sourceeditor/test/cm_driver.js
diff --git a/browser/devtools/sourceeditor/test/cm_emacs_test.js b/devtools/client/sourceeditor/test/cm_emacs_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_emacs_test.js
rename to devtools/client/sourceeditor/test/cm_emacs_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_mode_javascript_test.js b/devtools/client/sourceeditor/test/cm_mode_javascript_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_mode_javascript_test.js
rename to devtools/client/sourceeditor/test/cm_mode_javascript_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_mode_ruby.js b/devtools/client/sourceeditor/test/cm_mode_ruby.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_mode_ruby.js
rename to devtools/client/sourceeditor/test/cm_mode_ruby.js
diff --git a/browser/devtools/sourceeditor/test/cm_mode_test.css b/devtools/client/sourceeditor/test/cm_mode_test.css
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_mode_test.css
rename to devtools/client/sourceeditor/test/cm_mode_test.css
diff --git a/browser/devtools/sourceeditor/test/cm_mode_test.js b/devtools/client/sourceeditor/test/cm_mode_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_mode_test.js
rename to devtools/client/sourceeditor/test/cm_mode_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_multi_test.js b/devtools/client/sourceeditor/test/cm_multi_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_multi_test.js
rename to devtools/client/sourceeditor/test/cm_multi_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_script_injection_test.js b/devtools/client/sourceeditor/test/cm_script_injection_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_script_injection_test.js
rename to devtools/client/sourceeditor/test/cm_script_injection_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_search_test.js b/devtools/client/sourceeditor/test/cm_search_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_search_test.js
rename to devtools/client/sourceeditor/test/cm_search_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_sublime_test.js b/devtools/client/sourceeditor/test/cm_sublime_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_sublime_test.js
rename to devtools/client/sourceeditor/test/cm_sublime_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_test.js b/devtools/client/sourceeditor/test/cm_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_test.js
rename to devtools/client/sourceeditor/test/cm_test.js
diff --git a/browser/devtools/sourceeditor/test/cm_vim_test.js b/devtools/client/sourceeditor/test/cm_vim_test.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/cm_vim_test.js
rename to devtools/client/sourceeditor/test/cm_vim_test.js
diff --git a/browser/devtools/sourceeditor/test/codemirror.html b/devtools/client/sourceeditor/test/codemirror.html
similarity index 100%
rename from browser/devtools/sourceeditor/test/codemirror.html
rename to devtools/client/sourceeditor/test/codemirror.html
diff --git a/browser/devtools/sourceeditor/test/css_autocompletion_tests.json b/devtools/client/sourceeditor/test/css_autocompletion_tests.json
similarity index 100%
rename from browser/devtools/sourceeditor/test/css_autocompletion_tests.json
rename to devtools/client/sourceeditor/test/css_autocompletion_tests.json
diff --git a/browser/devtools/sourceeditor/test/css_statemachine_testcases.css b/devtools/client/sourceeditor/test/css_statemachine_testcases.css
similarity index 100%
rename from browser/devtools/sourceeditor/test/css_statemachine_testcases.css
rename to devtools/client/sourceeditor/test/css_statemachine_testcases.css
diff --git a/browser/devtools/sourceeditor/test/css_statemachine_tests.json b/devtools/client/sourceeditor/test/css_statemachine_tests.json
similarity index 100%
rename from browser/devtools/sourceeditor/test/css_statemachine_tests.json
rename to devtools/client/sourceeditor/test/css_statemachine_tests.json
diff --git a/browser/devtools/sourceeditor/test/head.js b/devtools/client/sourceeditor/test/head.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/head.js
rename to devtools/client/sourceeditor/test/head.js
diff --git a/browser/devtools/sourceeditor/test/helper_codemirror_runner.js b/devtools/client/sourceeditor/test/helper_codemirror_runner.js
similarity index 100%
rename from browser/devtools/sourceeditor/test/helper_codemirror_runner.js
rename to devtools/client/sourceeditor/test/helper_codemirror_runner.js
diff --git a/browser/devtools/sourceeditor/test/vimemacs.html b/devtools/client/sourceeditor/test/vimemacs.html
similarity index 100%
rename from browser/devtools/sourceeditor/test/vimemacs.html
rename to devtools/client/sourceeditor/test/vimemacs.html
diff --git a/browser/devtools/storage/moz.build b/devtools/client/storage/moz.build
similarity index 100%
rename from browser/devtools/storage/moz.build
rename to devtools/client/storage/moz.build
diff --git a/browser/devtools/storage/panel.js b/devtools/client/storage/panel.js
similarity index 100%
rename from browser/devtools/storage/panel.js
rename to devtools/client/storage/panel.js
diff --git a/browser/devtools/storage/storage.xul b/devtools/client/storage/storage.xul
similarity index 100%
rename from browser/devtools/storage/storage.xul
rename to devtools/client/storage/storage.xul
diff --git a/browser/devtools/storage/test/.eslintrc b/devtools/client/storage/test/.eslintrc
similarity index 100%
rename from browser/devtools/storage/test/.eslintrc
rename to devtools/client/storage/test/.eslintrc
diff --git a/browser/devtools/storage/test/browser.ini b/devtools/client/storage/test/browser.ini
similarity index 100%
rename from browser/devtools/storage/test/browser.ini
rename to devtools/client/storage/test/browser.ini
diff --git a/browser/devtools/storage/test/browser_storage_basic.js b/devtools/client/storage/test/browser_storage_basic.js
similarity index 100%
rename from browser/devtools/storage/test/browser_storage_basic.js
rename to devtools/client/storage/test/browser_storage_basic.js
diff --git a/browser/devtools/storage/test/browser_storage_dynamic_updates.js b/devtools/client/storage/test/browser_storage_dynamic_updates.js
similarity index 100%
rename from browser/devtools/storage/test/browser_storage_dynamic_updates.js
rename to devtools/client/storage/test/browser_storage_dynamic_updates.js
diff --git a/browser/devtools/storage/test/browser_storage_sidebar.js b/devtools/client/storage/test/browser_storage_sidebar.js
similarity index 100%
rename from browser/devtools/storage/test/browser_storage_sidebar.js
rename to devtools/client/storage/test/browser_storage_sidebar.js
diff --git a/browser/devtools/storage/test/browser_storage_values.js b/devtools/client/storage/test/browser_storage_values.js
similarity index 100%
rename from browser/devtools/storage/test/browser_storage_values.js
rename to devtools/client/storage/test/browser_storage_values.js
diff --git a/browser/devtools/storage/test/head.js b/devtools/client/storage/test/head.js
similarity index 100%
rename from browser/devtools/storage/test/head.js
rename to devtools/client/storage/test/head.js
diff --git a/browser/devtools/storage/test/storage-complex-values.html b/devtools/client/storage/test/storage-complex-values.html
similarity index 100%
rename from browser/devtools/storage/test/storage-complex-values.html
rename to devtools/client/storage/test/storage-complex-values.html
diff --git a/browser/devtools/storage/test/storage-listings.html b/devtools/client/storage/test/storage-listings.html
similarity index 100%
rename from browser/devtools/storage/test/storage-listings.html
rename to devtools/client/storage/test/storage-listings.html
diff --git a/browser/devtools/storage/test/storage-secured-iframe.html b/devtools/client/storage/test/storage-secured-iframe.html
similarity index 100%
rename from browser/devtools/storage/test/storage-secured-iframe.html
rename to devtools/client/storage/test/storage-secured-iframe.html
diff --git a/browser/devtools/storage/test/storage-unsecured-iframe.html b/devtools/client/storage/test/storage-unsecured-iframe.html
similarity index 100%
rename from browser/devtools/storage/test/storage-unsecured-iframe.html
rename to devtools/client/storage/test/storage-unsecured-iframe.html
diff --git a/browser/devtools/storage/test/storage-updates.html b/devtools/client/storage/test/storage-updates.html
similarity index 100%
rename from browser/devtools/storage/test/storage-updates.html
rename to devtools/client/storage/test/storage-updates.html
diff --git a/browser/devtools/storage/ui.js b/devtools/client/storage/ui.js
similarity index 100%
rename from browser/devtools/storage/ui.js
rename to devtools/client/storage/ui.js
diff --git a/browser/devtools/styleeditor/StyleEditorUI.jsm b/devtools/client/styleeditor/StyleEditorUI.jsm
similarity index 100%
rename from browser/devtools/styleeditor/StyleEditorUI.jsm
rename to devtools/client/styleeditor/StyleEditorUI.jsm
diff --git a/browser/devtools/styleeditor/StyleEditorUtil.jsm b/devtools/client/styleeditor/StyleEditorUtil.jsm
similarity index 100%
rename from browser/devtools/styleeditor/StyleEditorUtil.jsm
rename to devtools/client/styleeditor/StyleEditorUtil.jsm
diff --git a/browser/devtools/styleeditor/StyleSheetEditor.jsm b/devtools/client/styleeditor/StyleSheetEditor.jsm
similarity index 100%
rename from browser/devtools/styleeditor/StyleSheetEditor.jsm
rename to devtools/client/styleeditor/StyleSheetEditor.jsm
diff --git a/browser/devtools/styleeditor/moz.build b/devtools/client/styleeditor/moz.build
similarity index 100%
rename from browser/devtools/styleeditor/moz.build
rename to devtools/client/styleeditor/moz.build
diff --git a/browser/devtools/styleeditor/styleeditor-commands.js b/devtools/client/styleeditor/styleeditor-commands.js
similarity index 100%
rename from browser/devtools/styleeditor/styleeditor-commands.js
rename to devtools/client/styleeditor/styleeditor-commands.js
diff --git a/browser/devtools/styleeditor/styleeditor-panel.js b/devtools/client/styleeditor/styleeditor-panel.js
similarity index 100%
rename from browser/devtools/styleeditor/styleeditor-panel.js
rename to devtools/client/styleeditor/styleeditor-panel.js
diff --git a/browser/devtools/styleeditor/styleeditor.css b/devtools/client/styleeditor/styleeditor.css
similarity index 100%
rename from browser/devtools/styleeditor/styleeditor.css
rename to devtools/client/styleeditor/styleeditor.css
diff --git a/browser/devtools/styleeditor/styleeditor.xul b/devtools/client/styleeditor/styleeditor.xul
similarity index 100%
rename from browser/devtools/styleeditor/styleeditor.xul
rename to devtools/client/styleeditor/styleeditor.xul
diff --git a/browser/devtools/styleeditor/test/.eslintrc b/devtools/client/styleeditor/test/.eslintrc
similarity index 100%
rename from browser/devtools/styleeditor/test/.eslintrc
rename to devtools/client/styleeditor/test/.eslintrc
diff --git a/browser/devtools/styleeditor/test/autocomplete.html b/devtools/client/styleeditor/test/autocomplete.html
similarity index 100%
rename from browser/devtools/styleeditor/test/autocomplete.html
rename to devtools/client/styleeditor/test/autocomplete.html
diff --git a/browser/devtools/styleeditor/test/browser.ini b/devtools/client/styleeditor/test/browser.ini
similarity index 100%
rename from browser/devtools/styleeditor/test/browser.ini
rename to devtools/client/styleeditor/test/browser.ini
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete-disabled.js b/devtools/client/styleeditor/test/browser_styleeditor_autocomplete-disabled.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_autocomplete-disabled.js
rename to devtools/client/styleeditor/test/browser_styleeditor_autocomplete-disabled.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js b/devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js
rename to devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_bug_740541_iframes.js b/devtools/client/styleeditor/test/browser_styleeditor_bug_740541_iframes.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_bug_740541_iframes.js
rename to devtools/client/styleeditor/test/browser_styleeditor_bug_740541_iframes.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js b/devtools/client/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js
rename to devtools/client/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_bug_870339.js b/devtools/client/styleeditor/test/browser_styleeditor_bug_870339.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_bug_870339.js
rename to devtools/client/styleeditor/test/browser_styleeditor_bug_870339.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.html b/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.html
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.html
rename to devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.html
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js b/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js
rename to devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_enabled.js b/devtools/client/styleeditor/test/browser_styleeditor_enabled.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_enabled.js
rename to devtools/client/styleeditor/test/browser_styleeditor_enabled.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js b/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js
rename to devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_filesave.js b/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_filesave.js
rename to devtools/client/styleeditor/test/browser_styleeditor_filesave.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_highlight-selector.js b/devtools/client/styleeditor/test/browser_styleeditor_highlight-selector.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_highlight-selector.js
rename to devtools/client/styleeditor/test/browser_styleeditor_highlight-selector.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_import.js b/devtools/client/styleeditor/test/browser_styleeditor_import.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_import.js
rename to devtools/client/styleeditor/test/browser_styleeditor_import.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_import_rule.js b/devtools/client/styleeditor/test/browser_styleeditor_import_rule.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_import_rule.js
rename to devtools/client/styleeditor/test/browser_styleeditor_import_rule.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_init.js b/devtools/client/styleeditor/test/browser_styleeditor_init.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_init.js
rename to devtools/client/styleeditor/test/browser_styleeditor_init.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js b/devtools/client/styleeditor/test/browser_styleeditor_inline_friendly_names.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js
rename to devtools/client/styleeditor/test/browser_styleeditor_inline_friendly_names.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_loading.js b/devtools/client/styleeditor/test/browser_styleeditor_loading.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_loading.js
rename to devtools/client/styleeditor/test/browser_styleeditor_loading.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar.js b/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar.js
rename to devtools/client/styleeditor/test/browser_styleeditor_media_sidebar.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js b/devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js
rename to devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js b/devtools/client/styleeditor/test/browser_styleeditor_missing_stylesheet.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js
rename to devtools/client/styleeditor/test/browser_styleeditor_missing_stylesheet.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_navigate.js b/devtools/client/styleeditor/test/browser_styleeditor_navigate.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_navigate.js
rename to devtools/client/styleeditor/test/browser_styleeditor_navigate.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_new.js b/devtools/client/styleeditor/test/browser_styleeditor_new.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_new.js
rename to devtools/client/styleeditor/test/browser_styleeditor_new.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_nostyle.js b/devtools/client/styleeditor/test/browser_styleeditor_nostyle.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_nostyle.js
rename to devtools/client/styleeditor/test/browser_styleeditor_nostyle.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_opentab.js b/devtools/client/styleeditor/test/browser_styleeditor_opentab.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_opentab.js
rename to devtools/client/styleeditor/test/browser_styleeditor_opentab.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js b/devtools/client/styleeditor/test/browser_styleeditor_pretty.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_pretty.js
rename to devtools/client/styleeditor/test/browser_styleeditor_pretty.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_private_perwindowpb.js b/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_private_perwindowpb.js
rename to devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_reload.js b/devtools/client/styleeditor/test/browser_styleeditor_reload.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_reload.js
rename to devtools/client/styleeditor/test/browser_styleeditor_reload.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_scroll.js b/devtools/client/styleeditor/test/browser_styleeditor_scroll.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_scroll.js
rename to devtools/client/styleeditor/test/browser_styleeditor_scroll.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js b/devtools/client/styleeditor/test/browser_styleeditor_selectstylesheet.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js
rename to devtools/client/styleeditor/test/browser_styleeditor_selectstylesheet.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_large.js b/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_large.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_large.js
rename to devtools/client/styleeditor/test/browser_styleeditor_sourcemap_large.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js b/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js
rename to devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js b/devtools/client/styleeditor/test/browser_styleeditor_sourcemaps.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js
rename to devtools/client/styleeditor/test/browser_styleeditor_sourcemaps.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js b/devtools/client/styleeditor/test/browser_styleeditor_sv_keynav.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js
rename to devtools/client/styleeditor/test/browser_styleeditor_sv_keynav.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_sv_resize.js b/devtools/client/styleeditor/test/browser_styleeditor_sv_resize.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_sv_resize.js
rename to devtools/client/styleeditor/test/browser_styleeditor_sv_resize.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_transition_rule.js b/devtools/client/styleeditor/test/browser_styleeditor_transition_rule.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_transition_rule.js
rename to devtools/client/styleeditor/test/browser_styleeditor_transition_rule.js
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_xul.js b/devtools/client/styleeditor/test/browser_styleeditor_xul.js
similarity index 100%
rename from browser/devtools/styleeditor/test/browser_styleeditor_xul.js
rename to devtools/client/styleeditor/test/browser_styleeditor_xul.js
diff --git a/browser/devtools/styleeditor/test/doc_long.css b/devtools/client/styleeditor/test/doc_long.css
similarity index 100%
rename from browser/devtools/styleeditor/test/doc_long.css
rename to devtools/client/styleeditor/test/doc_long.css
diff --git a/browser/devtools/styleeditor/test/doc_uncached.css b/devtools/client/styleeditor/test/doc_uncached.css
similarity index 100%
rename from browser/devtools/styleeditor/test/doc_uncached.css
rename to devtools/client/styleeditor/test/doc_uncached.css
diff --git a/browser/devtools/styleeditor/test/doc_uncached.html b/devtools/client/styleeditor/test/doc_uncached.html
similarity index 100%
rename from browser/devtools/styleeditor/test/doc_uncached.html
rename to devtools/client/styleeditor/test/doc_uncached.html
diff --git a/browser/devtools/styleeditor/test/doc_xulpage.xul b/devtools/client/styleeditor/test/doc_xulpage.xul
similarity index 100%
rename from browser/devtools/styleeditor/test/doc_xulpage.xul
rename to devtools/client/styleeditor/test/doc_xulpage.xul
diff --git a/browser/devtools/styleeditor/test/four.html b/devtools/client/styleeditor/test/four.html
similarity index 100%
rename from browser/devtools/styleeditor/test/four.html
rename to devtools/client/styleeditor/test/four.html
diff --git a/browser/devtools/styleeditor/test/head.js b/devtools/client/styleeditor/test/head.js
similarity index 100%
rename from browser/devtools/styleeditor/test/head.js
rename to devtools/client/styleeditor/test/head.js
diff --git a/browser/devtools/styleeditor/test/import.css b/devtools/client/styleeditor/test/import.css
similarity index 100%
rename from browser/devtools/styleeditor/test/import.css
rename to devtools/client/styleeditor/test/import.css
diff --git a/browser/devtools/styleeditor/test/import.html b/devtools/client/styleeditor/test/import.html
similarity index 100%
rename from browser/devtools/styleeditor/test/import.html
rename to devtools/client/styleeditor/test/import.html
diff --git a/browser/devtools/styleeditor/test/import2.css b/devtools/client/styleeditor/test/import2.css
similarity index 100%
rename from browser/devtools/styleeditor/test/import2.css
rename to devtools/client/styleeditor/test/import2.css
diff --git a/browser/devtools/styleeditor/test/inline-1.html b/devtools/client/styleeditor/test/inline-1.html
similarity index 100%
rename from browser/devtools/styleeditor/test/inline-1.html
rename to devtools/client/styleeditor/test/inline-1.html
diff --git a/browser/devtools/styleeditor/test/inline-2.html b/devtools/client/styleeditor/test/inline-2.html
similarity index 100%
rename from browser/devtools/styleeditor/test/inline-2.html
rename to devtools/client/styleeditor/test/inline-2.html
diff --git a/browser/devtools/styleeditor/test/longload.html b/devtools/client/styleeditor/test/longload.html
similarity index 100%
rename from browser/devtools/styleeditor/test/longload.html
rename to devtools/client/styleeditor/test/longload.html
diff --git a/browser/devtools/styleeditor/test/media-rules-sourcemaps.html b/devtools/client/styleeditor/test/media-rules-sourcemaps.html
similarity index 100%
rename from browser/devtools/styleeditor/test/media-rules-sourcemaps.html
rename to devtools/client/styleeditor/test/media-rules-sourcemaps.html
diff --git a/browser/devtools/styleeditor/test/media-rules.css b/devtools/client/styleeditor/test/media-rules.css
similarity index 100%
rename from browser/devtools/styleeditor/test/media-rules.css
rename to devtools/client/styleeditor/test/media-rules.css
diff --git a/browser/devtools/styleeditor/test/media-rules.html b/devtools/client/styleeditor/test/media-rules.html
similarity index 100%
rename from browser/devtools/styleeditor/test/media-rules.html
rename to devtools/client/styleeditor/test/media-rules.html
diff --git a/browser/devtools/styleeditor/test/media-small.css b/devtools/client/styleeditor/test/media-small.css
similarity index 100%
rename from browser/devtools/styleeditor/test/media-small.css
rename to devtools/client/styleeditor/test/media-small.css
diff --git a/browser/devtools/styleeditor/test/media.html b/devtools/client/styleeditor/test/media.html
similarity index 100%
rename from browser/devtools/styleeditor/test/media.html
rename to devtools/client/styleeditor/test/media.html
diff --git a/browser/devtools/styleeditor/test/minified.html b/devtools/client/styleeditor/test/minified.html
similarity index 100%
rename from browser/devtools/styleeditor/test/minified.html
rename to devtools/client/styleeditor/test/minified.html
diff --git a/browser/devtools/styleeditor/test/missing.html b/devtools/client/styleeditor/test/missing.html
similarity index 100%
rename from browser/devtools/styleeditor/test/missing.html
rename to devtools/client/styleeditor/test/missing.html
diff --git a/browser/devtools/styleeditor/test/nostyle.html b/devtools/client/styleeditor/test/nostyle.html
similarity index 100%
rename from browser/devtools/styleeditor/test/nostyle.html
rename to devtools/client/styleeditor/test/nostyle.html
diff --git a/browser/devtools/styleeditor/test/pretty.css b/devtools/client/styleeditor/test/pretty.css
similarity index 100%
rename from browser/devtools/styleeditor/test/pretty.css
rename to devtools/client/styleeditor/test/pretty.css
diff --git a/browser/devtools/styleeditor/test/resources_inpage.jsi b/devtools/client/styleeditor/test/resources_inpage.jsi
similarity index 100%
rename from browser/devtools/styleeditor/test/resources_inpage.jsi
rename to devtools/client/styleeditor/test/resources_inpage.jsi
diff --git a/browser/devtools/styleeditor/test/resources_inpage1.css b/devtools/client/styleeditor/test/resources_inpage1.css
similarity index 100%
rename from browser/devtools/styleeditor/test/resources_inpage1.css
rename to devtools/client/styleeditor/test/resources_inpage1.css
diff --git a/browser/devtools/styleeditor/test/resources_inpage2.css b/devtools/client/styleeditor/test/resources_inpage2.css
similarity index 100%
rename from browser/devtools/styleeditor/test/resources_inpage2.css
rename to devtools/client/styleeditor/test/resources_inpage2.css
diff --git a/browser/devtools/styleeditor/test/simple.css b/devtools/client/styleeditor/test/simple.css
similarity index 100%
rename from browser/devtools/styleeditor/test/simple.css
rename to devtools/client/styleeditor/test/simple.css
diff --git a/browser/devtools/styleeditor/test/simple.css.gz b/devtools/client/styleeditor/test/simple.css.gz
similarity index 100%
rename from browser/devtools/styleeditor/test/simple.css.gz
rename to devtools/client/styleeditor/test/simple.css.gz
diff --git a/browser/devtools/styleeditor/test/simple.css.gz^headers^ b/devtools/client/styleeditor/test/simple.css.gz^headers^
similarity index 100%
rename from browser/devtools/styleeditor/test/simple.css.gz^headers^
rename to devtools/client/styleeditor/test/simple.css.gz^headers^
diff --git a/browser/devtools/styleeditor/test/simple.gz.html b/devtools/client/styleeditor/test/simple.gz.html
similarity index 100%
rename from browser/devtools/styleeditor/test/simple.gz.html
rename to devtools/client/styleeditor/test/simple.gz.html
diff --git a/browser/devtools/styleeditor/test/simple.html b/devtools/client/styleeditor/test/simple.html
similarity index 100%
rename from browser/devtools/styleeditor/test/simple.html
rename to devtools/client/styleeditor/test/simple.html
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/contained.css b/devtools/client/styleeditor/test/sourcemap-css/contained.css
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/contained.css
rename to devtools/client/styleeditor/test/sourcemap-css/contained.css
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css b/devtools/client/styleeditor/test/sourcemap-css/media-rules.css
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/media-rules.css
rename to devtools/client/styleeditor/test/sourcemap-css/media-rules.css
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css.map b/devtools/client/styleeditor/test/sourcemap-css/media-rules.css.map
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/media-rules.css.map
rename to devtools/client/styleeditor/test/sourcemap-css/media-rules.css.map
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/sourcemaps.css b/devtools/client/styleeditor/test/sourcemap-css/sourcemaps.css
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/sourcemaps.css
rename to devtools/client/styleeditor/test/sourcemap-css/sourcemaps.css
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/sourcemaps.css.map b/devtools/client/styleeditor/test/sourcemap-css/sourcemaps.css.map
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/sourcemaps.css.map
rename to devtools/client/styleeditor/test/sourcemap-css/sourcemaps.css.map
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/test-bootstrap-scss.css b/devtools/client/styleeditor/test/sourcemap-css/test-bootstrap-scss.css
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/test-bootstrap-scss.css
rename to devtools/client/styleeditor/test/sourcemap-css/test-bootstrap-scss.css
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/test-stylus.css b/devtools/client/styleeditor/test/sourcemap-css/test-stylus.css
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-css/test-stylus.css
rename to devtools/client/styleeditor/test/sourcemap-css/test-stylus.css
diff --git a/browser/devtools/styleeditor/test/sourcemap-sass/media-rules.scss b/devtools/client/styleeditor/test/sourcemap-sass/media-rules.scss
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-sass/media-rules.scss
rename to devtools/client/styleeditor/test/sourcemap-sass/media-rules.scss
diff --git a/browser/devtools/styleeditor/test/sourcemap-sass/sourcemaps.scss b/devtools/client/styleeditor/test/sourcemap-sass/sourcemaps.scss
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-sass/sourcemaps.scss
rename to devtools/client/styleeditor/test/sourcemap-sass/sourcemaps.scss
diff --git a/browser/devtools/styleeditor/test/sourcemap-styl/test-stylus.styl b/devtools/client/styleeditor/test/sourcemap-styl/test-stylus.styl
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemap-styl/test-stylus.styl
rename to devtools/client/styleeditor/test/sourcemap-styl/test-stylus.styl
diff --git a/browser/devtools/styleeditor/test/sourcemaps-large.html b/devtools/client/styleeditor/test/sourcemaps-large.html
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemaps-large.html
rename to devtools/client/styleeditor/test/sourcemaps-large.html
diff --git a/browser/devtools/styleeditor/test/sourcemaps-watching.html b/devtools/client/styleeditor/test/sourcemaps-watching.html
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemaps-watching.html
rename to devtools/client/styleeditor/test/sourcemaps-watching.html
diff --git a/browser/devtools/styleeditor/test/sourcemaps.html b/devtools/client/styleeditor/test/sourcemaps.html
similarity index 100%
rename from browser/devtools/styleeditor/test/sourcemaps.html
rename to devtools/client/styleeditor/test/sourcemaps.html
diff --git a/browser/devtools/styleeditor/test/test_private.css b/devtools/client/styleeditor/test/test_private.css
similarity index 100%
rename from browser/devtools/styleeditor/test/test_private.css
rename to devtools/client/styleeditor/test/test_private.css
diff --git a/browser/devtools/styleeditor/test/test_private.html b/devtools/client/styleeditor/test/test_private.html
similarity index 100%
rename from browser/devtools/styleeditor/test/test_private.html
rename to devtools/client/styleeditor/test/test_private.html
diff --git a/browser/devtools/styleeditor/utils.js b/devtools/client/styleeditor/utils.js
similarity index 100%
rename from browser/devtools/styleeditor/utils.js
rename to devtools/client/styleeditor/utils.js
diff --git a/browser/devtools/styleinspector/computed-view.js b/devtools/client/styleinspector/computed-view.js
similarity index 100%
rename from browser/devtools/styleinspector/computed-view.js
rename to devtools/client/styleinspector/computed-view.js
diff --git a/browser/devtools/styleinspector/computedview.xhtml b/devtools/client/styleinspector/computedview.xhtml
similarity index 100%
rename from browser/devtools/styleinspector/computedview.xhtml
rename to devtools/client/styleinspector/computedview.xhtml
diff --git a/browser/devtools/styleinspector/css-parsing-utils.js b/devtools/client/styleinspector/css-parsing-utils.js
similarity index 100%
rename from browser/devtools/styleinspector/css-parsing-utils.js
rename to devtools/client/styleinspector/css-parsing-utils.js
diff --git a/browser/devtools/styleinspector/cssruleview.xhtml b/devtools/client/styleinspector/cssruleview.xhtml
similarity index 100%
rename from browser/devtools/styleinspector/cssruleview.xhtml
rename to devtools/client/styleinspector/cssruleview.xhtml
diff --git a/browser/devtools/styleinspector/moz.build b/devtools/client/styleinspector/moz.build
similarity index 100%
rename from browser/devtools/styleinspector/moz.build
rename to devtools/client/styleinspector/moz.build
diff --git a/browser/devtools/styleinspector/rule-view.js b/devtools/client/styleinspector/rule-view.js
similarity index 100%
rename from browser/devtools/styleinspector/rule-view.js
rename to devtools/client/styleinspector/rule-view.js
diff --git a/browser/devtools/styleinspector/ruleview.css b/devtools/client/styleinspector/ruleview.css
similarity index 100%
rename from browser/devtools/styleinspector/ruleview.css
rename to devtools/client/styleinspector/ruleview.css
diff --git a/browser/devtools/styleinspector/style-inspector-menu.js b/devtools/client/styleinspector/style-inspector-menu.js
similarity index 100%
rename from browser/devtools/styleinspector/style-inspector-menu.js
rename to devtools/client/styleinspector/style-inspector-menu.js
diff --git a/browser/devtools/styleinspector/style-inspector-overlays.js b/devtools/client/styleinspector/style-inspector-overlays.js
similarity index 100%
rename from browser/devtools/styleinspector/style-inspector-overlays.js
rename to devtools/client/styleinspector/style-inspector-overlays.js
diff --git a/browser/devtools/styleinspector/style-inspector.js b/devtools/client/styleinspector/style-inspector.js
similarity index 100%
rename from browser/devtools/styleinspector/style-inspector.js
rename to devtools/client/styleinspector/style-inspector.js
diff --git a/browser/devtools/styleinspector/test/.eslintrc b/devtools/client/styleinspector/test/.eslintrc
similarity index 100%
rename from browser/devtools/styleinspector/test/.eslintrc
rename to devtools/client/styleinspector/test/.eslintrc
diff --git a/browser/devtools/styleinspector/test/browser.ini b/devtools/client/styleinspector/test/browser.ini
similarity index 100%
rename from browser/devtools/styleinspector/test/browser.ini
rename to devtools/client/styleinspector/test/browser.ini
diff --git a/browser/devtools/styleinspector/test/browser_computedview_browser-styles.js b/devtools/client/styleinspector/test/browser_computedview_browser-styles.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_browser-styles.js
rename to devtools/client/styleinspector/test/browser_computedview_browser-styles.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_cycle_color.js b/devtools/client/styleinspector/test/browser_computedview_cycle_color.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_cycle_color.js
rename to devtools/client/styleinspector/test/browser_computedview_cycle_color.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_getNodeInfo.js b/devtools/client/styleinspector/test/browser_computedview_getNodeInfo.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_getNodeInfo.js
rename to devtools/client/styleinspector/test/browser_computedview_getNodeInfo.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_keybindings_01.js b/devtools/client/styleinspector/test/browser_computedview_keybindings_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_keybindings_01.js
rename to devtools/client/styleinspector/test/browser_computedview_keybindings_01.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_keybindings_02.js b/devtools/client/styleinspector/test/browser_computedview_keybindings_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_keybindings_02.js
rename to devtools/client/styleinspector/test/browser_computedview_keybindings_02.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_matched-selectors-toggle.js b/devtools/client/styleinspector/test/browser_computedview_matched-selectors-toggle.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_matched-selectors-toggle.js
rename to devtools/client/styleinspector/test/browser_computedview_matched-selectors-toggle.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js b/devtools/client/styleinspector/test/browser_computedview_matched-selectors_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js
rename to devtools/client/styleinspector/test/browser_computedview_matched-selectors_01.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_matched-selectors_02.js b/devtools/client/styleinspector/test/browser_computedview_matched-selectors_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_matched-selectors_02.js
rename to devtools/client/styleinspector/test/browser_computedview_matched-selectors_02.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_media-queries.js b/devtools/client/styleinspector/test/browser_computedview_media-queries.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_media-queries.js
rename to devtools/client/styleinspector/test/browser_computedview_media-queries.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_no-results-placeholder.js b/devtools/client/styleinspector/test/browser_computedview_no-results-placeholder.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_no-results-placeholder.js
rename to devtools/client/styleinspector/test/browser_computedview_no-results-placeholder.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_original-source-link.js b/devtools/client/styleinspector/test/browser_computedview_original-source-link.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_original-source-link.js
rename to devtools/client/styleinspector/test/browser_computedview_original-source-link.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_pseudo-element_01.js b/devtools/client/styleinspector/test/browser_computedview_pseudo-element_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_pseudo-element_01.js
rename to devtools/client/styleinspector/test/browser_computedview_pseudo-element_01.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_refresh-on-style-change_01.js b/devtools/client/styleinspector/test/browser_computedview_refresh-on-style-change_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_refresh-on-style-change_01.js
rename to devtools/client/styleinspector/test/browser_computedview_refresh-on-style-change_01.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_search-filter.js b/devtools/client/styleinspector/test/browser_computedview_search-filter.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_search-filter.js
rename to devtools/client/styleinspector/test/browser_computedview_search-filter.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_search-filter_clear.js b/devtools/client/styleinspector/test/browser_computedview_search-filter_clear.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_search-filter_clear.js
rename to devtools/client/styleinspector/test/browser_computedview_search-filter_clear.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_search-filter_context-menu.js b/devtools/client/styleinspector/test/browser_computedview_search-filter_context-menu.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_search-filter_context-menu.js
rename to devtools/client/styleinspector/test/browser_computedview_search-filter_context-menu.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_search-filter_escape-keypress.js b/devtools/client/styleinspector/test/browser_computedview_search-filter_escape-keypress.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_search-filter_escape-keypress.js
rename to devtools/client/styleinspector/test/browser_computedview_search-filter_escape-keypress.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_select-and-copy-styles.js b/devtools/client/styleinspector/test/browser_computedview_select-and-copy-styles.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_select-and-copy-styles.js
rename to devtools/client/styleinspector/test/browser_computedview_select-and-copy-styles.js
diff --git a/browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js b/devtools/client/styleinspector/test/browser_computedview_style-editor-link.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js
rename to devtools/client/styleinspector/test/browser_computedview_style-editor-link.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js b/devtools/client/styleinspector/test/browser_ruleview_add-property-and-reselect.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property-and-reselect.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js b/devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js b/devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js b/devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js b/devtools/client/styleinspector/test/browser_ruleview_add-property-svg.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property-svg.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property_01.js b/devtools/client/styleinspector/test/browser_ruleview_add-property_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-property_02.js b/devtools/client/styleinspector/test/browser_ruleview_add-property_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-property_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-property_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js b/devtools/client/styleinspector/test/browser_ruleview_add-rule_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-rule_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js b/devtools/client/styleinspector/test/browser_ruleview_add-rule_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-rule_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js b/devtools/client/styleinspector/test/browser_ruleview_add-rule_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-rule_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-rule_04.js b/devtools/client/styleinspector/test/browser_ruleview_add-rule_04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-rule_04.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-rule_04.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js b/devtools/client/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js
rename to devtools/client/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_01.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_02.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-appears-on-swatch-click.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-appears-on-swatch-click.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-appears-on-swatch-click.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-appears-on-swatch-click.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-commit-on-ENTER.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-commit-on-ENTER.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-commit-on-ENTER.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-commit-on-ENTER.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-hides-on-tooltip.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-hides-on-tooltip.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-hides-on-tooltip.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-hides-on-tooltip.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-release-outside-frame.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-release-outside-frame.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-release-outside-frame.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-release-outside-frame.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js b/devtools/client/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js
rename to devtools/client/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js b/devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_02.js b/devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_01.js b/devtools/client/styleinspector/test/browser_ruleview_completion-new-property_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_completion-new-property_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_02.js b/devtools/client/styleinspector/test/browser_ruleview_completion-new-property_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_completion-new-property_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js b/devtools/client/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js
rename to devtools/client/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_computed-lists_01.js b/devtools/client/styleinspector/test/browser_ruleview_computed-lists_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_computed-lists_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_computed-lists_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_computed-lists_02.js b/devtools/client/styleinspector/test/browser_ruleview_computed-lists_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_computed-lists_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_computed-lists_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_content_01.js b/devtools/client/styleinspector/test/browser_ruleview_content_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_content_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_content_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_content_02.js b/devtools/client/styleinspector/test/browser_ruleview_content_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_content_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_content_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js b/devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js
rename to devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-02.js b/devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-02.js
rename to devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js b/devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js
rename to devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_copy_styles.js b/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_copy_styles.js
rename to devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js b/devtools/client/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js
rename to devtools/client/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js b/devtools/client/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js
rename to devtools/client/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js b/devtools/client/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js
rename to devtools/client/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_custom.js b/devtools/client/styleinspector/test/browser_ruleview_custom.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_custom.js
rename to devtools/client/styleinspector/test/browser_ruleview_custom.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js b/devtools/client/styleinspector/test/browser_ruleview_cycle-color.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_cycle-color.js
rename to devtools/client/styleinspector/test/browser_ruleview_cycle-color.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-cancel.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-cancel.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-cancel.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-cancel.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-commit.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-commit.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-computed.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-computed.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-computed.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-computed.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-increments.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-increments.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-order.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-order.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-order.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-order.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_01.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_02.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_03.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_03.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_04.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_04.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_04.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_05.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_05.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_05.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_05.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_06.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_06.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_06.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_06.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property_07.js b/devtools/client/styleinspector/test/browser_ruleview_edit-property_07.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-property_07.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-property_07.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector-commit.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector-commit.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector-commit.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector-commit.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector_01.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector_02.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector_03.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector_04.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector_04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector_04.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector_04.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector_05.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector_05.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector_05.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector_05.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-selector_06.js b/devtools/client/styleinspector/test/browser_ruleview_edit-selector_06.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_edit-selector_06.js
rename to devtools/client/styleinspector/test/browser_ruleview_edit-selector_06.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_01.js b/devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_02.js b/devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_eyedropper.js b/devtools/client/styleinspector/test/browser_ruleview_eyedropper.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_eyedropper.js
rename to devtools/client/styleinspector/test/browser_ruleview_eyedropper.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js b/devtools/client/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js
rename to devtools/client/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js b/devtools/client/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js
rename to devtools/client/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_filtereditor-revert-on-ESC.js b/devtools/client/styleinspector/test/browser_ruleview_filtereditor-revert-on-ESC.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_filtereditor-revert-on-ESC.js
rename to devtools/client/styleinspector/test/browser_ruleview_filtereditor-revert-on-ESC.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_01.js b/devtools/client/styleinspector/test/browser_ruleview_inherited-properties_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_inherited-properties_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_02.js b/devtools/client/styleinspector/test/browser_ruleview_inherited-properties_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_inherited-properties_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_03.js b/devtools/client/styleinspector/test/browser_ruleview_inherited-properties_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_inherited-properties_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_keybindings.js b/devtools/client/styleinspector/test/browser_ruleview_keybindings.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_keybindings.js
rename to devtools/client/styleinspector/test/browser_ruleview_keybindings.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js b/devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_02.js b/devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js b/devtools/client/styleinspector/test/browser_ruleview_livepreview.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_livepreview.js
rename to devtools/client/styleinspector/test/browser_ruleview_livepreview.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_01.js b/devtools/client/styleinspector/test/browser_ruleview_mark_overridden_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_mark_overridden_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_02.js b/devtools/client/styleinspector/test/browser_ruleview_mark_overridden_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_mark_overridden_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_03.js b/devtools/client/styleinspector/test/browser_ruleview_mark_overridden_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_mark_overridden_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_04.js b/devtools/client/styleinspector/test/browser_ruleview_mark_overridden_04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_04.js
rename to devtools/client/styleinspector/test/browser_ruleview_mark_overridden_04.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_05.js b/devtools/client/styleinspector/test/browser_ruleview_mark_overridden_05.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_05.js
rename to devtools/client/styleinspector/test/browser_ruleview_mark_overridden_05.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_mathml-element.js b/devtools/client/styleinspector/test/browser_ruleview_mathml-element.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_mathml-element.js
rename to devtools/client/styleinspector/test/browser_ruleview_mathml-element.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_media-queries.js b/devtools/client/styleinspector/test/browser_ruleview_media-queries.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_media-queries.js
rename to devtools/client/styleinspector/test/browser_ruleview_media-queries.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js b/devtools/client/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js
rename to devtools/client/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-priority.js b/devtools/client/styleinspector/test/browser_ruleview_multiple-properties-priority.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-priority.js
rename to devtools/client/styleinspector/test/browser_ruleview_multiple-properties-priority.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js b/devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js b/devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_01.js b/devtools/client/styleinspector/test/browser_ruleview_multiple_properties_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_multiple_properties_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_02.js b/devtools/client/styleinspector/test/browser_ruleview_multiple_properties_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_multiple_properties_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js b/devtools/client/styleinspector/test/browser_ruleview_original-source-link.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js
rename to devtools/client/styleinspector/test/browser_ruleview_original-source-link.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_01.js b/devtools/client/styleinspector/test/browser_ruleview_pseudo-element_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_pseudo-element_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_02.js b/devtools/client/styleinspector/test/browser_ruleview_pseudo-element_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_pseudo-element_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_pseudo_lock_options.js b/devtools/client/styleinspector/test/browser_ruleview_pseudo_lock_options.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_pseudo_lock_options.js
rename to devtools/client/styleinspector/test/browser_ruleview_pseudo_lock_options.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js b/devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js b/devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_refresh-on-style-change.js b/devtools/client/styleinspector/test/browser_ruleview_refresh-on-style-change.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_refresh-on-style-change.js
rename to devtools/client/styleinspector/test/browser_ruleview_refresh-on-style-change.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_02.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_03.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_04.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_04.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_04.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter-overridden-property.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter-overridden-property.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter-overridden-property.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter-overridden-property.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_01.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_02.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_03.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_04.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_04.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_04.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_05.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_05.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_05.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_05.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_06.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_06.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_06.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_06.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_07.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_07.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_07.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_07.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_08.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_08.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_08.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_08.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_09.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_09.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_09.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_09.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_10.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_10.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_10.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_10.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_context-menu.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_context-menu.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_context-menu.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_context-menu.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js b/devtools/client/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js
rename to devtools/client/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_select-and-copy-styles.js b/devtools/client/styleinspector/test/browser_ruleview_select-and-copy-styles.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_select-and-copy-styles.js
rename to devtools/client/styleinspector/test/browser_ruleview_select-and-copy-styles.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_01.js b/devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_02.js b/devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_03.js b/devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_selector_highlight.js b/devtools/client/styleinspector/test/browser_ruleview_selector_highlight.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_selector_highlight.js
rename to devtools/client/styleinspector/test/browser_ruleview_selector_highlight.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js b/devtools/client/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_01.js b/devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_01.js
rename to devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_01.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_02.js b/devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_02.js
rename to devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_02.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_03.js b/devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_03.js
rename to devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_03.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js b/devtools/client/styleinspector/test/browser_ruleview_style-editor-link.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js
rename to devtools/client/styleinspector/test/browser_ruleview_style-editor-link.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js b/devtools/client/styleinspector/test/browser_ruleview_urls-clickable.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js
rename to devtools/client/styleinspector/test/browser_ruleview_urls-clickable.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js b/devtools/client/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js
rename to devtools/client/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles.js b/devtools/client/styleinspector/test/browser_ruleview_user-agent-styles.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles.js
rename to devtools/client/styleinspector/test/browser_ruleview_user-agent-styles.js
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_user-property-reset.js b/devtools/client/styleinspector/test/browser_ruleview_user-property-reset.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_ruleview_user-property-reset.js
rename to devtools/client/styleinspector/test/browser_ruleview_user-property-reset.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js b/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js
rename to devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js b/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js
rename to devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js b/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js
rename to devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js b/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
rename to devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_output-parser.js b/devtools/client/styleinspector/test/browser_styleinspector_output-parser.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_output-parser.js
rename to devtools/client/styleinspector/test/browser_styleinspector_output-parser.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_refresh_when_active.js b/devtools/client/styleinspector/test/browser_styleinspector_refresh_when_active.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_refresh_when_active.js
rename to devtools/client/styleinspector/test/browser_styleinspector_refresh_when_active.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_tooltip-background-image.js b/devtools/client/styleinspector/test/browser_styleinspector_tooltip-background-image.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_tooltip-background-image.js
rename to devtools/client/styleinspector/test/browser_styleinspector_tooltip-background-image.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js b/devtools/client/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js
rename to devtools/client/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js b/devtools/client/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js
rename to devtools/client/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js b/devtools/client/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js
rename to devtools/client/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js b/devtools/client/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js
rename to devtools/client/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_tooltip-size.js b/devtools/client/styleinspector/test/browser_styleinspector_tooltip-size.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_tooltip-size.js
rename to devtools/client/styleinspector/test/browser_styleinspector_tooltip-size.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-01.js b/devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-01.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-01.js
rename to devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-01.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-02.js b/devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-02.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-02.js
rename to devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-02.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-03.js b/devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-03.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-03.js
rename to devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-03.js
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-04.js b/devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-04.js
similarity index 100%
rename from browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-04.js
rename to devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-04.js
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet.html b/devtools/client/styleinspector/test/doc_content_stylesheet.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet.html
rename to devtools/client/styleinspector/test/doc_content_stylesheet.html
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet.xul b/devtools/client/styleinspector/test/doc_content_stylesheet.xul
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet.xul
rename to devtools/client/styleinspector/test/doc_content_stylesheet.xul
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet_imported.css b/devtools/client/styleinspector/test/doc_content_stylesheet_imported.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet_imported.css
rename to devtools/client/styleinspector/test/doc_content_stylesheet_imported.css
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet_imported2.css b/devtools/client/styleinspector/test/doc_content_stylesheet_imported2.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet_imported2.css
rename to devtools/client/styleinspector/test/doc_content_stylesheet_imported2.css
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet_linked.css b/devtools/client/styleinspector/test/doc_content_stylesheet_linked.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet_linked.css
rename to devtools/client/styleinspector/test/doc_content_stylesheet_linked.css
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet_script.css b/devtools/client/styleinspector/test/doc_content_stylesheet_script.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet_script.css
rename to devtools/client/styleinspector/test/doc_content_stylesheet_script.css
diff --git a/browser/devtools/styleinspector/test/doc_content_stylesheet_xul.css b/devtools/client/styleinspector/test/doc_content_stylesheet_xul.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_content_stylesheet_xul.css
rename to devtools/client/styleinspector/test/doc_content_stylesheet_xul.css
diff --git a/browser/devtools/styleinspector/test/doc_copystyles.css b/devtools/client/styleinspector/test/doc_copystyles.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_copystyles.css
rename to devtools/client/styleinspector/test/doc_copystyles.css
diff --git a/browser/devtools/styleinspector/test/doc_copystyles.html b/devtools/client/styleinspector/test/doc_copystyles.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_copystyles.html
rename to devtools/client/styleinspector/test/doc_copystyles.html
diff --git a/browser/devtools/styleinspector/test/doc_custom.html b/devtools/client/styleinspector/test/doc_custom.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_custom.html
rename to devtools/client/styleinspector/test/doc_custom.html
diff --git a/browser/devtools/styleinspector/test/doc_filter.html b/devtools/client/styleinspector/test/doc_filter.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_filter.html
rename to devtools/client/styleinspector/test/doc_filter.html
diff --git a/browser/devtools/styleinspector/test/doc_frame_script.js b/devtools/client/styleinspector/test/doc_frame_script.js
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_frame_script.js
rename to devtools/client/styleinspector/test/doc_frame_script.js
diff --git a/browser/devtools/styleinspector/test/doc_keyframeanimation.css b/devtools/client/styleinspector/test/doc_keyframeanimation.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_keyframeanimation.css
rename to devtools/client/styleinspector/test/doc_keyframeanimation.css
diff --git a/browser/devtools/styleinspector/test/doc_keyframeanimation.html b/devtools/client/styleinspector/test/doc_keyframeanimation.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_keyframeanimation.html
rename to devtools/client/styleinspector/test/doc_keyframeanimation.html
diff --git a/browser/devtools/styleinspector/test/doc_matched_selectors.html b/devtools/client/styleinspector/test/doc_matched_selectors.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_matched_selectors.html
rename to devtools/client/styleinspector/test/doc_matched_selectors.html
diff --git a/browser/devtools/styleinspector/test/doc_media_queries.html b/devtools/client/styleinspector/test/doc_media_queries.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_media_queries.html
rename to devtools/client/styleinspector/test/doc_media_queries.html
diff --git a/browser/devtools/styleinspector/test/doc_pseudoelement.html b/devtools/client/styleinspector/test/doc_pseudoelement.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_pseudoelement.html
rename to devtools/client/styleinspector/test/doc_pseudoelement.html
diff --git a/browser/devtools/styleinspector/test/doc_sourcemaps.css b/devtools/client/styleinspector/test/doc_sourcemaps.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_sourcemaps.css
rename to devtools/client/styleinspector/test/doc_sourcemaps.css
diff --git a/browser/devtools/styleinspector/test/doc_sourcemaps.css.map b/devtools/client/styleinspector/test/doc_sourcemaps.css.map
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_sourcemaps.css.map
rename to devtools/client/styleinspector/test/doc_sourcemaps.css.map
diff --git a/browser/devtools/styleinspector/test/doc_sourcemaps.html b/devtools/client/styleinspector/test/doc_sourcemaps.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_sourcemaps.html
rename to devtools/client/styleinspector/test/doc_sourcemaps.html
diff --git a/browser/devtools/styleinspector/test/doc_sourcemaps.scss b/devtools/client/styleinspector/test/doc_sourcemaps.scss
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_sourcemaps.scss
rename to devtools/client/styleinspector/test/doc_sourcemaps.scss
diff --git a/browser/devtools/styleinspector/test/doc_style_editor_link.css b/devtools/client/styleinspector/test/doc_style_editor_link.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_style_editor_link.css
rename to devtools/client/styleinspector/test/doc_style_editor_link.css
diff --git a/browser/devtools/styleinspector/test/doc_test_image.png b/devtools/client/styleinspector/test/doc_test_image.png
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_test_image.png
rename to devtools/client/styleinspector/test/doc_test_image.png
diff --git a/browser/devtools/styleinspector/test/doc_urls_clickable.css b/devtools/client/styleinspector/test/doc_urls_clickable.css
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_urls_clickable.css
rename to devtools/client/styleinspector/test/doc_urls_clickable.css
diff --git a/browser/devtools/styleinspector/test/doc_urls_clickable.html b/devtools/client/styleinspector/test/doc_urls_clickable.html
similarity index 100%
rename from browser/devtools/styleinspector/test/doc_urls_clickable.html
rename to devtools/client/styleinspector/test/doc_urls_clickable.html
diff --git a/browser/devtools/styleinspector/test/head.js b/devtools/client/styleinspector/test/head.js
similarity index 100%
rename from browser/devtools/styleinspector/test/head.js
rename to devtools/client/styleinspector/test/head.js
diff --git a/browser/devtools/styleinspector/test/unit/.eslintrc b/devtools/client/styleinspector/test/unit/.eslintrc
similarity index 100%
rename from browser/devtools/styleinspector/test/unit/.eslintrc
rename to devtools/client/styleinspector/test/unit/.eslintrc
diff --git a/browser/devtools/styleinspector/test/unit/test_parseDeclarations.js b/devtools/client/styleinspector/test/unit/test_parseDeclarations.js
similarity index 100%
rename from browser/devtools/styleinspector/test/unit/test_parseDeclarations.js
rename to devtools/client/styleinspector/test/unit/test_parseDeclarations.js
diff --git a/browser/devtools/styleinspector/test/unit/test_parsePseudoClassesAndAttributes.js b/devtools/client/styleinspector/test/unit/test_parsePseudoClassesAndAttributes.js
similarity index 100%
rename from browser/devtools/styleinspector/test/unit/test_parsePseudoClassesAndAttributes.js
rename to devtools/client/styleinspector/test/unit/test_parsePseudoClassesAndAttributes.js
diff --git a/browser/devtools/styleinspector/test/unit/test_parseSingleValue.js b/devtools/client/styleinspector/test/unit/test_parseSingleValue.js
similarity index 100%
rename from browser/devtools/styleinspector/test/unit/test_parseSingleValue.js
rename to devtools/client/styleinspector/test/unit/test_parseSingleValue.js
diff --git a/browser/devtools/styleinspector/test/unit/xpcshell.ini b/devtools/client/styleinspector/test/unit/xpcshell.ini
similarity index 100%
rename from browser/devtools/styleinspector/test/unit/xpcshell.ini
rename to devtools/client/styleinspector/test/unit/xpcshell.ini
diff --git a/browser/devtools/styleinspector/utils.js b/devtools/client/styleinspector/utils.js
similarity index 100%
rename from browser/devtools/styleinspector/utils.js
rename to devtools/client/styleinspector/utils.js
diff --git a/browser/devtools/tilt/TiltWorkerCrafter.js b/devtools/client/tilt/TiltWorkerCrafter.js
similarity index 100%
rename from browser/devtools/tilt/TiltWorkerCrafter.js
rename to devtools/client/tilt/TiltWorkerCrafter.js
diff --git a/browser/devtools/tilt/TiltWorkerPicker.js b/devtools/client/tilt/TiltWorkerPicker.js
similarity index 100%
rename from browser/devtools/tilt/TiltWorkerPicker.js
rename to devtools/client/tilt/TiltWorkerPicker.js
diff --git a/browser/devtools/tilt/moz.build b/devtools/client/tilt/moz.build
similarity index 100%
rename from browser/devtools/tilt/moz.build
rename to devtools/client/tilt/moz.build
diff --git a/browser/devtools/tilt/test/.eslintrc b/devtools/client/tilt/test/.eslintrc
similarity index 100%
rename from browser/devtools/tilt/test/.eslintrc
rename to devtools/client/tilt/test/.eslintrc
diff --git a/browser/devtools/tilt/test/browser.ini b/devtools/client/tilt/test/browser.ini
similarity index 100%
rename from browser/devtools/tilt/test/browser.ini
rename to devtools/client/tilt/test/browser.ini
diff --git a/browser/devtools/tilt/test/browser_tilt_01_lazy_getter.js b/devtools/client/tilt/test/browser_tilt_01_lazy_getter.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_01_lazy_getter.js
rename to devtools/client/tilt/test/browser_tilt_01_lazy_getter.js
diff --git a/browser/devtools/tilt/test/browser_tilt_02_notifications-seq.js b/devtools/client/tilt/test/browser_tilt_02_notifications-seq.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_02_notifications-seq.js
rename to devtools/client/tilt/test/browser_tilt_02_notifications-seq.js
diff --git a/browser/devtools/tilt/test/browser_tilt_02_notifications-tabs.js b/devtools/client/tilt/test/browser_tilt_02_notifications-tabs.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_02_notifications-tabs.js
rename to devtools/client/tilt/test/browser_tilt_02_notifications-tabs.js
diff --git a/browser/devtools/tilt/test/browser_tilt_02_notifications.js b/devtools/client/tilt/test/browser_tilt_02_notifications.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_02_notifications.js
rename to devtools/client/tilt/test/browser_tilt_02_notifications.js
diff --git a/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js b/devtools/client/tilt/test/browser_tilt_03_tab_switch.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
rename to devtools/client/tilt/test/browser_tilt_03_tab_switch.js
diff --git a/browser/devtools/tilt/test/browser_tilt_04_initialization.js b/devtools/client/tilt/test/browser_tilt_04_initialization.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_04_initialization.js
rename to devtools/client/tilt/test/browser_tilt_04_initialization.js
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js b/devtools/client/tilt/test/browser_tilt_05_destruction-esc.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
rename to devtools/client/tilt/test/browser_tilt_05_destruction-esc.js
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction-url.js b/devtools/client/tilt/test/browser_tilt_05_destruction-url.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_05_destruction-url.js
rename to devtools/client/tilt/test/browser_tilt_05_destruction-url.js
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction.js b/devtools/client/tilt/test/browser_tilt_05_destruction.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_05_destruction.js
rename to devtools/client/tilt/test/browser_tilt_05_destruction.js
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js b/devtools/client/tilt/test/browser_tilt_arcball-reset-typeahead.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
rename to devtools/client/tilt/test/browser_tilt_arcball-reset-typeahead.js
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball-reset.js b/devtools/client/tilt/test/browser_tilt_arcball-reset.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_arcball-reset.js
rename to devtools/client/tilt/test/browser_tilt_arcball-reset.js
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball.js b/devtools/client/tilt/test/browser_tilt_arcball.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_arcball.js
rename to devtools/client/tilt/test/browser_tilt_arcball.js
diff --git a/browser/devtools/tilt/test/browser_tilt_controller.js b/devtools/client/tilt/test/browser_tilt_controller.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_controller.js
rename to devtools/client/tilt/test/browser_tilt_controller.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl01.js b/devtools/client/tilt/test/browser_tilt_gl01.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl01.js
rename to devtools/client/tilt/test/browser_tilt_gl01.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl02.js b/devtools/client/tilt/test/browser_tilt_gl02.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl02.js
rename to devtools/client/tilt/test/browser_tilt_gl02.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl03.js b/devtools/client/tilt/test/browser_tilt_gl03.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl03.js
rename to devtools/client/tilt/test/browser_tilt_gl03.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl04.js b/devtools/client/tilt/test/browser_tilt_gl04.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl04.js
rename to devtools/client/tilt/test/browser_tilt_gl04.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl05.js b/devtools/client/tilt/test/browser_tilt_gl05.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl05.js
rename to devtools/client/tilt/test/browser_tilt_gl05.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl06.js b/devtools/client/tilt/test/browser_tilt_gl06.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl06.js
rename to devtools/client/tilt/test/browser_tilt_gl06.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl07.js b/devtools/client/tilt/test/browser_tilt_gl07.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl07.js
rename to devtools/client/tilt/test/browser_tilt_gl07.js
diff --git a/browser/devtools/tilt/test/browser_tilt_gl08.js b/devtools/client/tilt/test/browser_tilt_gl08.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_gl08.js
rename to devtools/client/tilt/test/browser_tilt_gl08.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math01.js b/devtools/client/tilt/test/browser_tilt_math01.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math01.js
rename to devtools/client/tilt/test/browser_tilt_math01.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math02.js b/devtools/client/tilt/test/browser_tilt_math02.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math02.js
rename to devtools/client/tilt/test/browser_tilt_math02.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math03.js b/devtools/client/tilt/test/browser_tilt_math03.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math03.js
rename to devtools/client/tilt/test/browser_tilt_math03.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math04.js b/devtools/client/tilt/test/browser_tilt_math04.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math04.js
rename to devtools/client/tilt/test/browser_tilt_math04.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math05.js b/devtools/client/tilt/test/browser_tilt_math05.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math05.js
rename to devtools/client/tilt/test/browser_tilt_math05.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math06.js b/devtools/client/tilt/test/browser_tilt_math06.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math06.js
rename to devtools/client/tilt/test/browser_tilt_math06.js
diff --git a/browser/devtools/tilt/test/browser_tilt_math07.js b/devtools/client/tilt/test/browser_tilt_math07.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_math07.js
rename to devtools/client/tilt/test/browser_tilt_math07.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking.js b/devtools/client/tilt/test/browser_tilt_picking.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking.js
rename to devtools/client/tilt/test/browser_tilt_picking.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_delete.js b/devtools/client/tilt/test/browser_tilt_picking_delete.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_delete.js
rename to devtools/client/tilt/test/browser_tilt_picking_delete.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js b/devtools/client/tilt/test/browser_tilt_picking_highlight01-offs.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
rename to devtools/client/tilt/test/browser_tilt_picking_highlight01-offs.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js b/devtools/client/tilt/test/browser_tilt_picking_highlight01.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
rename to devtools/client/tilt/test/browser_tilt_picking_highlight01.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js b/devtools/client/tilt/test/browser_tilt_picking_highlight02.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
rename to devtools/client/tilt/test/browser_tilt_picking_highlight02.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js b/devtools/client/tilt/test/browser_tilt_picking_highlight03.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
rename to devtools/client/tilt/test/browser_tilt_picking_highlight03.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_inspector.js b/devtools/client/tilt/test/browser_tilt_picking_inspector.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_inspector.js
rename to devtools/client/tilt/test/browser_tilt_picking_inspector.js
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_miv.js b/devtools/client/tilt/test/browser_tilt_picking_miv.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_picking_miv.js
rename to devtools/client/tilt/test/browser_tilt_picking_miv.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils01.js b/devtools/client/tilt/test/browser_tilt_utils01.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils01.js
rename to devtools/client/tilt/test/browser_tilt_utils01.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils02.js b/devtools/client/tilt/test/browser_tilt_utils02.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils02.js
rename to devtools/client/tilt/test/browser_tilt_utils02.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils03.js b/devtools/client/tilt/test/browser_tilt_utils03.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils03.js
rename to devtools/client/tilt/test/browser_tilt_utils03.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils04.js b/devtools/client/tilt/test/browser_tilt_utils04.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils04.js
rename to devtools/client/tilt/test/browser_tilt_utils04.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils05.js b/devtools/client/tilt/test/browser_tilt_utils05.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils05.js
rename to devtools/client/tilt/test/browser_tilt_utils05.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils06.js b/devtools/client/tilt/test/browser_tilt_utils06.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils06.js
rename to devtools/client/tilt/test/browser_tilt_utils06.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils07.js b/devtools/client/tilt/test/browser_tilt_utils07.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils07.js
rename to devtools/client/tilt/test/browser_tilt_utils07.js
diff --git a/browser/devtools/tilt/test/browser_tilt_utils08.js b/devtools/client/tilt/test/browser_tilt_utils08.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_utils08.js
rename to devtools/client/tilt/test/browser_tilt_utils08.js
diff --git a/browser/devtools/tilt/test/browser_tilt_visualizer.js b/devtools/client/tilt/test/browser_tilt_visualizer.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_visualizer.js
rename to devtools/client/tilt/test/browser_tilt_visualizer.js
diff --git a/browser/devtools/tilt/test/browser_tilt_zoom.js b/devtools/client/tilt/test/browser_tilt_zoom.js
similarity index 100%
rename from browser/devtools/tilt/test/browser_tilt_zoom.js
rename to devtools/client/tilt/test/browser_tilt_zoom.js
diff --git a/browser/devtools/tilt/test/head.js b/devtools/client/tilt/test/head.js
similarity index 100%
rename from browser/devtools/tilt/test/head.js
rename to devtools/client/tilt/test/head.js
diff --git a/browser/devtools/tilt/tilt-commands.js b/devtools/client/tilt/tilt-commands.js
similarity index 100%
rename from browser/devtools/tilt/tilt-commands.js
rename to devtools/client/tilt/tilt-commands.js
diff --git a/browser/devtools/tilt/tilt-gl.js b/devtools/client/tilt/tilt-gl.js
similarity index 100%
rename from browser/devtools/tilt/tilt-gl.js
rename to devtools/client/tilt/tilt-gl.js
diff --git a/browser/devtools/tilt/tilt-math.js b/devtools/client/tilt/tilt-math.js
similarity index 100%
rename from browser/devtools/tilt/tilt-math.js
rename to devtools/client/tilt/tilt-math.js
diff --git a/browser/devtools/tilt/tilt-utils.js b/devtools/client/tilt/tilt-utils.js
similarity index 100%
rename from browser/devtools/tilt/tilt-utils.js
rename to devtools/client/tilt/tilt-utils.js
diff --git a/browser/devtools/tilt/tilt-visualizer-style.js b/devtools/client/tilt/tilt-visualizer-style.js
similarity index 100%
rename from browser/devtools/tilt/tilt-visualizer-style.js
rename to devtools/client/tilt/tilt-visualizer-style.js
diff --git a/browser/devtools/tilt/tilt-visualizer.js b/devtools/client/tilt/tilt-visualizer.js
similarity index 100%
rename from browser/devtools/tilt/tilt-visualizer.js
rename to devtools/client/tilt/tilt-visualizer.js
diff --git a/browser/devtools/tilt/tilt.js b/devtools/client/tilt/tilt.js
similarity index 100%
rename from browser/devtools/tilt/tilt.js
rename to devtools/client/tilt/tilt.js
diff --git a/browser/devtools/webaudioeditor/controller.js b/devtools/client/webaudioeditor/controller.js
similarity index 100%
rename from browser/devtools/webaudioeditor/controller.js
rename to devtools/client/webaudioeditor/controller.js
diff --git a/browser/devtools/webaudioeditor/includes.js b/devtools/client/webaudioeditor/includes.js
similarity index 100%
rename from browser/devtools/webaudioeditor/includes.js
rename to devtools/client/webaudioeditor/includes.js
diff --git a/browser/devtools/webaudioeditor/models.js b/devtools/client/webaudioeditor/models.js
similarity index 100%
rename from browser/devtools/webaudioeditor/models.js
rename to devtools/client/webaudioeditor/models.js
diff --git a/browser/devtools/webaudioeditor/moz.build b/devtools/client/webaudioeditor/moz.build
similarity index 100%
rename from browser/devtools/webaudioeditor/moz.build
rename to devtools/client/webaudioeditor/moz.build
diff --git a/browser/devtools/webaudioeditor/panel.js b/devtools/client/webaudioeditor/panel.js
similarity index 100%
rename from browser/devtools/webaudioeditor/panel.js
rename to devtools/client/webaudioeditor/panel.js
diff --git a/browser/devtools/webaudioeditor/test/.eslintrc b/devtools/client/webaudioeditor/test/.eslintrc
similarity index 100%
rename from browser/devtools/webaudioeditor/test/.eslintrc
rename to devtools/client/webaudioeditor/test/.eslintrc
diff --git a/browser/devtools/webaudioeditor/test/440hz_sine.ogg b/devtools/client/webaudioeditor/test/440hz_sine.ogg
similarity index 100%
rename from browser/devtools/webaudioeditor/test/440hz_sine.ogg
rename to devtools/client/webaudioeditor/test/440hz_sine.ogg
diff --git a/browser/devtools/webaudioeditor/test/browser.ini b/devtools/client/webaudioeditor/test/browser.ini
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser.ini
rename to devtools/client/webaudioeditor/test/browser.ini
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-add-automation-event.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-add-automation-event.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-add-automation-event.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-add-automation-event.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-bypass.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-bypass.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-bypass.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-bypass.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-bypassable.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-bypassable.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-bypassable.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-bypassable.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-connectparam.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-connectparam.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-connectparam.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-connectparam.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-automation-data-03.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-param-flags.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-param-flags.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-param-flags.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-param-flags.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-01.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-01.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-02.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-params-02.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-params-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-get-set-param.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-get-set-param.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-get-set-param.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-get-set-param.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-source.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-source.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-source.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-source.js
diff --git a/browser/devtools/webaudioeditor/test/browser_audionode-actor-type.js b/devtools/client/webaudioeditor/test/browser_audionode-actor-type.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_audionode-actor-type.js
rename to devtools/client/webaudioeditor/test/browser_audionode-actor-type.js
diff --git a/browser/devtools/webaudioeditor/test/browser_callwatcher-01.js b/devtools/client/webaudioeditor/test/browser_callwatcher-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_callwatcher-01.js
rename to devtools/client/webaudioeditor/test/browser_callwatcher-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js b/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_callwatcher-02.js
rename to devtools/client/webaudioeditor/test/browser_callwatcher-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_automation-view-01.js b/devtools/client/webaudioeditor/test/browser_wa_automation-view-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_automation-view-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_automation-view-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_automation-view-02.js b/devtools/client/webaudioeditor/test/browser_wa_automation-view-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_automation-view-02.js
rename to devtools/client/webaudioeditor/test/browser_wa_automation-view-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_controller-01.js b/devtools/client/webaudioeditor/test/browser_wa_controller-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_controller-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_controller-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_destroy-node-01.js b/devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_destroy-node-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_first-run.js b/devtools/client/webaudioeditor/test/browser_wa_first-run.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_first-run.js
rename to devtools/client/webaudioeditor/test/browser_wa_first-run.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-click.js b/devtools/client/webaudioeditor/test/browser_wa_graph-click.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-click.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-click.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-markers.js b/devtools/client/webaudioeditor/test/browser_wa_graph-markers.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-markers.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-markers.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-render-01.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-render-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-render-02.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-render-02.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-render-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-render-03.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-render-03.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-render-04.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-04.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-render-04.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-render-04.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-render-05.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-05.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-render-05.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-render-05.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-render-06.js b/devtools/client/webaudioeditor/test/browser_wa_graph-render-06.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-render-06.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-render-06.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-selected.js b/devtools/client/webaudioeditor/test/browser_wa_graph-selected.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-selected.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-selected.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_graph-zoom.js b/devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_graph-zoom.js
rename to devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_inspector-bypass-01.js b/devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_inspector-bypass-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js b/devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js
rename to devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js b/devtools/client/webaudioeditor/test/browser_wa_inspector-width.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js
rename to devtools/client/webaudioeditor/test/browser_wa_inspector-width.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_inspector.js b/devtools/client/webaudioeditor/test/browser_wa_inspector.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_inspector.js
rename to devtools/client/webaudioeditor/test/browser_wa_inspector.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_navigate.js b/devtools/client/webaudioeditor/test/browser_wa_navigate.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_navigate.js
rename to devtools/client/webaudioeditor/test/browser_wa_navigate.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_properties-view-edit-01.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_properties-view-edit-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_properties-view-edit-02.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_properties-view-edit-02.js
rename to devtools/client/webaudioeditor/test/browser_wa_properties-view-edit-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_properties-view-media-nodes.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
rename to devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_properties-view-params-objects.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_properties-view-params-objects.js
rename to devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_properties-view-params.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_properties-view-params.js
rename to devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_properties-view.js b/devtools/client/webaudioeditor/test/browser_wa_properties-view.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_properties-view.js
rename to devtools/client/webaudioeditor/test/browser_wa_properties-view.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_reset-01.js b/devtools/client/webaudioeditor/test/browser_wa_reset-01.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_reset-01.js
rename to devtools/client/webaudioeditor/test/browser_wa_reset-01.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_reset-02.js b/devtools/client/webaudioeditor/test/browser_wa_reset-02.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_reset-02.js
rename to devtools/client/webaudioeditor/test/browser_wa_reset-02.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_reset-03.js b/devtools/client/webaudioeditor/test/browser_wa_reset-03.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_reset-03.js
rename to devtools/client/webaudioeditor/test/browser_wa_reset-03.js
diff --git a/browser/devtools/webaudioeditor/test/browser_wa_reset-04.js b/devtools/client/webaudioeditor/test/browser_wa_reset-04.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_wa_reset-04.js
rename to devtools/client/webaudioeditor/test/browser_wa_reset-04.js
diff --git a/browser/devtools/webaudioeditor/test/browser_webaudio-actor-automation-event.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-automation-event.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_webaudio-actor-automation-event.js
rename to devtools/client/webaudioeditor/test/browser_webaudio-actor-automation-event.js
diff --git a/browser/devtools/webaudioeditor/test/browser_webaudio-actor-connect-param.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-connect-param.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_webaudio-actor-connect-param.js
rename to devtools/client/webaudioeditor/test/browser_webaudio-actor-connect-param.js
diff --git a/browser/devtools/webaudioeditor/test/browser_webaudio-actor-destroy-node.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
rename to devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js
diff --git a/browser/devtools/webaudioeditor/test/browser_webaudio-actor-simple.js b/devtools/client/webaudioeditor/test/browser_webaudio-actor-simple.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/browser_webaudio-actor-simple.js
rename to devtools/client/webaudioeditor/test/browser_webaudio-actor-simple.js
diff --git a/browser/devtools/webaudioeditor/test/doc_automation.html b/devtools/client/webaudioeditor/test/doc_automation.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_automation.html
rename to devtools/client/webaudioeditor/test/doc_automation.html
diff --git a/browser/devtools/webaudioeditor/test/doc_buffer-and-array.html b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_buffer-and-array.html
rename to devtools/client/webaudioeditor/test/doc_buffer-and-array.html
diff --git a/browser/devtools/webaudioeditor/test/doc_bug_1112378.html b/devtools/client/webaudioeditor/test/doc_bug_1112378.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_bug_1112378.html
rename to devtools/client/webaudioeditor/test/doc_bug_1112378.html
diff --git a/browser/devtools/webaudioeditor/test/doc_bug_1125817.html b/devtools/client/webaudioeditor/test/doc_bug_1125817.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_bug_1125817.html
rename to devtools/client/webaudioeditor/test/doc_bug_1125817.html
diff --git a/browser/devtools/webaudioeditor/test/doc_bug_1130901.html b/devtools/client/webaudioeditor/test/doc_bug_1130901.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_bug_1130901.html
rename to devtools/client/webaudioeditor/test/doc_bug_1130901.html
diff --git a/browser/devtools/webaudioeditor/test/doc_bug_1141261.html b/devtools/client/webaudioeditor/test/doc_bug_1141261.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_bug_1141261.html
rename to devtools/client/webaudioeditor/test/doc_bug_1141261.html
diff --git a/browser/devtools/webaudioeditor/test/doc_complex-context.html b/devtools/client/webaudioeditor/test/doc_complex-context.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_complex-context.html
rename to devtools/client/webaudioeditor/test/doc_complex-context.html
diff --git a/browser/devtools/webaudioeditor/test/doc_connect-multi-param.html b/devtools/client/webaudioeditor/test/doc_connect-multi-param.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_connect-multi-param.html
rename to devtools/client/webaudioeditor/test/doc_connect-multi-param.html
diff --git a/browser/devtools/webaudioeditor/test/doc_connect-param.html b/devtools/client/webaudioeditor/test/doc_connect-param.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_connect-param.html
rename to devtools/client/webaudioeditor/test/doc_connect-param.html
diff --git a/browser/devtools/webaudioeditor/test/doc_destroy-nodes.html b/devtools/client/webaudioeditor/test/doc_destroy-nodes.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_destroy-nodes.html
rename to devtools/client/webaudioeditor/test/doc_destroy-nodes.html
diff --git a/browser/devtools/webaudioeditor/test/doc_iframe-context.html b/devtools/client/webaudioeditor/test/doc_iframe-context.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_iframe-context.html
rename to devtools/client/webaudioeditor/test/doc_iframe-context.html
diff --git a/browser/devtools/webaudioeditor/test/doc_media-node-creation.html b/devtools/client/webaudioeditor/test/doc_media-node-creation.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_media-node-creation.html
rename to devtools/client/webaudioeditor/test/doc_media-node-creation.html
diff --git a/browser/devtools/webaudioeditor/test/doc_simple-context.html b/devtools/client/webaudioeditor/test/doc_simple-context.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_simple-context.html
rename to devtools/client/webaudioeditor/test/doc_simple-context.html
diff --git a/browser/devtools/webaudioeditor/test/doc_simple-node-creation.html b/devtools/client/webaudioeditor/test/doc_simple-node-creation.html
similarity index 100%
rename from browser/devtools/webaudioeditor/test/doc_simple-node-creation.html
rename to devtools/client/webaudioeditor/test/doc_simple-node-creation.html
diff --git a/browser/devtools/webaudioeditor/test/head.js b/devtools/client/webaudioeditor/test/head.js
similarity index 100%
rename from browser/devtools/webaudioeditor/test/head.js
rename to devtools/client/webaudioeditor/test/head.js
diff --git a/browser/devtools/webaudioeditor/views/automation.js b/devtools/client/webaudioeditor/views/automation.js
similarity index 100%
rename from browser/devtools/webaudioeditor/views/automation.js
rename to devtools/client/webaudioeditor/views/automation.js
diff --git a/browser/devtools/webaudioeditor/views/context.js b/devtools/client/webaudioeditor/views/context.js
similarity index 100%
rename from browser/devtools/webaudioeditor/views/context.js
rename to devtools/client/webaudioeditor/views/context.js
diff --git a/browser/devtools/webaudioeditor/views/inspector.js b/devtools/client/webaudioeditor/views/inspector.js
similarity index 100%
rename from browser/devtools/webaudioeditor/views/inspector.js
rename to devtools/client/webaudioeditor/views/inspector.js
diff --git a/browser/devtools/webaudioeditor/views/properties.js b/devtools/client/webaudioeditor/views/properties.js
similarity index 100%
rename from browser/devtools/webaudioeditor/views/properties.js
rename to devtools/client/webaudioeditor/views/properties.js
diff --git a/browser/devtools/webaudioeditor/views/utils.js b/devtools/client/webaudioeditor/views/utils.js
similarity index 100%
rename from browser/devtools/webaudioeditor/views/utils.js
rename to devtools/client/webaudioeditor/views/utils.js
diff --git a/browser/devtools/webaudioeditor/webaudioeditor.xul b/devtools/client/webaudioeditor/webaudioeditor.xul
similarity index 100%
rename from browser/devtools/webaudioeditor/webaudioeditor.xul
rename to devtools/client/webaudioeditor/webaudioeditor.xul
diff --git a/browser/devtools/webconsole/console-commands.js b/devtools/client/webconsole/console-commands.js
similarity index 100%
rename from browser/devtools/webconsole/console-commands.js
rename to devtools/client/webconsole/console-commands.js
diff --git a/browser/devtools/webconsole/console-output.js b/devtools/client/webconsole/console-output.js
similarity index 100%
rename from browser/devtools/webconsole/console-output.js
rename to devtools/client/webconsole/console-output.js
diff --git a/browser/devtools/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js
similarity index 100%
rename from browser/devtools/webconsole/hudservice.js
rename to devtools/client/webconsole/hudservice.js
diff --git a/browser/devtools/webconsole/moz.build b/devtools/client/webconsole/moz.build
similarity index 100%
rename from browser/devtools/webconsole/moz.build
rename to devtools/client/webconsole/moz.build
diff --git a/browser/devtools/webconsole/panel.js b/devtools/client/webconsole/panel.js
similarity index 100%
rename from browser/devtools/webconsole/panel.js
rename to devtools/client/webconsole/panel.js
diff --git a/browser/devtools/webconsole/test/.eslintrc b/devtools/client/webconsole/test/.eslintrc
similarity index 100%
rename from browser/devtools/webconsole/test/.eslintrc
rename to devtools/client/webconsole/test/.eslintrc
diff --git a/browser/devtools/webconsole/test/browser.ini b/devtools/client/webconsole/test/browser.ini
similarity index 100%
rename from browser/devtools/webconsole/test/browser.ini
rename to devtools/client/webconsole/test/browser.ini
diff --git a/browser/devtools/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js b/devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js
rename to devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js
diff --git a/browser/devtools/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js b/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
rename to devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
diff --git a/browser/devtools/webconsole/test/browser_bug_638949_copy_link_location.js b/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug_638949_copy_link_location.js
rename to devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
diff --git a/browser/devtools/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js b/devtools/client/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js
rename to devtools/client/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js
diff --git a/browser/devtools/webconsole/test/browser_bug_865288_repeat_different_objects.js b/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug_865288_repeat_different_objects.js
rename to devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
diff --git a/browser/devtools/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js b/devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js
rename to devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js
diff --git a/browser/devtools/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js b/devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js
rename to devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js
diff --git a/browser/devtools/webconsole/test/browser_bug_871156_ctrlw_close_tab.js b/devtools/client/webconsole/test/browser_bug_871156_ctrlw_close_tab.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_bug_871156_ctrlw_close_tab.js
rename to devtools/client/webconsole/test/browser_bug_871156_ctrlw_close_tab.js
diff --git a/browser/devtools/webconsole/test/browser_cached_messages.js b/devtools/client/webconsole/test/browser_cached_messages.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_cached_messages.js
rename to devtools/client/webconsole/test/browser_cached_messages.js
diff --git a/browser/devtools/webconsole/test/browser_console.js b/devtools/client/webconsole/test/browser_console.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console.js
rename to devtools/client/webconsole/test/browser_console.js
diff --git a/browser/devtools/webconsole/test/browser_console_addonsdk_loader_exception.js b/devtools/client/webconsole/test/browser_console_addonsdk_loader_exception.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_addonsdk_loader_exception.js
rename to devtools/client/webconsole/test/browser_console_addonsdk_loader_exception.js
diff --git a/browser/devtools/webconsole/test/browser_console_clear_on_reload.js b/devtools/client/webconsole/test/browser_console_clear_on_reload.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_clear_on_reload.js
rename to devtools/client/webconsole/test/browser_console_clear_on_reload.js
diff --git a/browser/devtools/webconsole/test/browser_console_click_focus.js b/devtools/client/webconsole/test/browser_console_click_focus.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_click_focus.js
rename to devtools/client/webconsole/test/browser_console_click_focus.js
diff --git a/browser/devtools/webconsole/test/browser_console_consolejsm_output.js b/devtools/client/webconsole/test/browser_console_consolejsm_output.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_consolejsm_output.js
rename to devtools/client/webconsole/test/browser_console_consolejsm_output.js
diff --git a/browser/devtools/webconsole/test/browser_console_copy_command.js b/devtools/client/webconsole/test/browser_console_copy_command.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_copy_command.js
rename to devtools/client/webconsole/test/browser_console_copy_command.js
diff --git a/browser/devtools/webconsole/test/browser_console_copy_entire_message_context_menu.js b/devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_copy_entire_message_context_menu.js
rename to devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js
diff --git a/browser/devtools/webconsole/test/browser_console_dead_objects.js b/devtools/client/webconsole/test/browser_console_dead_objects.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_dead_objects.js
rename to devtools/client/webconsole/test/browser_console_dead_objects.js
diff --git a/browser/devtools/webconsole/test/browser_console_error_source_click.js b/devtools/client/webconsole/test/browser_console_error_source_click.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_error_source_click.js
rename to devtools/client/webconsole/test/browser_console_error_source_click.js
diff --git a/browser/devtools/webconsole/test/browser_console_filters.js b/devtools/client/webconsole/test/browser_console_filters.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_filters.js
rename to devtools/client/webconsole/test/browser_console_filters.js
diff --git a/browser/devtools/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js b/devtools/client/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js
rename to devtools/client/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js
diff --git a/browser/devtools/webconsole/test/browser_console_history_persist.js b/devtools/client/webconsole/test/browser_console_history_persist.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_history_persist.js
rename to devtools/client/webconsole/test/browser_console_history_persist.js
diff --git a/browser/devtools/webconsole/test/browser_console_iframe_messages.js b/devtools/client/webconsole/test/browser_console_iframe_messages.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_iframe_messages.js
rename to devtools/client/webconsole/test/browser_console_iframe_messages.js
diff --git a/browser/devtools/webconsole/test/browser_console_keyboard_accessibility.js b/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_keyboard_accessibility.js
rename to devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
diff --git a/browser/devtools/webconsole/test/browser_console_log_inspectable_object.js b/devtools/client/webconsole/test/browser_console_log_inspectable_object.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_log_inspectable_object.js
rename to devtools/client/webconsole/test/browser_console_log_inspectable_object.js
diff --git a/browser/devtools/webconsole/test/browser_console_native_getters.js b/devtools/client/webconsole/test/browser_console_native_getters.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_native_getters.js
rename to devtools/client/webconsole/test/browser_console_native_getters.js
diff --git a/browser/devtools/webconsole/test/browser_console_navigation_marker.js b/devtools/client/webconsole/test/browser_console_navigation_marker.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_navigation_marker.js
rename to devtools/client/webconsole/test/browser_console_navigation_marker.js
diff --git a/browser/devtools/webconsole/test/browser_console_nsiconsolemessage.js b/devtools/client/webconsole/test/browser_console_nsiconsolemessage.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_nsiconsolemessage.js
rename to devtools/client/webconsole/test/browser_console_nsiconsolemessage.js
diff --git a/browser/devtools/webconsole/test/browser_console_open_or_focus.js b/devtools/client/webconsole/test/browser_console_open_or_focus.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_open_or_focus.js
rename to devtools/client/webconsole/test/browser_console_open_or_focus.js
diff --git a/browser/devtools/webconsole/test/browser_console_optimized_out_vars.js b/devtools/client/webconsole/test/browser_console_optimized_out_vars.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_optimized_out_vars.js
rename to devtools/client/webconsole/test/browser_console_optimized_out_vars.js
diff --git a/browser/devtools/webconsole/test/browser_console_private_browsing.js b/devtools/client/webconsole/test/browser_console_private_browsing.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_private_browsing.js
rename to devtools/client/webconsole/test/browser_console_private_browsing.js
diff --git a/browser/devtools/webconsole/test/browser_console_server_logging.js b/devtools/client/webconsole/test/browser_console_server_logging.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_server_logging.js
rename to devtools/client/webconsole/test/browser_console_server_logging.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view.js b/devtools/client/webconsole/test/browser_console_variables_view.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view.js
rename to devtools/client/webconsole/test/browser_console_variables_view.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view_dom_nodes.js b/devtools/client/webconsole/test/browser_console_variables_view_dom_nodes.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view_dom_nodes.js
rename to devtools/client/webconsole/test/browser_console_variables_view_dom_nodes.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js b/devtools/client/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js
rename to devtools/client/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view_filter.js b/devtools/client/webconsole/test/browser_console_variables_view_filter.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view_filter.js
rename to devtools/client/webconsole/test/browser_console_variables_view_filter.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view_highlighter.js b/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view_highlighter.js
rename to devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view_while_debugging.js b/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view_while_debugging.js
rename to devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
diff --git a/browser/devtools/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js b/devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js
rename to devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js
diff --git a/browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe.js b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe.js
rename to devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
diff --git a/browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe2.js b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe2.js
rename to devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
diff --git a/browser/devtools/webconsole/test/browser_jsterm_inspect.js b/devtools/client/webconsole/test/browser_jsterm_inspect.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_jsterm_inspect.js
rename to devtools/client/webconsole/test/browser_jsterm_inspect.js
diff --git a/browser/devtools/webconsole/test/browser_longstring_hang.js b/devtools/client/webconsole/test/browser_longstring_hang.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_longstring_hang.js
rename to devtools/client/webconsole/test/browser_longstring_hang.js
diff --git a/browser/devtools/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js b/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
rename to devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
diff --git a/browser/devtools/webconsole/test/browser_output_breaks_after_console_dir_uninspectable.js b/devtools/client/webconsole/test/browser_output_breaks_after_console_dir_uninspectable.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_output_breaks_after_console_dir_uninspectable.js
rename to devtools/client/webconsole/test/browser_output_breaks_after_console_dir_uninspectable.js
diff --git a/browser/devtools/webconsole/test/browser_output_longstring_expand.js b/devtools/client/webconsole/test/browser_output_longstring_expand.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_output_longstring_expand.js
rename to devtools/client/webconsole/test/browser_output_longstring_expand.js
diff --git a/browser/devtools/webconsole/test/browser_repeated_messages_accuracy.js b/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_repeated_messages_accuracy.js
rename to devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
diff --git a/browser/devtools/webconsole/test/browser_result_format_as_string.js b/devtools/client/webconsole/test/browser_result_format_as_string.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_result_format_as_string.js
rename to devtools/client/webconsole/test/browser_result_format_as_string.js
diff --git a/browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js b/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js
rename to devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_abbreviate_source_url.js b/devtools/client/webconsole/test/browser_webconsole_abbreviate_source_url.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_abbreviate_source_url.js
rename to devtools/client/webconsole/test/browser_webconsole_abbreviate_source_url.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
rename to devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_assert.js b/devtools/client/webconsole/test/browser_webconsole_assert.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_assert.js
rename to devtools/client/webconsole/test/browser_webconsole_assert.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js
rename to devtools/client/webconsole/test/browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js
rename to devtools/client/webconsole/test/browser_webconsole_autocomplete_and_selfxss.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
rename to devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
rename to devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js
rename to devtools/client/webconsole/test/browser_webconsole_autocomplete_popup_close_on_tab_switch.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_basic_net_logging.js b/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_basic_net_logging.js
rename to devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
rename to devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js b/devtools/client/webconsole/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_1006027_message_timestamps_incorrect.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_1010953_cspro.js b/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_1010953_cspro.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js b/devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_578437_page_reload.js b/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_578437_page_reload.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_579412_input_focus.js b/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_579412_input_focus.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js b/devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js b/devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js b/devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js b/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js b/devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585237_line_limit.js b/devtools/client/webconsole/test/browser_webconsole_bug_585237_line_limit.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_585237_line_limit.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_585237_line_limit.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585956_console_trace.js b/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_585956_console_trace.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js b/devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js b/devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_586388_select_all.js b/devtools/client/webconsole/test/browser_webconsole_bug_586388_select_all.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_586388_select_all.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_586388_select_all.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_587617_output_copy.js b/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_587617_output_copy.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_588342_document_focus.js b/devtools/client/webconsole/test/browser_webconsole_bug_588342_document_focus.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_588342_document_focus.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_588342_document_focus.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js b/devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_588967_input_expansion.js b/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_589162_css_filter.js b/devtools/client/webconsole/test/browser_webconsole_bug_589162_css_filter.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_589162_css_filter.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_589162_css_filter.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js b/devtools/client/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js b/devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js b/devtools/client/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_595223_file_uri.js b/devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_595223_file_uri.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_595223_file_uri.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js b/devtools/client/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js b/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js b/devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js b/devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js b/devtools/client/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js b/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js b/devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_599725_response_headers.js b/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_599725_response_headers.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_600183_charset.js b/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_600183_charset.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_601177_log_levels.js b/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_601177_log_levels.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_601352_scroll.js b/devtools/client/webconsole/test/browser_webconsole_bug_601352_scroll.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_601352_scroll.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_601352_scroll.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js b/devtools/client/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_603750_websocket.js b/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_603750_websocket.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_611795.js b/devtools/client/webconsole/test/browser_webconsole_bug_611795.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_611795.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_611795.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js b/devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js b/devtools/client/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js b/devtools/client/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_613642_prune_scroll.js b/devtools/client/webconsole/test/browser_webconsole_bug_613642_prune_scroll.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_613642_prune_scroll.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_613642_prune_scroll.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js b/devtools/client/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js b/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js b/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js b/devtools/client/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js b/devtools/client/webconsole/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js b/devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js b/devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js b/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_632817.js b/devtools/client/webconsole/test/browser_webconsole_bug_632817.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_632817.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_632817.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_642108_pruneTest.js b/devtools/client/webconsole/test/browser_webconsole_bug_642108_pruneTest.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_642108_pruneTest.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_642108_pruneTest.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js b/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_646025_console_file_location.js b/devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_646025_console_file_location.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js b/devtools/client/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js b/devtools/client/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js b/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_659907_console_dir.js b/devtools/client/webconsole/test/browser_webconsole_bug_659907_console_dir.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_659907_console_dir.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_659907_console_dir.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js b/devtools/client/webconsole/test/browser_webconsole_bug_660806_history_nav.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_660806_history_nav.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_664131_console_group.js b/devtools/client/webconsole/test/browser_webconsole_bug_664131_console_group.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_664131_console_group.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_664131_console_group.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_686937_autocomplete_JSTerm_helpers.js b/devtools/client/webconsole/test/browser_webconsole_bug_686937_autocomplete_JSTerm_helpers.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_686937_autocomplete_JSTerm_helpers.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_686937_autocomplete_JSTerm_helpers.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_704295.js b/devtools/client/webconsole/test/browser_webconsole_bug_704295.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_704295.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_704295.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js b/devtools/client/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js b/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js b/devtools/client/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js b/devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js b/devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_764572_output_open_url.js b/devtools/client/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js b/devtools/client/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_770099_violation.js b/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_770099_violation.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js b/devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_804845_ctrl_key_nav.js b/devtools/client/webconsole/test/browser_webconsole_bug_804845_ctrl_key_nav.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_804845_ctrl_key_nav.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_804845_ctrl_key_nav.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_817834_add_edited_input_to_history.js b/devtools/client/webconsole/test/browser_webconsole_bug_817834_add_edited_input_to_history.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_817834_add_edited_input_to_history.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_817834_add_edited_input_to_history.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_837351_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_915141_toggle_response_logging_with_keyboard.js b/devtools/client/webconsole/test/browser_webconsole_bug_915141_toggle_response_logging_with_keyboard.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_915141_toggle_response_logging_with_keyboard.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_915141_toggle_response_logging_with_keyboard.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_922212_console_dirxml.js b/devtools/client/webconsole/test/browser_webconsole_bug_922212_console_dirxml.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_bug_922212_console_dirxml.js
rename to devtools/client/webconsole/test/browser_webconsole_bug_922212_console_dirxml.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_cached_autocomplete.js b/devtools/client/webconsole/test/browser_webconsole_cached_autocomplete.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_cached_autocomplete.js
rename to devtools/client/webconsole/test/browser_webconsole_cached_autocomplete.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_cd_iframe.js b/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_cd_iframe.js
rename to devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_certificate_messages.js b/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_certificate_messages.js
rename to devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_change_font_size.js b/devtools/client/webconsole/test/browser_webconsole_change_font_size.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_change_font_size.js
rename to devtools/client/webconsole/test/browser_webconsole_change_font_size.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_chrome.js b/devtools/client/webconsole/test/browser_webconsole_chrome.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_chrome.js
rename to devtools/client/webconsole/test/browser_webconsole_chrome.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js b/devtools/client/webconsole/test/browser_webconsole_clickable_urls.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js
rename to devtools/client/webconsole/test/browser_webconsole_clickable_urls.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js b/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js
rename to devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_column_numbers.js b/devtools/client/webconsole/test/browser_webconsole_column_numbers.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_column_numbers.js
rename to devtools/client/webconsole/test/browser_webconsole_column_numbers.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_completion.js b/devtools/client/webconsole/test/browser_webconsole_completion.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_completion.js
rename to devtools/client/webconsole/test/browser_webconsole_completion.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_api_stackframe.js b/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_console_api_stackframe.js
rename to devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_custom_styles.js b/devtools/client/webconsole/test/browser_webconsole_console_custom_styles.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_console_custom_styles.js
rename to devtools/client/webconsole/test/browser_webconsole_console_custom_styles.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_extras.js b/devtools/client/webconsole/test/browser_webconsole_console_extras.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_console_extras.js
rename to devtools/client/webconsole/test/browser_webconsole_console_extras.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_logging_api.js b/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_console_logging_api.js
rename to devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_logging_workers_api.js b/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_console_logging_workers_api.js
rename to devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_trace_duplicates.js b/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_console_trace_duplicates.js
rename to devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js b/devtools/client/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js
rename to devtools/client/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_count.js b/devtools/client/webconsole/test/browser_webconsole_count.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_count.js
rename to devtools/client/webconsole/test/browser_webconsole_count.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js b/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
rename to devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_exception_stackframe.js b/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_exception_stackframe.js
rename to devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_execution_scope.js b/devtools/client/webconsole/test/browser_webconsole_execution_scope.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_execution_scope.js
rename to devtools/client/webconsole/test/browser_webconsole_execution_scope.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_expandable_timestamps.js b/devtools/client/webconsole/test/browser_webconsole_expandable_timestamps.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_expandable_timestamps.js
rename to devtools/client/webconsole/test/browser_webconsole_expandable_timestamps.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_filter_buttons_contextmenu.js b/devtools/client/webconsole/test/browser_webconsole_filter_buttons_contextmenu.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_filter_buttons_contextmenu.js
rename to devtools/client/webconsole/test/browser_webconsole_filter_buttons_contextmenu.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_for_of.js b/devtools/client/webconsole/test/browser_webconsole_for_of.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_for_of.js
rename to devtools/client/webconsole/test/browser_webconsole_for_of.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_history.js b/devtools/client/webconsole/test/browser_webconsole_history.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_history.js
rename to devtools/client/webconsole/test/browser_webconsole_history.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_hpkp_invalid-headers.js b/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
rename to devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_hsts_invalid-headers.js b/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_hsts_invalid-headers.js
rename to devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_input_field_focus_on_panel_select.js b/devtools/client/webconsole/test/browser_webconsole_input_field_focus_on_panel_select.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_input_field_focus_on_panel_select.js
rename to devtools/client/webconsole/test/browser_webconsole_input_field_focus_on_panel_select.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_inspect-parsed-documents.js b/devtools/client/webconsole/test/browser_webconsole_inspect-parsed-documents.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_inspect-parsed-documents.js
rename to devtools/client/webconsole/test/browser_webconsole_inspect-parsed-documents.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_js_input_expansion.js b/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_js_input_expansion.js
rename to devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_jsterm.js b/devtools/client/webconsole/test/browser_webconsole_jsterm.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_jsterm.js
rename to devtools/client/webconsole/test/browser_webconsole_jsterm.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_live_filtering_of_message_types.js b/devtools/client/webconsole/test/browser_webconsole_live_filtering_of_message_types.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_live_filtering_of_message_types.js
rename to devtools/client/webconsole/test/browser_webconsole_live_filtering_of_message_types.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js b/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
rename to devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_log_file_filter.js b/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_log_file_filter.js
rename to devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_message_node_id.js b/devtools/client/webconsole/test/browser_webconsole_message_node_id.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_message_node_id.js
rename to devtools/client/webconsole/test/browser_webconsole_message_node_id.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_netlogging.js b/devtools/client/webconsole/test/browser_webconsole_netlogging.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_netlogging.js
rename to devtools/client/webconsole/test/browser_webconsole_netlogging.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_netlogging_reset_filter.js b/devtools/client/webconsole/test/browser_webconsole_netlogging_reset_filter.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_netlogging_reset_filter.js
rename to devtools/client/webconsole/test/browser_webconsole_netlogging_reset_filter.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_notifications.js b/devtools/client/webconsole/test/browser_webconsole_notifications.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_notifications.js
rename to devtools/client/webconsole/test/browser_webconsole_notifications.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_open-links-without-callback.js b/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_open-links-without-callback.js
rename to devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_01.js b/devtools/client/webconsole/test/browser_webconsole_output_01.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_01.js
rename to devtools/client/webconsole/test/browser_webconsole_output_01.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_02.js b/devtools/client/webconsole/test/browser_webconsole_output_02.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_02.js
rename to devtools/client/webconsole/test/browser_webconsole_output_02.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_03.js b/devtools/client/webconsole/test/browser_webconsole_output_03.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_03.js
rename to devtools/client/webconsole/test/browser_webconsole_output_03.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_04.js b/devtools/client/webconsole/test/browser_webconsole_output_04.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_04.js
rename to devtools/client/webconsole/test/browser_webconsole_output_04.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_05.js b/devtools/client/webconsole/test/browser_webconsole_output_05.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_05.js
rename to devtools/client/webconsole/test/browser_webconsole_output_05.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_06.js b/devtools/client/webconsole/test/browser_webconsole_output_06.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_06.js
rename to devtools/client/webconsole/test/browser_webconsole_output_06.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_copy_newlines.js b/devtools/client/webconsole/test/browser_webconsole_output_copy_newlines.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_copy_newlines.js
rename to devtools/client/webconsole/test/browser_webconsole_output_copy_newlines.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_01.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_01.js
rename to devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_02.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_02.js
rename to devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_03.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_03.js
rename to devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_04.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_04.js
rename to devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_events.js b/devtools/client/webconsole/test/browser_webconsole_output_events.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_events.js
rename to devtools/client/webconsole/test/browser_webconsole_output_events.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_order.js b/devtools/client/webconsole/test/browser_webconsole_output_order.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_order.js
rename to devtools/client/webconsole/test/browser_webconsole_output_order.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_regexp.js b/devtools/client/webconsole/test/browser_webconsole_output_regexp.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_regexp.js
rename to devtools/client/webconsole/test/browser_webconsole_output_regexp.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_table.js b/devtools/client/webconsole/test/browser_webconsole_output_table.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_output_table.js
rename to devtools/client/webconsole/test/browser_webconsole_output_table.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_promise.js b/devtools/client/webconsole/test/browser_webconsole_promise.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_promise.js
rename to devtools/client/webconsole/test/browser_webconsole_promise.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_property_provider.js b/devtools/client/webconsole/test/browser_webconsole_property_provider.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_property_provider.js
rename to devtools/client/webconsole/test/browser_webconsole_property_provider.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_reflow.js b/devtools/client/webconsole/test/browser_webconsole_reflow.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_reflow.js
rename to devtools/client/webconsole/test/browser_webconsole_reflow.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_scratchpad_panel_link.js b/devtools/client/webconsole/test/browser_webconsole_scratchpad_panel_link.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_scratchpad_panel_link.js
rename to devtools/client/webconsole/test/browser_webconsole_scratchpad_panel_link.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_show_subresource_security_errors.js b/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_show_subresource_security_errors.js
rename to devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js b/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
rename to devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_split.js b/devtools/client/webconsole/test/browser_webconsole_split.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_split.js
rename to devtools/client/webconsole/test/browser_webconsole_split.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_split_escape_key.js b/devtools/client/webconsole/test/browser_webconsole_split_escape_key.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_split_escape_key.js
rename to devtools/client/webconsole/test/browser_webconsole_split_escape_key.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_split_focus.js b/devtools/client/webconsole/test/browser_webconsole_split_focus.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_split_focus.js
rename to devtools/client/webconsole/test/browser_webconsole_split_focus.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_split_persist.js b/devtools/client/webconsole/test/browser_webconsole_split_persist.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_split_persist.js
rename to devtools/client/webconsole/test/browser_webconsole_split_persist.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_start_netmon_first.js b/devtools/client/webconsole/test/browser_webconsole_start_netmon_first.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_start_netmon_first.js
rename to devtools/client/webconsole/test/browser_webconsole_start_netmon_first.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_trackingprotection_errors.js b/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_trackingprotection_errors.js
rename to devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
diff --git a/browser/devtools/webconsole/test/browser_webconsole_view_source.js b/devtools/client/webconsole/test/browser_webconsole_view_source.js
similarity index 100%
rename from browser/devtools/webconsole/test/browser_webconsole_view_source.js
rename to devtools/client/webconsole/test/browser_webconsole_view_source.js
diff --git a/browser/devtools/webconsole/test/head.js b/devtools/client/webconsole/test/head.js
similarity index 100%
rename from browser/devtools/webconsole/test/head.js
rename to devtools/client/webconsole/test/head.js
diff --git a/browser/devtools/webconsole/test/test-autocomplete-in-stackframe.html b/devtools/client/webconsole/test/test-autocomplete-in-stackframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-autocomplete-in-stackframe.html
rename to devtools/client/webconsole/test/test-autocomplete-in-stackframe.html
diff --git a/browser/devtools/webconsole/test/test-bug-585956-console-trace.html b/devtools/client/webconsole/test/test-bug-585956-console-trace.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-585956-console-trace.html
rename to devtools/client/webconsole/test/test-bug-585956-console-trace.html
diff --git a/browser/devtools/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html b/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html
rename to devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html
diff --git a/browser/devtools/webconsole/test/test-bug-593003-iframe-wrong-hud.html b/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-593003-iframe-wrong-hud.html
rename to devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-canvas-css.html b/devtools/client/webconsole/test/test-bug-595934-canvas-css.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-canvas-css.html
rename to devtools/client/webconsole/test/test-bug-595934-canvas-css.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-canvas-css.js b/devtools/client/webconsole/test/test-bug-595934-canvas-css.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-canvas-css.js
rename to devtools/client/webconsole/test/test-bug-595934-canvas-css.js
diff --git a/browser/devtools/webconsole/test/test-bug-595934-css-loader.css b/devtools/client/webconsole/test/test-bug-595934-css-loader.css
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-css-loader.css
rename to devtools/client/webconsole/test/test-bug-595934-css-loader.css
diff --git a/browser/devtools/webconsole/test/test-bug-595934-css-loader.css^headers^ b/devtools/client/webconsole/test/test-bug-595934-css-loader.css^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-css-loader.css^headers^
rename to devtools/client/webconsole/test/test-bug-595934-css-loader.css^headers^
diff --git a/browser/devtools/webconsole/test/test-bug-595934-css-loader.html b/devtools/client/webconsole/test/test-bug-595934-css-loader.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-css-loader.html
rename to devtools/client/webconsole/test/test-bug-595934-css-loader.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-css-parser.css b/devtools/client/webconsole/test/test-bug-595934-css-parser.css
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-css-parser.css
rename to devtools/client/webconsole/test/test-bug-595934-css-parser.css
diff --git a/browser/devtools/webconsole/test/test-bug-595934-css-parser.html b/devtools/client/webconsole/test/test-bug-595934-css-parser.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-css-parser.html
rename to devtools/client/webconsole/test/test-bug-595934-css-parser.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-empty-getelementbyid.html b/devtools/client/webconsole/test/test-bug-595934-empty-getelementbyid.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-empty-getelementbyid.html
rename to devtools/client/webconsole/test/test-bug-595934-empty-getelementbyid.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-empty-getelementbyid.js b/devtools/client/webconsole/test/test-bug-595934-empty-getelementbyid.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-empty-getelementbyid.js
rename to devtools/client/webconsole/test/test-bug-595934-empty-getelementbyid.js
diff --git a/browser/devtools/webconsole/test/test-bug-595934-html.html b/devtools/client/webconsole/test/test-bug-595934-html.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-html.html
rename to devtools/client/webconsole/test/test-bug-595934-html.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-image.html b/devtools/client/webconsole/test/test-bug-595934-image.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-image.html
rename to devtools/client/webconsole/test/test-bug-595934-image.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-image.jpg b/devtools/client/webconsole/test/test-bug-595934-image.jpg
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-image.jpg
rename to devtools/client/webconsole/test/test-bug-595934-image.jpg
diff --git a/browser/devtools/webconsole/test/test-bug-595934-imagemap.html b/devtools/client/webconsole/test/test-bug-595934-imagemap.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-imagemap.html
rename to devtools/client/webconsole/test/test-bug-595934-imagemap.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-malformedxml-external.html b/devtools/client/webconsole/test/test-bug-595934-malformedxml-external.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-malformedxml-external.html
rename to devtools/client/webconsole/test/test-bug-595934-malformedxml-external.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-malformedxml-external.xml b/devtools/client/webconsole/test/test-bug-595934-malformedxml-external.xml
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-malformedxml-external.xml
rename to devtools/client/webconsole/test/test-bug-595934-malformedxml-external.xml
diff --git a/browser/devtools/webconsole/test/test-bug-595934-malformedxml.xhtml b/devtools/client/webconsole/test/test-bug-595934-malformedxml.xhtml
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-malformedxml.xhtml
rename to devtools/client/webconsole/test/test-bug-595934-malformedxml.xhtml
diff --git a/browser/devtools/webconsole/test/test-bug-595934-svg.xhtml b/devtools/client/webconsole/test/test-bug-595934-svg.xhtml
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-svg.xhtml
rename to devtools/client/webconsole/test/test-bug-595934-svg.xhtml
diff --git a/browser/devtools/webconsole/test/test-bug-595934-workers.html b/devtools/client/webconsole/test/test-bug-595934-workers.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-workers.html
rename to devtools/client/webconsole/test/test-bug-595934-workers.html
diff --git a/browser/devtools/webconsole/test/test-bug-595934-workers.js b/devtools/client/webconsole/test/test-bug-595934-workers.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-595934-workers.js
rename to devtools/client/webconsole/test/test-bug-595934-workers.js
diff --git a/browser/devtools/webconsole/test/test-bug-597136-external-script-errors.html b/devtools/client/webconsole/test/test-bug-597136-external-script-errors.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-597136-external-script-errors.html
rename to devtools/client/webconsole/test/test-bug-597136-external-script-errors.html
diff --git a/browser/devtools/webconsole/test/test-bug-597136-external-script-errors.js b/devtools/client/webconsole/test/test-bug-597136-external-script-errors.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-597136-external-script-errors.js
rename to devtools/client/webconsole/test/test-bug-597136-external-script-errors.js
diff --git a/browser/devtools/webconsole/test/test-bug-597756-reopen-closed-tab.html b/devtools/client/webconsole/test/test-bug-597756-reopen-closed-tab.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-597756-reopen-closed-tab.html
rename to devtools/client/webconsole/test/test-bug-597756-reopen-closed-tab.html
diff --git a/browser/devtools/webconsole/test/test-bug-599725-response-headers.sjs b/devtools/client/webconsole/test/test-bug-599725-response-headers.sjs
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-599725-response-headers.sjs
rename to devtools/client/webconsole/test/test-bug-599725-response-headers.sjs
diff --git a/browser/devtools/webconsole/test/test-bug-600183-charset.html b/devtools/client/webconsole/test/test-bug-600183-charset.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-600183-charset.html
rename to devtools/client/webconsole/test/test-bug-600183-charset.html
diff --git a/browser/devtools/webconsole/test/test-bug-600183-charset.html^headers^ b/devtools/client/webconsole/test/test-bug-600183-charset.html^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-600183-charset.html^headers^
rename to devtools/client/webconsole/test/test-bug-600183-charset.html^headers^
diff --git a/browser/devtools/webconsole/test/test-bug-601177-log-levels.html b/devtools/client/webconsole/test/test-bug-601177-log-levels.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-601177-log-levels.html
rename to devtools/client/webconsole/test/test-bug-601177-log-levels.html
diff --git a/browser/devtools/webconsole/test/test-bug-601177-log-levels.js b/devtools/client/webconsole/test/test-bug-601177-log-levels.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-601177-log-levels.js
rename to devtools/client/webconsole/test/test-bug-601177-log-levels.js
diff --git a/browser/devtools/webconsole/test/test-bug-603750-websocket.html b/devtools/client/webconsole/test/test-bug-603750-websocket.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-603750-websocket.html
rename to devtools/client/webconsole/test/test-bug-603750-websocket.html
diff --git a/browser/devtools/webconsole/test/test-bug-603750-websocket.js b/devtools/client/webconsole/test/test-bug-603750-websocket.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-603750-websocket.js
rename to devtools/client/webconsole/test/test-bug-603750-websocket.js
diff --git a/browser/devtools/webconsole/test/test-bug-609872-cd-iframe-child.html b/devtools/client/webconsole/test/test-bug-609872-cd-iframe-child.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-609872-cd-iframe-child.html
rename to devtools/client/webconsole/test/test-bug-609872-cd-iframe-child.html
diff --git a/browser/devtools/webconsole/test/test-bug-609872-cd-iframe-parent.html b/devtools/client/webconsole/test/test-bug-609872-cd-iframe-parent.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-609872-cd-iframe-parent.html
rename to devtools/client/webconsole/test/test-bug-609872-cd-iframe-parent.html
diff --git a/browser/devtools/webconsole/test/test-bug-613013-console-api-iframe.html b/devtools/client/webconsole/test/test-bug-613013-console-api-iframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-613013-console-api-iframe.html
rename to devtools/client/webconsole/test/test-bug-613013-console-api-iframe.html
diff --git a/browser/devtools/webconsole/test/test-bug-618078-network-exceptions.html b/devtools/client/webconsole/test/test-bug-618078-network-exceptions.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-618078-network-exceptions.html
rename to devtools/client/webconsole/test/test-bug-618078-network-exceptions.html
diff --git a/browser/devtools/webconsole/test/test-bug-621644-jsterm-dollar.html b/devtools/client/webconsole/test/test-bug-621644-jsterm-dollar.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-621644-jsterm-dollar.html
rename to devtools/client/webconsole/test/test-bug-621644-jsterm-dollar.html
diff --git a/browser/devtools/webconsole/test/test-bug-630733-response-redirect-headers.sjs b/devtools/client/webconsole/test/test-bug-630733-response-redirect-headers.sjs
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-630733-response-redirect-headers.sjs
rename to devtools/client/webconsole/test/test-bug-630733-response-redirect-headers.sjs
diff --git a/browser/devtools/webconsole/test/test-bug-632275-getters.html b/devtools/client/webconsole/test/test-bug-632275-getters.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-632275-getters.html
rename to devtools/client/webconsole/test/test-bug-632275-getters.html
diff --git a/browser/devtools/webconsole/test/test-bug-632347-iterators-generators.html b/devtools/client/webconsole/test/test-bug-632347-iterators-generators.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-632347-iterators-generators.html
rename to devtools/client/webconsole/test/test-bug-632347-iterators-generators.html
diff --git a/browser/devtools/webconsole/test/test-bug-644419-log-limits.html b/devtools/client/webconsole/test/test-bug-644419-log-limits.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-644419-log-limits.html
rename to devtools/client/webconsole/test/test-bug-644419-log-limits.html
diff --git a/browser/devtools/webconsole/test/test-bug-646025-console-file-location.html b/devtools/client/webconsole/test/test-bug-646025-console-file-location.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-646025-console-file-location.html
rename to devtools/client/webconsole/test/test-bug-646025-console-file-location.html
diff --git a/browser/devtools/webconsole/test/test-bug-658368-time-methods.html b/devtools/client/webconsole/test/test-bug-658368-time-methods.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-658368-time-methods.html
rename to devtools/client/webconsole/test/test-bug-658368-time-methods.html
diff --git a/browser/devtools/webconsole/test/test-bug-737873-mixedcontent.html b/devtools/client/webconsole/test/test-bug-737873-mixedcontent.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-737873-mixedcontent.html
rename to devtools/client/webconsole/test/test-bug-737873-mixedcontent.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning0.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning0.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning0.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning0.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning1.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning1.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning1.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning1.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning2.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning2.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning2.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning2.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html
diff --git a/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html
rename to devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html
diff --git a/browser/devtools/webconsole/test/test-bug-762593-insecure-passwords-about-blank-web-console-warning.html b/devtools/client/webconsole/test/test-bug-762593-insecure-passwords-about-blank-web-console-warning.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-762593-insecure-passwords-about-blank-web-console-warning.html
rename to devtools/client/webconsole/test/test-bug-762593-insecure-passwords-about-blank-web-console-warning.html
diff --git a/browser/devtools/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html b/devtools/client/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html
rename to devtools/client/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html
diff --git a/browser/devtools/webconsole/test/test-bug-766001-console-log.js b/devtools/client/webconsole/test/test-bug-766001-console-log.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-766001-console-log.js
rename to devtools/client/webconsole/test/test-bug-766001-console-log.js
diff --git a/browser/devtools/webconsole/test/test-bug-766001-js-console-links.html b/devtools/client/webconsole/test/test-bug-766001-js-console-links.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-766001-js-console-links.html
rename to devtools/client/webconsole/test/test-bug-766001-js-console-links.html
diff --git a/browser/devtools/webconsole/test/test-bug-766001-js-errors.js b/devtools/client/webconsole/test/test-bug-766001-js-errors.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-766001-js-errors.js
rename to devtools/client/webconsole/test/test-bug-766001-js-errors.js
diff --git a/browser/devtools/webconsole/test/test-bug-782653-css-errors-1.css b/devtools/client/webconsole/test/test-bug-782653-css-errors-1.css
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-782653-css-errors-1.css
rename to devtools/client/webconsole/test/test-bug-782653-css-errors-1.css
diff --git a/browser/devtools/webconsole/test/test-bug-782653-css-errors-2.css b/devtools/client/webconsole/test/test-bug-782653-css-errors-2.css
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-782653-css-errors-2.css
rename to devtools/client/webconsole/test/test-bug-782653-css-errors-2.css
diff --git a/browser/devtools/webconsole/test/test-bug-782653-css-errors.html b/devtools/client/webconsole/test/test-bug-782653-css-errors.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-782653-css-errors.html
rename to devtools/client/webconsole/test/test-bug-782653-css-errors.html
diff --git a/browser/devtools/webconsole/test/test-bug-837351-security-errors.html b/devtools/client/webconsole/test/test-bug-837351-security-errors.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-837351-security-errors.html
rename to devtools/client/webconsole/test/test-bug-837351-security-errors.html
diff --git a/browser/devtools/webconsole/test/test-bug-859170-longstring-hang.html b/devtools/client/webconsole/test/test-bug-859170-longstring-hang.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-859170-longstring-hang.html
rename to devtools/client/webconsole/test/test-bug-859170-longstring-hang.html
diff --git a/browser/devtools/webconsole/test/test-bug-869003-iframe.html b/devtools/client/webconsole/test/test-bug-869003-iframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-869003-iframe.html
rename to devtools/client/webconsole/test/test-bug-869003-iframe.html
diff --git a/browser/devtools/webconsole/test/test-bug-869003-top-window.html b/devtools/client/webconsole/test/test-bug-869003-top-window.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-869003-top-window.html
rename to devtools/client/webconsole/test/test-bug-869003-top-window.html
diff --git a/browser/devtools/webconsole/test/test-bug-952277-highlight-nodes-in-vview.html b/devtools/client/webconsole/test/test-bug-952277-highlight-nodes-in-vview.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-952277-highlight-nodes-in-vview.html
rename to devtools/client/webconsole/test/test-bug-952277-highlight-nodes-in-vview.html
diff --git a/browser/devtools/webconsole/test/test-bug-989025-iframe-parent.html b/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug-989025-iframe-parent.html
rename to devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
diff --git a/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html b/devtools/client/webconsole/test/test-bug_1050691_click_function_to_source.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html
rename to devtools/client/webconsole/test/test-bug_1050691_click_function_to_source.html
diff --git a/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.js b/devtools/client/webconsole/test/test-bug_1050691_click_function_to_source.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.js
rename to devtools/client/webconsole/test/test-bug_1050691_click_function_to_source.js
diff --git a/browser/devtools/webconsole/test/test-bug_923281_console_log_filter.html b/devtools/client/webconsole/test/test-bug_923281_console_log_filter.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug_923281_console_log_filter.html
rename to devtools/client/webconsole/test/test-bug_923281_console_log_filter.html
diff --git a/browser/devtools/webconsole/test/test-bug_923281_test1.js b/devtools/client/webconsole/test/test-bug_923281_test1.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug_923281_test1.js
rename to devtools/client/webconsole/test/test-bug_923281_test1.js
diff --git a/browser/devtools/webconsole/test/test-bug_923281_test2.js b/devtools/client/webconsole/test/test-bug_923281_test2.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug_923281_test2.js
rename to devtools/client/webconsole/test/test-bug_923281_test2.js
diff --git a/browser/devtools/webconsole/test/test-bug_939783_console_trace_duplicates.html b/devtools/client/webconsole/test/test-bug_939783_console_trace_duplicates.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-bug_939783_console_trace_duplicates.html
rename to devtools/client/webconsole/test/test-bug_939783_console_trace_duplicates.html
diff --git a/browser/devtools/webconsole/test/test-certificate-messages.html b/devtools/client/webconsole/test/test-certificate-messages.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-certificate-messages.html
rename to devtools/client/webconsole/test/test-certificate-messages.html
diff --git a/browser/devtools/webconsole/test/test-closure-optimized-out.html b/devtools/client/webconsole/test/test-closure-optimized-out.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-closure-optimized-out.html
rename to devtools/client/webconsole/test/test-closure-optimized-out.html
diff --git a/browser/devtools/webconsole/test/test-closures.html b/devtools/client/webconsole/test/test-closures.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-closures.html
rename to devtools/client/webconsole/test/test-closures.html
diff --git a/browser/devtools/webconsole/test/test-console-api-stackframe.html b/devtools/client/webconsole/test/test-console-api-stackframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-api-stackframe.html
rename to devtools/client/webconsole/test/test-console-api-stackframe.html
diff --git a/browser/devtools/webconsole/test/test-console-assert.html b/devtools/client/webconsole/test/test-console-assert.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-assert.html
rename to devtools/client/webconsole/test/test-console-assert.html
diff --git a/browser/devtools/webconsole/test/test-console-column.html b/devtools/client/webconsole/test/test-console-column.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-column.html
rename to devtools/client/webconsole/test/test-console-column.html
diff --git a/browser/devtools/webconsole/test/test-console-count-external-file.js b/devtools/client/webconsole/test/test-console-count-external-file.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-count-external-file.js
rename to devtools/client/webconsole/test/test-console-count-external-file.js
diff --git a/browser/devtools/webconsole/test/test-console-count.html b/devtools/client/webconsole/test/test-console-count.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-count.html
rename to devtools/client/webconsole/test/test-console-count.html
diff --git a/browser/devtools/webconsole/test/test-console-extras.html b/devtools/client/webconsole/test/test-console-extras.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-extras.html
rename to devtools/client/webconsole/test/test-console-extras.html
diff --git a/browser/devtools/webconsole/test/test-console-output-02.html b/devtools/client/webconsole/test/test-console-output-02.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-output-02.html
rename to devtools/client/webconsole/test/test-console-output-02.html
diff --git a/browser/devtools/webconsole/test/test-console-output-03.html b/devtools/client/webconsole/test/test-console-output-03.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-output-03.html
rename to devtools/client/webconsole/test/test-console-output-03.html
diff --git a/browser/devtools/webconsole/test/test-console-output-04.html b/devtools/client/webconsole/test/test-console-output-04.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-output-04.html
rename to devtools/client/webconsole/test/test-console-output-04.html
diff --git a/browser/devtools/webconsole/test/test-console-output-dom-elements.html b/devtools/client/webconsole/test/test-console-output-dom-elements.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-output-dom-elements.html
rename to devtools/client/webconsole/test/test-console-output-dom-elements.html
diff --git a/browser/devtools/webconsole/test/test-console-output-events.html b/devtools/client/webconsole/test/test-console-output-events.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-output-events.html
rename to devtools/client/webconsole/test/test-console-output-events.html
diff --git a/browser/devtools/webconsole/test/test-console-output-regexp.html b/devtools/client/webconsole/test/test-console-output-regexp.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-output-regexp.html
rename to devtools/client/webconsole/test/test-console-output-regexp.html
diff --git a/browser/devtools/webconsole/test/test-console-replaced-api.html b/devtools/client/webconsole/test/test-console-replaced-api.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-replaced-api.html
rename to devtools/client/webconsole/test/test-console-replaced-api.html
diff --git a/browser/devtools/webconsole/test/test-console-server-logging.sjs b/devtools/client/webconsole/test/test-console-server-logging.sjs
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-server-logging.sjs
rename to devtools/client/webconsole/test/test-console-server-logging.sjs
diff --git a/browser/devtools/webconsole/test/test-console-table.html b/devtools/client/webconsole/test/test-console-table.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-table.html
rename to devtools/client/webconsole/test/test-console-table.html
diff --git a/browser/devtools/webconsole/test/test-console-workers.html b/devtools/client/webconsole/test/test-console-workers.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console-workers.html
rename to devtools/client/webconsole/test/test-console-workers.html
diff --git a/browser/devtools/webconsole/test/test-console.html b/devtools/client/webconsole/test/test-console.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-console.html
rename to devtools/client/webconsole/test/test-console.html
diff --git a/browser/devtools/webconsole/test/test-consoleiframes.html b/devtools/client/webconsole/test/test-consoleiframes.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-consoleiframes.html
rename to devtools/client/webconsole/test/test-consoleiframes.html
diff --git a/browser/devtools/webconsole/test/test-data.json b/devtools/client/webconsole/test/test-data.json
similarity index 100%
rename from browser/devtools/webconsole/test/test-data.json
rename to devtools/client/webconsole/test/test-data.json
diff --git a/browser/devtools/webconsole/test/test-data.json^headers^ b/devtools/client/webconsole/test/test-data.json^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test-data.json^headers^
rename to devtools/client/webconsole/test/test-data.json^headers^
diff --git a/browser/devtools/webconsole/test/test-duplicate-error.html b/devtools/client/webconsole/test/test-duplicate-error.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-duplicate-error.html
rename to devtools/client/webconsole/test/test-duplicate-error.html
diff --git a/browser/devtools/webconsole/test/test-encoding-ISO-8859-1.html b/devtools/client/webconsole/test/test-encoding-ISO-8859-1.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-encoding-ISO-8859-1.html
rename to devtools/client/webconsole/test/test-encoding-ISO-8859-1.html
diff --git a/browser/devtools/webconsole/test/test-error.html b/devtools/client/webconsole/test/test-error.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-error.html
rename to devtools/client/webconsole/test/test-error.html
diff --git a/browser/devtools/webconsole/test/test-eval-in-stackframe.html b/devtools/client/webconsole/test/test-eval-in-stackframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-eval-in-stackframe.html
rename to devtools/client/webconsole/test/test-eval-in-stackframe.html
diff --git a/browser/devtools/webconsole/test/test-exception-stackframe.html b/devtools/client/webconsole/test/test-exception-stackframe.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-exception-stackframe.html
rename to devtools/client/webconsole/test/test-exception-stackframe.html
diff --git a/browser/devtools/webconsole/test/test-file-location.js b/devtools/client/webconsole/test/test-file-location.js
similarity index 100%
rename from browser/devtools/webconsole/test/test-file-location.js
rename to devtools/client/webconsole/test/test-file-location.js
diff --git a/browser/devtools/webconsole/test/test-filter.html b/devtools/client/webconsole/test/test-filter.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-filter.html
rename to devtools/client/webconsole/test/test-filter.html
diff --git a/browser/devtools/webconsole/test/test-for-of.html b/devtools/client/webconsole/test/test-for-of.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-for-of.html
rename to devtools/client/webconsole/test/test-for-of.html
diff --git a/browser/devtools/webconsole/test/test-iframe-762593-insecure-form-action.html b/devtools/client/webconsole/test/test-iframe-762593-insecure-form-action.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-iframe-762593-insecure-form-action.html
rename to devtools/client/webconsole/test/test-iframe-762593-insecure-form-action.html
diff --git a/browser/devtools/webconsole/test/test-iframe-762593-insecure-frame.html b/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-iframe-762593-insecure-frame.html
rename to devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
diff --git a/browser/devtools/webconsole/test/test-iframe1.html b/devtools/client/webconsole/test/test-iframe1.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-iframe1.html
rename to devtools/client/webconsole/test/test-iframe1.html
diff --git a/browser/devtools/webconsole/test/test-iframe2.html b/devtools/client/webconsole/test/test-iframe2.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-iframe2.html
rename to devtools/client/webconsole/test/test-iframe2.html
diff --git a/browser/devtools/webconsole/test/test-iframe3.html b/devtools/client/webconsole/test/test-iframe3.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-iframe3.html
rename to devtools/client/webconsole/test/test-iframe3.html
diff --git a/browser/devtools/webconsole/test/test-image.png b/devtools/client/webconsole/test/test-image.png
similarity index 100%
rename from browser/devtools/webconsole/test/test-image.png
rename to devtools/client/webconsole/test/test-image.png
diff --git a/browser/devtools/webconsole/test/test-mixedcontent-securityerrors.html b/devtools/client/webconsole/test/test-mixedcontent-securityerrors.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-mixedcontent-securityerrors.html
rename to devtools/client/webconsole/test/test-mixedcontent-securityerrors.html
diff --git a/browser/devtools/webconsole/test/test-mutation.html b/devtools/client/webconsole/test/test-mutation.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-mutation.html
rename to devtools/client/webconsole/test/test-mutation.html
diff --git a/browser/devtools/webconsole/test/test-network-request.html b/devtools/client/webconsole/test/test-network-request.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-network-request.html
rename to devtools/client/webconsole/test/test-network-request.html
diff --git a/browser/devtools/webconsole/test/test-network.html b/devtools/client/webconsole/test/test-network.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-network.html
rename to devtools/client/webconsole/test/test-network.html
diff --git a/browser/devtools/webconsole/test/test-observe-http-ajax.html b/devtools/client/webconsole/test/test-observe-http-ajax.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-observe-http-ajax.html
rename to devtools/client/webconsole/test/test-observe-http-ajax.html
diff --git a/browser/devtools/webconsole/test/test-own-console.html b/devtools/client/webconsole/test/test-own-console.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-own-console.html
rename to devtools/client/webconsole/test/test-own-console.html
diff --git a/browser/devtools/webconsole/test/test-property-provider.html b/devtools/client/webconsole/test/test-property-provider.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-property-provider.html
rename to devtools/client/webconsole/test/test-property-provider.html
diff --git a/browser/devtools/webconsole/test/test-repeated-messages.html b/devtools/client/webconsole/test/test-repeated-messages.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-repeated-messages.html
rename to devtools/client/webconsole/test/test-repeated-messages.html
diff --git a/browser/devtools/webconsole/test/test-result-format-as-string.html b/devtools/client/webconsole/test/test-result-format-as-string.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-result-format-as-string.html
rename to devtools/client/webconsole/test/test-result-format-as-string.html
diff --git a/browser/devtools/webconsole/test/test-trackingprotection-securityerrors.html b/devtools/client/webconsole/test/test-trackingprotection-securityerrors.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-trackingprotection-securityerrors.html
rename to devtools/client/webconsole/test/test-trackingprotection-securityerrors.html
diff --git a/browser/devtools/webconsole/test/test-webconsole-error-observer.html b/devtools/client/webconsole/test/test-webconsole-error-observer.html
similarity index 100%
rename from browser/devtools/webconsole/test/test-webconsole-error-observer.html
rename to devtools/client/webconsole/test/test-webconsole-error-observer.html
diff --git a/browser/devtools/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html b/devtools/client/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html
rename to devtools/client/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html
diff --git a/browser/devtools/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html^headers^ b/devtools/client/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html^headers^
rename to devtools/client/webconsole/test/test_bug1045902_console_csp_ignore_reflected_xss_message.html^headers^
diff --git a/browser/devtools/webconsole/test/test_bug1092055_shouldwarn.html b/devtools/client/webconsole/test/test_bug1092055_shouldwarn.html
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug1092055_shouldwarn.html
rename to devtools/client/webconsole/test/test_bug1092055_shouldwarn.html
diff --git a/browser/devtools/webconsole/test/test_bug1092055_shouldwarn.js b/devtools/client/webconsole/test/test_bug1092055_shouldwarn.js
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug1092055_shouldwarn.js
rename to devtools/client/webconsole/test/test_bug1092055_shouldwarn.js
diff --git a/browser/devtools/webconsole/test/test_bug1092055_shouldwarn.js^headers^ b/devtools/client/webconsole/test/test_bug1092055_shouldwarn.js^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug1092055_shouldwarn.js^headers^
rename to devtools/client/webconsole/test/test_bug1092055_shouldwarn.js^headers^
diff --git a/browser/devtools/webconsole/test/test_bug_1010953_cspro.html b/devtools/client/webconsole/test/test_bug_1010953_cspro.html
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug_1010953_cspro.html
rename to devtools/client/webconsole/test/test_bug_1010953_cspro.html
diff --git a/browser/devtools/webconsole/test/test_bug_1010953_cspro.html^headers^ b/devtools/client/webconsole/test/test_bug_1010953_cspro.html^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug_1010953_cspro.html^headers^
rename to devtools/client/webconsole/test/test_bug_1010953_cspro.html^headers^
diff --git a/browser/devtools/webconsole/test/test_bug_770099_violation.html b/devtools/client/webconsole/test/test_bug_770099_violation.html
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug_770099_violation.html
rename to devtools/client/webconsole/test/test_bug_770099_violation.html
diff --git a/browser/devtools/webconsole/test/test_bug_770099_violation.html^headers^ b/devtools/client/webconsole/test/test_bug_770099_violation.html^headers^
similarity index 100%
rename from browser/devtools/webconsole/test/test_bug_770099_violation.html^headers^
rename to devtools/client/webconsole/test/test_bug_770099_violation.html^headers^
diff --git a/browser/devtools/webconsole/test/test_hpkp-invalid-headers.sjs b/devtools/client/webconsole/test/test_hpkp-invalid-headers.sjs
similarity index 100%
rename from browser/devtools/webconsole/test/test_hpkp-invalid-headers.sjs
rename to devtools/client/webconsole/test/test_hpkp-invalid-headers.sjs
diff --git a/browser/devtools/webconsole/test/test_hsts-invalid-headers.sjs b/devtools/client/webconsole/test/test_hsts-invalid-headers.sjs
similarity index 100%
rename from browser/devtools/webconsole/test/test_hsts-invalid-headers.sjs
rename to devtools/client/webconsole/test/test_hsts-invalid-headers.sjs
diff --git a/browser/devtools/webconsole/test/testscript.js b/devtools/client/webconsole/test/testscript.js
similarity index 100%
rename from browser/devtools/webconsole/test/testscript.js
rename to devtools/client/webconsole/test/testscript.js
diff --git a/browser/devtools/webconsole/webconsole.js b/devtools/client/webconsole/webconsole.js
similarity index 100%
rename from browser/devtools/webconsole/webconsole.js
rename to devtools/client/webconsole/webconsole.js
diff --git a/browser/devtools/webconsole/webconsole.xul b/devtools/client/webconsole/webconsole.xul
similarity index 100%
rename from browser/devtools/webconsole/webconsole.xul
rename to devtools/client/webconsole/webconsole.xul
diff --git a/browser/devtools/webide/components/moz.build b/devtools/client/webide/components/moz.build
similarity index 100%
rename from browser/devtools/webide/components/moz.build
rename to devtools/client/webide/components/moz.build
diff --git a/browser/devtools/webide/components/webideCli.js b/devtools/client/webide/components/webideCli.js
similarity index 100%
rename from browser/devtools/webide/components/webideCli.js
rename to devtools/client/webide/components/webideCli.js
diff --git a/browser/devtools/webide/components/webideComponents.manifest b/devtools/client/webide/components/webideComponents.manifest
similarity index 100%
rename from browser/devtools/webide/components/webideComponents.manifest
rename to devtools/client/webide/components/webideComponents.manifest
diff --git a/browser/devtools/webide/content/addons.js b/devtools/client/webide/content/addons.js
similarity index 100%
rename from browser/devtools/webide/content/addons.js
rename to devtools/client/webide/content/addons.js
diff --git a/browser/devtools/webide/content/addons.xhtml b/devtools/client/webide/content/addons.xhtml
similarity index 100%
rename from browser/devtools/webide/content/addons.xhtml
rename to devtools/client/webide/content/addons.xhtml
diff --git a/browser/devtools/webide/content/details.js b/devtools/client/webide/content/details.js
similarity index 100%
rename from browser/devtools/webide/content/details.js
rename to devtools/client/webide/content/details.js
diff --git a/browser/devtools/webide/content/details.xhtml b/devtools/client/webide/content/details.xhtml
similarity index 100%
rename from browser/devtools/webide/content/details.xhtml
rename to devtools/client/webide/content/details.xhtml
diff --git a/browser/devtools/webide/content/devicepreferences.js b/devtools/client/webide/content/devicepreferences.js
similarity index 100%
rename from browser/devtools/webide/content/devicepreferences.js
rename to devtools/client/webide/content/devicepreferences.js
diff --git a/browser/devtools/webide/content/devicepreferences.xhtml b/devtools/client/webide/content/devicepreferences.xhtml
similarity index 100%
rename from browser/devtools/webide/content/devicepreferences.xhtml
rename to devtools/client/webide/content/devicepreferences.xhtml
diff --git a/browser/devtools/webide/content/devicesettings.js b/devtools/client/webide/content/devicesettings.js
similarity index 100%
rename from browser/devtools/webide/content/devicesettings.js
rename to devtools/client/webide/content/devicesettings.js
diff --git a/browser/devtools/webide/content/devicesettings.xhtml b/devtools/client/webide/content/devicesettings.xhtml
similarity index 100%
rename from browser/devtools/webide/content/devicesettings.xhtml
rename to devtools/client/webide/content/devicesettings.xhtml
diff --git a/browser/devtools/webide/content/jar.mn b/devtools/client/webide/content/jar.mn
similarity index 100%
rename from browser/devtools/webide/content/jar.mn
rename to devtools/client/webide/content/jar.mn
diff --git a/browser/devtools/webide/content/logs.js b/devtools/client/webide/content/logs.js
similarity index 100%
rename from browser/devtools/webide/content/logs.js
rename to devtools/client/webide/content/logs.js
diff --git a/browser/devtools/webide/content/logs.xhtml b/devtools/client/webide/content/logs.xhtml
similarity index 100%
rename from browser/devtools/webide/content/logs.xhtml
rename to devtools/client/webide/content/logs.xhtml
diff --git a/browser/devtools/webide/content/monitor.js b/devtools/client/webide/content/monitor.js
similarity index 100%
rename from browser/devtools/webide/content/monitor.js
rename to devtools/client/webide/content/monitor.js
diff --git a/browser/devtools/webide/content/monitor.xhtml b/devtools/client/webide/content/monitor.xhtml
similarity index 100%
rename from browser/devtools/webide/content/monitor.xhtml
rename to devtools/client/webide/content/monitor.xhtml
diff --git a/browser/devtools/webide/content/moz.build b/devtools/client/webide/content/moz.build
similarity index 100%
rename from browser/devtools/webide/content/moz.build
rename to devtools/client/webide/content/moz.build
diff --git a/browser/devtools/webide/content/newapp.js b/devtools/client/webide/content/newapp.js
similarity index 100%
rename from browser/devtools/webide/content/newapp.js
rename to devtools/client/webide/content/newapp.js
diff --git a/browser/devtools/webide/content/newapp.xul b/devtools/client/webide/content/newapp.xul
similarity index 100%
rename from browser/devtools/webide/content/newapp.xul
rename to devtools/client/webide/content/newapp.xul
diff --git a/browser/devtools/webide/content/permissionstable.js b/devtools/client/webide/content/permissionstable.js
similarity index 100%
rename from browser/devtools/webide/content/permissionstable.js
rename to devtools/client/webide/content/permissionstable.js
diff --git a/browser/devtools/webide/content/permissionstable.xhtml b/devtools/client/webide/content/permissionstable.xhtml
similarity index 100%
rename from browser/devtools/webide/content/permissionstable.xhtml
rename to devtools/client/webide/content/permissionstable.xhtml
diff --git a/browser/devtools/webide/content/prefs.js b/devtools/client/webide/content/prefs.js
similarity index 100%
rename from browser/devtools/webide/content/prefs.js
rename to devtools/client/webide/content/prefs.js
diff --git a/browser/devtools/webide/content/prefs.xhtml b/devtools/client/webide/content/prefs.xhtml
similarity index 100%
rename from browser/devtools/webide/content/prefs.xhtml
rename to devtools/client/webide/content/prefs.xhtml
diff --git a/browser/devtools/webide/content/project-listing.js b/devtools/client/webide/content/project-listing.js
similarity index 100%
rename from browser/devtools/webide/content/project-listing.js
rename to devtools/client/webide/content/project-listing.js
diff --git a/browser/devtools/webide/content/project-listing.xhtml b/devtools/client/webide/content/project-listing.xhtml
similarity index 100%
rename from browser/devtools/webide/content/project-listing.xhtml
rename to devtools/client/webide/content/project-listing.xhtml
diff --git a/browser/devtools/webide/content/project-panel.js b/devtools/client/webide/content/project-panel.js
similarity index 100%
rename from browser/devtools/webide/content/project-panel.js
rename to devtools/client/webide/content/project-panel.js
diff --git a/browser/devtools/webide/content/runtime-listing.js b/devtools/client/webide/content/runtime-listing.js
similarity index 100%
rename from browser/devtools/webide/content/runtime-listing.js
rename to devtools/client/webide/content/runtime-listing.js
diff --git a/browser/devtools/webide/content/runtime-listing.xhtml b/devtools/client/webide/content/runtime-listing.xhtml
similarity index 100%
rename from browser/devtools/webide/content/runtime-listing.xhtml
rename to devtools/client/webide/content/runtime-listing.xhtml
diff --git a/browser/devtools/webide/content/runtime-panel.js b/devtools/client/webide/content/runtime-panel.js
similarity index 100%
rename from browser/devtools/webide/content/runtime-panel.js
rename to devtools/client/webide/content/runtime-panel.js
diff --git a/browser/devtools/webide/content/runtimedetails.js b/devtools/client/webide/content/runtimedetails.js
similarity index 100%
rename from browser/devtools/webide/content/runtimedetails.js
rename to devtools/client/webide/content/runtimedetails.js
diff --git a/browser/devtools/webide/content/runtimedetails.xhtml b/devtools/client/webide/content/runtimedetails.xhtml
similarity index 100%
rename from browser/devtools/webide/content/runtimedetails.xhtml
rename to devtools/client/webide/content/runtimedetails.xhtml
diff --git a/browser/devtools/webide/content/simulator.js b/devtools/client/webide/content/simulator.js
similarity index 100%
rename from browser/devtools/webide/content/simulator.js
rename to devtools/client/webide/content/simulator.js
diff --git a/browser/devtools/webide/content/simulator.xhtml b/devtools/client/webide/content/simulator.xhtml
similarity index 100%
rename from browser/devtools/webide/content/simulator.xhtml
rename to devtools/client/webide/content/simulator.xhtml
diff --git a/browser/devtools/webide/content/webide.js b/devtools/client/webide/content/webide.js
similarity index 100%
rename from browser/devtools/webide/content/webide.js
rename to devtools/client/webide/content/webide.js
diff --git a/browser/devtools/webide/content/webide.xul b/devtools/client/webide/content/webide.xul
similarity index 100%
rename from browser/devtools/webide/content/webide.xul
rename to devtools/client/webide/content/webide.xul
diff --git a/browser/devtools/webide/content/wifi-auth.js b/devtools/client/webide/content/wifi-auth.js
similarity index 100%
rename from browser/devtools/webide/content/wifi-auth.js
rename to devtools/client/webide/content/wifi-auth.js
diff --git a/browser/devtools/webide/content/wifi-auth.xhtml b/devtools/client/webide/content/wifi-auth.xhtml
similarity index 100%
rename from browser/devtools/webide/content/wifi-auth.xhtml
rename to devtools/client/webide/content/wifi-auth.xhtml
diff --git a/browser/devtools/webide/modules/addons.js b/devtools/client/webide/modules/addons.js
similarity index 100%
rename from browser/devtools/webide/modules/addons.js
rename to devtools/client/webide/modules/addons.js
diff --git a/browser/devtools/webide/modules/app-manager.js b/devtools/client/webide/modules/app-manager.js
similarity index 100%
rename from browser/devtools/webide/modules/app-manager.js
rename to devtools/client/webide/modules/app-manager.js
diff --git a/browser/devtools/webide/modules/build.js b/devtools/client/webide/modules/build.js
similarity index 100%
rename from browser/devtools/webide/modules/build.js
rename to devtools/client/webide/modules/build.js
diff --git a/browser/devtools/webide/modules/config-view.js b/devtools/client/webide/modules/config-view.js
similarity index 100%
rename from browser/devtools/webide/modules/config-view.js
rename to devtools/client/webide/modules/config-view.js
diff --git a/browser/devtools/webide/modules/project-list.js b/devtools/client/webide/modules/project-list.js
similarity index 100%
rename from browser/devtools/webide/modules/project-list.js
rename to devtools/client/webide/modules/project-list.js
diff --git a/browser/devtools/webide/modules/runtime-list.js b/devtools/client/webide/modules/runtime-list.js
similarity index 100%
rename from browser/devtools/webide/modules/runtime-list.js
rename to devtools/client/webide/modules/runtime-list.js
diff --git a/browser/devtools/webide/modules/runtimes.js b/devtools/client/webide/modules/runtimes.js
similarity index 100%
rename from browser/devtools/webide/modules/runtimes.js
rename to devtools/client/webide/modules/runtimes.js
diff --git a/browser/devtools/webide/modules/simulator-process.js b/devtools/client/webide/modules/simulator-process.js
similarity index 100%
rename from browser/devtools/webide/modules/simulator-process.js
rename to devtools/client/webide/modules/simulator-process.js
diff --git a/browser/devtools/webide/modules/simulators.js b/devtools/client/webide/modules/simulators.js
similarity index 100%
rename from browser/devtools/webide/modules/simulators.js
rename to devtools/client/webide/modules/simulators.js
diff --git a/browser/devtools/webide/modules/tab-store.js b/devtools/client/webide/modules/tab-store.js
similarity index 100%
rename from browser/devtools/webide/modules/tab-store.js
rename to devtools/client/webide/modules/tab-store.js
diff --git a/browser/devtools/webide/modules/utils.js b/devtools/client/webide/modules/utils.js
similarity index 100%
rename from browser/devtools/webide/modules/utils.js
rename to devtools/client/webide/modules/utils.js
diff --git a/browser/devtools/webide/moz.build b/devtools/client/webide/moz.build
similarity index 100%
rename from browser/devtools/webide/moz.build
rename to devtools/client/webide/moz.build
diff --git a/browser/devtools/webide/test/.eslintrc b/devtools/client/webide/test/.eslintrc
similarity index 100%
rename from browser/devtools/webide/test/.eslintrc
rename to devtools/client/webide/test/.eslintrc
diff --git a/browser/devtools/webide/test/addons/adbhelper-linux.xpi b/devtools/client/webide/test/addons/adbhelper-linux.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/adbhelper-linux.xpi
rename to devtools/client/webide/test/addons/adbhelper-linux.xpi
diff --git a/browser/devtools/webide/test/addons/adbhelper-linux64.xpi b/devtools/client/webide/test/addons/adbhelper-linux64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/adbhelper-linux64.xpi
rename to devtools/client/webide/test/addons/adbhelper-linux64.xpi
diff --git a/browser/devtools/webide/test/addons/adbhelper-mac64.xpi b/devtools/client/webide/test/addons/adbhelper-mac64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/adbhelper-mac64.xpi
rename to devtools/client/webide/test/addons/adbhelper-mac64.xpi
diff --git a/browser/devtools/webide/test/addons/adbhelper-win32.xpi b/devtools/client/webide/test/addons/adbhelper-win32.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/adbhelper-win32.xpi
rename to devtools/client/webide/test/addons/adbhelper-win32.xpi
diff --git a/browser/devtools/webide/test/addons/fxdt-adapters-linux32.xpi b/devtools/client/webide/test/addons/fxdt-adapters-linux32.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxdt-adapters-linux32.xpi
rename to devtools/client/webide/test/addons/fxdt-adapters-linux32.xpi
diff --git a/browser/devtools/webide/test/addons/fxdt-adapters-linux64.xpi b/devtools/client/webide/test/addons/fxdt-adapters-linux64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxdt-adapters-linux64.xpi
rename to devtools/client/webide/test/addons/fxdt-adapters-linux64.xpi
diff --git a/browser/devtools/webide/test/addons/fxdt-adapters-mac64.xpi b/devtools/client/webide/test/addons/fxdt-adapters-mac64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxdt-adapters-mac64.xpi
rename to devtools/client/webide/test/addons/fxdt-adapters-mac64.xpi
diff --git a/browser/devtools/webide/test/addons/fxdt-adapters-win32.xpi b/devtools/client/webide/test/addons/fxdt-adapters-win32.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxdt-adapters-win32.xpi
rename to devtools/client/webide/test/addons/fxdt-adapters-win32.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_1_0_simulator-linux.xpi b/devtools/client/webide/test/addons/fxos_1_0_simulator-linux.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_1_0_simulator-linux.xpi
rename to devtools/client/webide/test/addons/fxos_1_0_simulator-linux.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_1_0_simulator-linux64.xpi b/devtools/client/webide/test/addons/fxos_1_0_simulator-linux64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_1_0_simulator-linux64.xpi
rename to devtools/client/webide/test/addons/fxos_1_0_simulator-linux64.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_1_0_simulator-mac64.xpi b/devtools/client/webide/test/addons/fxos_1_0_simulator-mac64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_1_0_simulator-mac64.xpi
rename to devtools/client/webide/test/addons/fxos_1_0_simulator-mac64.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_1_0_simulator-win32.xpi b/devtools/client/webide/test/addons/fxos_1_0_simulator-win32.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_1_0_simulator-win32.xpi
rename to devtools/client/webide/test/addons/fxos_1_0_simulator-win32.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_2_0_simulator-linux.xpi b/devtools/client/webide/test/addons/fxos_2_0_simulator-linux.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_2_0_simulator-linux.xpi
rename to devtools/client/webide/test/addons/fxos_2_0_simulator-linux.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_2_0_simulator-linux64.xpi b/devtools/client/webide/test/addons/fxos_2_0_simulator-linux64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_2_0_simulator-linux64.xpi
rename to devtools/client/webide/test/addons/fxos_2_0_simulator-linux64.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_2_0_simulator-mac64.xpi b/devtools/client/webide/test/addons/fxos_2_0_simulator-mac64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_2_0_simulator-mac64.xpi
rename to devtools/client/webide/test/addons/fxos_2_0_simulator-mac64.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_2_0_simulator-win32.xpi b/devtools/client/webide/test/addons/fxos_2_0_simulator-win32.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_2_0_simulator-win32.xpi
rename to devtools/client/webide/test/addons/fxos_2_0_simulator-win32.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_3_0_simulator-linux.xpi b/devtools/client/webide/test/addons/fxos_3_0_simulator-linux.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_3_0_simulator-linux.xpi
rename to devtools/client/webide/test/addons/fxos_3_0_simulator-linux.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_3_0_simulator-linux64.xpi b/devtools/client/webide/test/addons/fxos_3_0_simulator-linux64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_3_0_simulator-linux64.xpi
rename to devtools/client/webide/test/addons/fxos_3_0_simulator-linux64.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_3_0_simulator-mac64.xpi b/devtools/client/webide/test/addons/fxos_3_0_simulator-mac64.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_3_0_simulator-mac64.xpi
rename to devtools/client/webide/test/addons/fxos_3_0_simulator-mac64.xpi
diff --git a/browser/devtools/webide/test/addons/fxos_3_0_simulator-win32.xpi b/devtools/client/webide/test/addons/fxos_3_0_simulator-win32.xpi
similarity index 100%
rename from browser/devtools/webide/test/addons/fxos_3_0_simulator-win32.xpi
rename to devtools/client/webide/test/addons/fxos_3_0_simulator-win32.xpi
diff --git a/browser/devtools/webide/test/addons/simulators.json b/devtools/client/webide/test/addons/simulators.json
similarity index 100%
rename from browser/devtools/webide/test/addons/simulators.json
rename to devtools/client/webide/test/addons/simulators.json
diff --git a/browser/devtools/webide/test/app.zip b/devtools/client/webide/test/app.zip
similarity index 100%
rename from browser/devtools/webide/test/app.zip
rename to devtools/client/webide/test/app.zip
diff --git a/browser/devtools/webide/test/app/index.html b/devtools/client/webide/test/app/index.html
similarity index 100%
rename from browser/devtools/webide/test/app/index.html
rename to devtools/client/webide/test/app/index.html
diff --git a/browser/devtools/webide/test/app/manifest.webapp b/devtools/client/webide/test/app/manifest.webapp
similarity index 100%
rename from browser/devtools/webide/test/app/manifest.webapp
rename to devtools/client/webide/test/app/manifest.webapp
diff --git a/browser/devtools/webide/test/browser.ini b/devtools/client/webide/test/browser.ini
similarity index 100%
rename from browser/devtools/webide/test/browser.ini
rename to devtools/client/webide/test/browser.ini
diff --git a/browser/devtools/webide/test/browser_tabs.js b/devtools/client/webide/test/browser_tabs.js
similarity index 100%
rename from browser/devtools/webide/test/browser_tabs.js
rename to devtools/client/webide/test/browser_tabs.js
diff --git a/browser/devtools/webide/test/browser_widget.js b/devtools/client/webide/test/browser_widget.js
similarity index 100%
rename from browser/devtools/webide/test/browser_widget.js
rename to devtools/client/webide/test/browser_widget.js
diff --git a/browser/devtools/webide/test/build_app1/package.json b/devtools/client/webide/test/build_app1/package.json
similarity index 100%
rename from browser/devtools/webide/test/build_app1/package.json
rename to devtools/client/webide/test/build_app1/package.json
diff --git a/browser/devtools/webide/test/build_app2/manifest.webapp b/devtools/client/webide/test/build_app2/manifest.webapp
similarity index 100%
rename from browser/devtools/webide/test/build_app2/manifest.webapp
rename to devtools/client/webide/test/build_app2/manifest.webapp
diff --git a/browser/devtools/webide/test/build_app2/package.json b/devtools/client/webide/test/build_app2/package.json
similarity index 100%
rename from browser/devtools/webide/test/build_app2/package.json
rename to devtools/client/webide/test/build_app2/package.json
diff --git a/browser/devtools/webide/test/build_app2/stage/empty-directory b/devtools/client/webide/test/build_app2/stage/empty-directory
similarity index 100%
rename from browser/devtools/webide/test/build_app2/stage/empty-directory
rename to devtools/client/webide/test/build_app2/stage/empty-directory
diff --git a/browser/devtools/webide/test/build_app_windows1/package.json b/devtools/client/webide/test/build_app_windows1/package.json
similarity index 100%
rename from browser/devtools/webide/test/build_app_windows1/package.json
rename to devtools/client/webide/test/build_app_windows1/package.json
diff --git a/browser/devtools/webide/test/build_app_windows2/manifest.webapp b/devtools/client/webide/test/build_app_windows2/manifest.webapp
similarity index 100%
rename from browser/devtools/webide/test/build_app_windows2/manifest.webapp
rename to devtools/client/webide/test/build_app_windows2/manifest.webapp
diff --git a/browser/devtools/webide/test/build_app_windows2/package.json b/devtools/client/webide/test/build_app_windows2/package.json
similarity index 100%
rename from browser/devtools/webide/test/build_app_windows2/package.json
rename to devtools/client/webide/test/build_app_windows2/package.json
diff --git a/browser/devtools/webide/test/build_app_windows2/stage/empty-directory b/devtools/client/webide/test/build_app_windows2/stage/empty-directory
similarity index 100%
rename from browser/devtools/webide/test/build_app_windows2/stage/empty-directory
rename to devtools/client/webide/test/build_app_windows2/stage/empty-directory
diff --git a/browser/devtools/webide/test/chrome.ini b/devtools/client/webide/test/chrome.ini
similarity index 100%
rename from browser/devtools/webide/test/chrome.ini
rename to devtools/client/webide/test/chrome.ini
diff --git a/browser/devtools/webide/test/device_front_shared.js b/devtools/client/webide/test/device_front_shared.js
similarity index 100%
rename from browser/devtools/webide/test/device_front_shared.js
rename to devtools/client/webide/test/device_front_shared.js
diff --git a/browser/devtools/webide/test/doc_tabs.html b/devtools/client/webide/test/doc_tabs.html
similarity index 100%
rename from browser/devtools/webide/test/doc_tabs.html
rename to devtools/client/webide/test/doc_tabs.html
diff --git a/browser/devtools/webide/test/head.js b/devtools/client/webide/test/head.js
similarity index 100%
rename from browser/devtools/webide/test/head.js
rename to devtools/client/webide/test/head.js
diff --git a/browser/devtools/webide/test/hosted_app.manifest b/devtools/client/webide/test/hosted_app.manifest
similarity index 100%
rename from browser/devtools/webide/test/hosted_app.manifest
rename to devtools/client/webide/test/hosted_app.manifest
diff --git a/browser/devtools/webide/test/sidebars/browser.ini b/devtools/client/webide/test/sidebars/browser.ini
similarity index 100%
rename from browser/devtools/webide/test/sidebars/browser.ini
rename to devtools/client/webide/test/sidebars/browser.ini
diff --git a/browser/devtools/webide/test/sidebars/browser_tabs.js b/devtools/client/webide/test/sidebars/browser_tabs.js
similarity index 100%
rename from browser/devtools/webide/test/sidebars/browser_tabs.js
rename to devtools/client/webide/test/sidebars/browser_tabs.js
diff --git a/browser/devtools/webide/test/sidebars/chrome.ini b/devtools/client/webide/test/sidebars/chrome.ini
similarity index 100%
rename from browser/devtools/webide/test/sidebars/chrome.ini
rename to devtools/client/webide/test/sidebars/chrome.ini
diff --git a/browser/devtools/webide/test/sidebars/test_addons.html b/devtools/client/webide/test/sidebars/test_addons.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_addons.html
rename to devtools/client/webide/test/sidebars/test_addons.html
diff --git a/browser/devtools/webide/test/sidebars/test_autoconnect_runtime.html b/devtools/client/webide/test/sidebars/test_autoconnect_runtime.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_autoconnect_runtime.html
rename to devtools/client/webide/test/sidebars/test_autoconnect_runtime.html
diff --git a/browser/devtools/webide/test/sidebars/test_autoselect_project.html b/devtools/client/webide/test/sidebars/test_autoselect_project.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_autoselect_project.html
rename to devtools/client/webide/test/sidebars/test_autoselect_project.html
diff --git a/browser/devtools/webide/test/sidebars/test_device_permissions.html b/devtools/client/webide/test/sidebars/test_device_permissions.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_device_permissions.html
rename to devtools/client/webide/test/sidebars/test_device_permissions.html
diff --git a/browser/devtools/webide/test/sidebars/test_device_preferences.html b/devtools/client/webide/test/sidebars/test_device_preferences.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_device_preferences.html
rename to devtools/client/webide/test/sidebars/test_device_preferences.html
diff --git a/browser/devtools/webide/test/sidebars/test_device_runtime.html b/devtools/client/webide/test/sidebars/test_device_runtime.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_device_runtime.html
rename to devtools/client/webide/test/sidebars/test_device_runtime.html
diff --git a/browser/devtools/webide/test/sidebars/test_device_settings.html b/devtools/client/webide/test/sidebars/test_device_settings.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_device_settings.html
rename to devtools/client/webide/test/sidebars/test_device_settings.html
diff --git a/browser/devtools/webide/test/sidebars/test_duplicate_import.html b/devtools/client/webide/test/sidebars/test_duplicate_import.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_duplicate_import.html
rename to devtools/client/webide/test/sidebars/test_duplicate_import.html
diff --git a/browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html b/devtools/client/webide/test/sidebars/test_fullscreenToolbox.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html
rename to devtools/client/webide/test/sidebars/test_fullscreenToolbox.html
diff --git a/browser/devtools/webide/test/sidebars/test_import.html b/devtools/client/webide/test/sidebars/test_import.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_import.html
rename to devtools/client/webide/test/sidebars/test_import.html
diff --git a/browser/devtools/webide/test/sidebars/test_manifestUpdate.html b/devtools/client/webide/test/sidebars/test_manifestUpdate.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_manifestUpdate.html
rename to devtools/client/webide/test/sidebars/test_manifestUpdate.html
diff --git a/browser/devtools/webide/test/sidebars/test_newapp.html b/devtools/client/webide/test/sidebars/test_newapp.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_newapp.html
rename to devtools/client/webide/test/sidebars/test_newapp.html
diff --git a/browser/devtools/webide/test/sidebars/test_runtime.html b/devtools/client/webide/test/sidebars/test_runtime.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_runtime.html
rename to devtools/client/webide/test/sidebars/test_runtime.html
diff --git a/browser/devtools/webide/test/sidebars/test_telemetry.html b/devtools/client/webide/test/sidebars/test_telemetry.html
similarity index 100%
rename from browser/devtools/webide/test/sidebars/test_telemetry.html
rename to devtools/client/webide/test/sidebars/test_telemetry.html
diff --git a/browser/devtools/webide/test/templates.json b/devtools/client/webide/test/templates.json
similarity index 100%
rename from browser/devtools/webide/test/templates.json
rename to devtools/client/webide/test/templates.json
diff --git a/browser/devtools/webide/test/test_addons.html b/devtools/client/webide/test/test_addons.html
similarity index 100%
rename from browser/devtools/webide/test/test_addons.html
rename to devtools/client/webide/test/test_addons.html
diff --git a/browser/devtools/webide/test/test_autoconnect_runtime.html b/devtools/client/webide/test/test_autoconnect_runtime.html
similarity index 100%
rename from browser/devtools/webide/test/test_autoconnect_runtime.html
rename to devtools/client/webide/test/test_autoconnect_runtime.html
diff --git a/browser/devtools/webide/test/test_autoselect_project.html b/devtools/client/webide/test/test_autoselect_project.html
similarity index 100%
rename from browser/devtools/webide/test/test_autoselect_project.html
rename to devtools/client/webide/test/test_autoselect_project.html
diff --git a/browser/devtools/webide/test/test_basic.html b/devtools/client/webide/test/test_basic.html
similarity index 100%
rename from browser/devtools/webide/test/test_basic.html
rename to devtools/client/webide/test/test_basic.html
diff --git a/browser/devtools/webide/test/test_build.html b/devtools/client/webide/test/test_build.html
similarity index 100%
rename from browser/devtools/webide/test/test_build.html
rename to devtools/client/webide/test/test_build.html
diff --git a/browser/devtools/webide/test/test_device_permissions.html b/devtools/client/webide/test/test_device_permissions.html
similarity index 100%
rename from browser/devtools/webide/test/test_device_permissions.html
rename to devtools/client/webide/test/test_device_permissions.html
diff --git a/browser/devtools/webide/test/test_device_preferences.html b/devtools/client/webide/test/test_device_preferences.html
similarity index 100%
rename from browser/devtools/webide/test/test_device_preferences.html
rename to devtools/client/webide/test/test_device_preferences.html
diff --git a/browser/devtools/webide/test/test_device_runtime.html b/devtools/client/webide/test/test_device_runtime.html
similarity index 100%
rename from browser/devtools/webide/test/test_device_runtime.html
rename to devtools/client/webide/test/test_device_runtime.html
diff --git a/browser/devtools/webide/test/test_device_settings.html b/devtools/client/webide/test/test_device_settings.html
similarity index 100%
rename from browser/devtools/webide/test/test_device_settings.html
rename to devtools/client/webide/test/test_device_settings.html
diff --git a/browser/devtools/webide/test/test_duplicate_import.html b/devtools/client/webide/test/test_duplicate_import.html
similarity index 100%
rename from browser/devtools/webide/test/test_duplicate_import.html
rename to devtools/client/webide/test/test_duplicate_import.html
diff --git a/browser/devtools/webide/test/test_fullscreenToolbox.html b/devtools/client/webide/test/test_fullscreenToolbox.html
similarity index 100%
rename from browser/devtools/webide/test/test_fullscreenToolbox.html
rename to devtools/client/webide/test/test_fullscreenToolbox.html
diff --git a/browser/devtools/webide/test/test_import.html b/devtools/client/webide/test/test_import.html
similarity index 100%
rename from browser/devtools/webide/test/test_import.html
rename to devtools/client/webide/test/test_import.html
diff --git a/browser/devtools/webide/test/test_manifestUpdate.html b/devtools/client/webide/test/test_manifestUpdate.html
similarity index 100%
rename from browser/devtools/webide/test/test_manifestUpdate.html
rename to devtools/client/webide/test/test_manifestUpdate.html
diff --git a/browser/devtools/webide/test/test_newapp.html b/devtools/client/webide/test/test_newapp.html
similarity index 100%
rename from browser/devtools/webide/test/test_newapp.html
rename to devtools/client/webide/test/test_newapp.html
diff --git a/browser/devtools/webide/test/test_runtime.html b/devtools/client/webide/test/test_runtime.html
similarity index 100%
rename from browser/devtools/webide/test/test_runtime.html
rename to devtools/client/webide/test/test_runtime.html
diff --git a/browser/devtools/webide/test/test_simulators.html b/devtools/client/webide/test/test_simulators.html
similarity index 100%
rename from browser/devtools/webide/test/test_simulators.html
rename to devtools/client/webide/test/test_simulators.html
diff --git a/browser/devtools/webide/test/test_telemetry.html b/devtools/client/webide/test/test_telemetry.html
similarity index 100%
rename from browser/devtools/webide/test/test_telemetry.html
rename to devtools/client/webide/test/test_telemetry.html
diff --git a/browser/devtools/webide/test/test_zoom.html b/devtools/client/webide/test/test_zoom.html
similarity index 100%
rename from browser/devtools/webide/test/test_zoom.html
rename to devtools/client/webide/test/test_zoom.html
diff --git a/browser/devtools/webide/themes/addons.css b/devtools/client/webide/themes/addons.css
similarity index 100%
rename from browser/devtools/webide/themes/addons.css
rename to devtools/client/webide/themes/addons.css
diff --git a/browser/devtools/webide/themes/config-view.css b/devtools/client/webide/themes/config-view.css
similarity index 100%
rename from browser/devtools/webide/themes/config-view.css
rename to devtools/client/webide/themes/config-view.css
diff --git a/browser/devtools/webide/themes/deck.css b/devtools/client/webide/themes/deck.css
similarity index 100%
rename from browser/devtools/webide/themes/deck.css
rename to devtools/client/webide/themes/deck.css
diff --git a/browser/devtools/webide/themes/details.css b/devtools/client/webide/themes/details.css
similarity index 100%
rename from browser/devtools/webide/themes/details.css
rename to devtools/client/webide/themes/details.css
diff --git a/browser/devtools/webide/themes/icons.png b/devtools/client/webide/themes/icons.png
similarity index 100%
rename from browser/devtools/webide/themes/icons.png
rename to devtools/client/webide/themes/icons.png
diff --git a/browser/devtools/webide/themes/jar.mn b/devtools/client/webide/themes/jar.mn
similarity index 100%
rename from browser/devtools/webide/themes/jar.mn
rename to devtools/client/webide/themes/jar.mn
diff --git a/browser/devtools/webide/themes/logs.css b/devtools/client/webide/themes/logs.css
similarity index 100%
rename from browser/devtools/webide/themes/logs.css
rename to devtools/client/webide/themes/logs.css
diff --git a/browser/devtools/webide/themes/monitor.css b/devtools/client/webide/themes/monitor.css
similarity index 100%
rename from browser/devtools/webide/themes/monitor.css
rename to devtools/client/webide/themes/monitor.css
diff --git a/browser/devtools/webide/themes/moz.build b/devtools/client/webide/themes/moz.build
similarity index 100%
rename from browser/devtools/webide/themes/moz.build
rename to devtools/client/webide/themes/moz.build
diff --git a/browser/devtools/webide/themes/newapp.css b/devtools/client/webide/themes/newapp.css
similarity index 100%
rename from browser/devtools/webide/themes/newapp.css
rename to devtools/client/webide/themes/newapp.css
diff --git a/browser/devtools/webide/themes/panel-listing.css b/devtools/client/webide/themes/panel-listing.css
similarity index 100%
rename from browser/devtools/webide/themes/panel-listing.css
rename to devtools/client/webide/themes/panel-listing.css
diff --git a/browser/devtools/webide/themes/permissionstable.css b/devtools/client/webide/themes/permissionstable.css
similarity index 100%
rename from browser/devtools/webide/themes/permissionstable.css
rename to devtools/client/webide/themes/permissionstable.css
diff --git a/browser/devtools/webide/themes/runtimedetails.css b/devtools/client/webide/themes/runtimedetails.css
similarity index 100%
rename from browser/devtools/webide/themes/runtimedetails.css
rename to devtools/client/webide/themes/runtimedetails.css
diff --git a/browser/devtools/webide/themes/simulator.css b/devtools/client/webide/themes/simulator.css
similarity index 100%
rename from browser/devtools/webide/themes/simulator.css
rename to devtools/client/webide/themes/simulator.css
diff --git a/browser/devtools/webide/themes/throbber.svg b/devtools/client/webide/themes/throbber.svg
similarity index 100%
rename from browser/devtools/webide/themes/throbber.svg
rename to devtools/client/webide/themes/throbber.svg
diff --git a/browser/devtools/webide/themes/webide.css b/devtools/client/webide/themes/webide.css
similarity index 100%
rename from browser/devtools/webide/themes/webide.css
rename to devtools/client/webide/themes/webide.css
diff --git a/browser/devtools/webide/themes/wifi-auth.css b/devtools/client/webide/themes/wifi-auth.css
similarity index 100%
rename from browser/devtools/webide/themes/wifi-auth.css
rename to devtools/client/webide/themes/wifi-auth.css
diff --git a/browser/devtools/webide/webide-prefs.js b/devtools/client/webide/webide-prefs.js
similarity index 100%
rename from browser/devtools/webide/webide-prefs.js
rename to devtools/client/webide/webide-prefs.js
diff --git a/toolkit/devtools/server/actors/actor-registry.js b/devtools/server/actors/actor-registry.js
similarity index 100%
rename from toolkit/devtools/server/actors/actor-registry.js
rename to devtools/server/actors/actor-registry.js
diff --git a/toolkit/devtools/server/actors/addon.js b/devtools/server/actors/addon.js
similarity index 100%
rename from toolkit/devtools/server/actors/addon.js
rename to devtools/server/actors/addon.js
diff --git a/toolkit/devtools/server/actors/animation.js b/devtools/server/actors/animation.js
similarity index 100%
rename from toolkit/devtools/server/actors/animation.js
rename to devtools/server/actors/animation.js
diff --git a/toolkit/devtools/server/actors/call-watcher.js b/devtools/server/actors/call-watcher.js
similarity index 100%
rename from toolkit/devtools/server/actors/call-watcher.js
rename to devtools/server/actors/call-watcher.js
diff --git a/toolkit/devtools/server/actors/canvas.js b/devtools/server/actors/canvas.js
similarity index 100%
rename from toolkit/devtools/server/actors/canvas.js
rename to devtools/server/actors/canvas.js
diff --git a/toolkit/devtools/server/actors/child-process.js b/devtools/server/actors/child-process.js
similarity index 100%
rename from toolkit/devtools/server/actors/child-process.js
rename to devtools/server/actors/child-process.js
diff --git a/toolkit/devtools/server/actors/childtab.js b/devtools/server/actors/childtab.js
similarity index 100%
rename from toolkit/devtools/server/actors/childtab.js
rename to devtools/server/actors/childtab.js
diff --git a/toolkit/devtools/server/actors/chrome.js b/devtools/server/actors/chrome.js
similarity index 100%
rename from toolkit/devtools/server/actors/chrome.js
rename to devtools/server/actors/chrome.js
diff --git a/toolkit/devtools/server/actors/common.js b/devtools/server/actors/common.js
similarity index 100%
rename from toolkit/devtools/server/actors/common.js
rename to devtools/server/actors/common.js
diff --git a/toolkit/devtools/server/actors/csscoverage.js b/devtools/server/actors/csscoverage.js
similarity index 100%
rename from toolkit/devtools/server/actors/csscoverage.js
rename to devtools/server/actors/csscoverage.js
diff --git a/toolkit/devtools/server/actors/device.js b/devtools/server/actors/device.js
similarity index 100%
rename from toolkit/devtools/server/actors/device.js
rename to devtools/server/actors/device.js
diff --git a/toolkit/devtools/server/actors/director-manager.js b/devtools/server/actors/director-manager.js
similarity index 100%
rename from toolkit/devtools/server/actors/director-manager.js
rename to devtools/server/actors/director-manager.js
diff --git a/toolkit/devtools/server/actors/director-registry.js b/devtools/server/actors/director-registry.js
similarity index 100%
rename from toolkit/devtools/server/actors/director-registry.js
rename to devtools/server/actors/director-registry.js
diff --git a/toolkit/devtools/server/actors/eventlooplag.js b/devtools/server/actors/eventlooplag.js
similarity index 100%
rename from toolkit/devtools/server/actors/eventlooplag.js
rename to devtools/server/actors/eventlooplag.js
diff --git a/toolkit/devtools/server/actors/framerate.js b/devtools/server/actors/framerate.js
similarity index 100%
rename from toolkit/devtools/server/actors/framerate.js
rename to devtools/server/actors/framerate.js
diff --git a/toolkit/devtools/server/actors/gcli.js b/devtools/server/actors/gcli.js
similarity index 100%
rename from toolkit/devtools/server/actors/gcli.js
rename to devtools/server/actors/gcli.js
diff --git a/toolkit/devtools/server/actors/highlighters.css b/devtools/server/actors/highlighters.css
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters.css
rename to devtools/server/actors/highlighters.css
diff --git a/toolkit/devtools/server/actors/highlighters.js b/devtools/server/actors/highlighters.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters.js
rename to devtools/server/actors/highlighters.js
diff --git a/toolkit/devtools/server/actors/highlighters/auto-refresh.js b/devtools/server/actors/highlighters/auto-refresh.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/auto-refresh.js
rename to devtools/server/actors/highlighters/auto-refresh.js
diff --git a/toolkit/devtools/server/actors/highlighters/box-model.js b/devtools/server/actors/highlighters/box-model.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/box-model.js
rename to devtools/server/actors/highlighters/box-model.js
diff --git a/toolkit/devtools/server/actors/highlighters/css-transform.js b/devtools/server/actors/highlighters/css-transform.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/css-transform.js
rename to devtools/server/actors/highlighters/css-transform.js
diff --git a/toolkit/devtools/server/actors/highlighters/geometry-editor.js b/devtools/server/actors/highlighters/geometry-editor.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/geometry-editor.js
rename to devtools/server/actors/highlighters/geometry-editor.js
diff --git a/toolkit/devtools/server/actors/highlighters/rect.js b/devtools/server/actors/highlighters/rect.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/rect.js
rename to devtools/server/actors/highlighters/rect.js
diff --git a/toolkit/devtools/server/actors/highlighters/rulers.js b/devtools/server/actors/highlighters/rulers.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/rulers.js
rename to devtools/server/actors/highlighters/rulers.js
diff --git a/toolkit/devtools/server/actors/highlighters/selector.js b/devtools/server/actors/highlighters/selector.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/selector.js
rename to devtools/server/actors/highlighters/selector.js
diff --git a/toolkit/devtools/server/actors/highlighters/simple-outline.js b/devtools/server/actors/highlighters/simple-outline.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/simple-outline.js
rename to devtools/server/actors/highlighters/simple-outline.js
diff --git a/toolkit/devtools/server/actors/highlighters/utils/markup.js b/devtools/server/actors/highlighters/utils/markup.js
similarity index 100%
rename from toolkit/devtools/server/actors/highlighters/utils/markup.js
rename to devtools/server/actors/highlighters/utils/markup.js
diff --git a/toolkit/devtools/server/actors/inspector.js b/devtools/server/actors/inspector.js
similarity index 100%
rename from toolkit/devtools/server/actors/inspector.js
rename to devtools/server/actors/inspector.js
diff --git a/toolkit/devtools/server/actors/layout.js b/devtools/server/actors/layout.js
similarity index 100%
rename from toolkit/devtools/server/actors/layout.js
rename to devtools/server/actors/layout.js
diff --git a/toolkit/devtools/server/actors/memory.js b/devtools/server/actors/memory.js
similarity index 100%
rename from toolkit/devtools/server/actors/memory.js
rename to devtools/server/actors/memory.js
diff --git a/toolkit/devtools/server/actors/memprof.js b/devtools/server/actors/memprof.js
similarity index 100%
rename from toolkit/devtools/server/actors/memprof.js
rename to devtools/server/actors/memprof.js
diff --git a/toolkit/devtools/server/actors/monitor.js b/devtools/server/actors/monitor.js
similarity index 100%
rename from toolkit/devtools/server/actors/monitor.js
rename to devtools/server/actors/monitor.js
diff --git a/toolkit/devtools/server/actors/object.js b/devtools/server/actors/object.js
similarity index 100%
rename from toolkit/devtools/server/actors/object.js
rename to devtools/server/actors/object.js
diff --git a/toolkit/devtools/server/actors/performance-entries.js b/devtools/server/actors/performance-entries.js
similarity index 100%
rename from toolkit/devtools/server/actors/performance-entries.js
rename to devtools/server/actors/performance-entries.js
diff --git a/toolkit/devtools/server/actors/performance-recording.js b/devtools/server/actors/performance-recording.js
similarity index 100%
rename from toolkit/devtools/server/actors/performance-recording.js
rename to devtools/server/actors/performance-recording.js
diff --git a/toolkit/devtools/server/actors/performance.js b/devtools/server/actors/performance.js
similarity index 100%
rename from toolkit/devtools/server/actors/performance.js
rename to devtools/server/actors/performance.js
diff --git a/toolkit/devtools/server/actors/preference.js b/devtools/server/actors/preference.js
similarity index 100%
rename from toolkit/devtools/server/actors/preference.js
rename to devtools/server/actors/preference.js
diff --git a/toolkit/devtools/server/actors/pretty-print-worker.js b/devtools/server/actors/pretty-print-worker.js
similarity index 100%
rename from toolkit/devtools/server/actors/pretty-print-worker.js
rename to devtools/server/actors/pretty-print-worker.js
diff --git a/toolkit/devtools/server/actors/profiler.js b/devtools/server/actors/profiler.js
similarity index 100%
rename from toolkit/devtools/server/actors/profiler.js
rename to devtools/server/actors/profiler.js
diff --git a/toolkit/devtools/server/actors/promises.js b/devtools/server/actors/promises.js
similarity index 100%
rename from toolkit/devtools/server/actors/promises.js
rename to devtools/server/actors/promises.js
diff --git a/toolkit/devtools/server/actors/root.js b/devtools/server/actors/root.js
similarity index 100%
rename from toolkit/devtools/server/actors/root.js
rename to devtools/server/actors/root.js
diff --git a/toolkit/devtools/server/actors/script.js b/devtools/server/actors/script.js
similarity index 100%
rename from toolkit/devtools/server/actors/script.js
rename to devtools/server/actors/script.js
diff --git a/toolkit/devtools/server/actors/settings.js b/devtools/server/actors/settings.js
similarity index 100%
rename from toolkit/devtools/server/actors/settings.js
rename to devtools/server/actors/settings.js
diff --git a/toolkit/devtools/server/actors/storage.js b/devtools/server/actors/storage.js
similarity index 100%
rename from toolkit/devtools/server/actors/storage.js
rename to devtools/server/actors/storage.js
diff --git a/toolkit/devtools/server/actors/string.js b/devtools/server/actors/string.js
similarity index 100%
rename from toolkit/devtools/server/actors/string.js
rename to devtools/server/actors/string.js
diff --git a/toolkit/devtools/server/actors/styleeditor.js b/devtools/server/actors/styleeditor.js
similarity index 100%
rename from toolkit/devtools/server/actors/styleeditor.js
rename to devtools/server/actors/styleeditor.js
diff --git a/toolkit/devtools/server/actors/styles.js b/devtools/server/actors/styles.js
similarity index 100%
rename from toolkit/devtools/server/actors/styles.js
rename to devtools/server/actors/styles.js
diff --git a/toolkit/devtools/server/actors/stylesheets.js b/devtools/server/actors/stylesheets.js
similarity index 100%
rename from toolkit/devtools/server/actors/stylesheets.js
rename to devtools/server/actors/stylesheets.js
diff --git a/toolkit/devtools/server/actors/timeline.js b/devtools/server/actors/timeline.js
similarity index 100%
rename from toolkit/devtools/server/actors/timeline.js
rename to devtools/server/actors/timeline.js
diff --git a/toolkit/devtools/server/actors/utils/ScriptStore.js b/devtools/server/actors/utils/ScriptStore.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/ScriptStore.js
rename to devtools/server/actors/utils/ScriptStore.js
diff --git a/toolkit/devtools/server/actors/utils/TabSources.js b/devtools/server/actors/utils/TabSources.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/TabSources.js
rename to devtools/server/actors/utils/TabSources.js
diff --git a/toolkit/devtools/server/actors/utils/actor-registry-utils.js b/devtools/server/actors/utils/actor-registry-utils.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/actor-registry-utils.js
rename to devtools/server/actors/utils/actor-registry-utils.js
diff --git a/toolkit/devtools/server/actors/utils/audionodes.json b/devtools/server/actors/utils/audionodes.json
similarity index 100%
rename from toolkit/devtools/server/actors/utils/audionodes.json
rename to devtools/server/actors/utils/audionodes.json
diff --git a/toolkit/devtools/server/actors/utils/automation-timeline.js b/devtools/server/actors/utils/automation-timeline.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/automation-timeline.js
rename to devtools/server/actors/utils/automation-timeline.js
diff --git a/toolkit/devtools/server/actors/utils/make-debugger.js b/devtools/server/actors/utils/make-debugger.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/make-debugger.js
rename to devtools/server/actors/utils/make-debugger.js
diff --git a/toolkit/devtools/server/actors/utils/map-uri-to-addon-id.js b/devtools/server/actors/utils/map-uri-to-addon-id.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/map-uri-to-addon-id.js
rename to devtools/server/actors/utils/map-uri-to-addon-id.js
diff --git a/toolkit/devtools/server/actors/utils/stack.js b/devtools/server/actors/utils/stack.js
similarity index 100%
rename from toolkit/devtools/server/actors/utils/stack.js
rename to devtools/server/actors/utils/stack.js
diff --git a/toolkit/devtools/server/actors/webapps.js b/devtools/server/actors/webapps.js
similarity index 100%
rename from toolkit/devtools/server/actors/webapps.js
rename to devtools/server/actors/webapps.js
diff --git a/toolkit/devtools/server/actors/webaudio.js b/devtools/server/actors/webaudio.js
similarity index 100%
rename from toolkit/devtools/server/actors/webaudio.js
rename to devtools/server/actors/webaudio.js
diff --git a/toolkit/devtools/server/actors/webbrowser.js b/devtools/server/actors/webbrowser.js
similarity index 100%
rename from toolkit/devtools/server/actors/webbrowser.js
rename to devtools/server/actors/webbrowser.js
diff --git a/toolkit/devtools/server/actors/webconsole.js b/devtools/server/actors/webconsole.js
similarity index 100%
rename from toolkit/devtools/server/actors/webconsole.js
rename to devtools/server/actors/webconsole.js
diff --git a/toolkit/devtools/server/actors/webgl.js b/devtools/server/actors/webgl.js
similarity index 100%
rename from toolkit/devtools/server/actors/webgl.js
rename to devtools/server/actors/webgl.js
diff --git a/toolkit/devtools/server/actors/worker.js b/devtools/server/actors/worker.js
similarity index 100%
rename from toolkit/devtools/server/actors/worker.js
rename to devtools/server/actors/worker.js
diff --git a/toolkit/devtools/server/child.js b/devtools/server/child.js
similarity index 100%
rename from toolkit/devtools/server/child.js
rename to devtools/server/child.js
diff --git a/toolkit/devtools/server/content-globals.js b/devtools/server/content-globals.js
similarity index 100%
rename from toolkit/devtools/server/content-globals.js
rename to devtools/server/content-globals.js
diff --git a/toolkit/devtools/server/content-server.jsm b/devtools/server/content-server.jsm
similarity index 100%
rename from toolkit/devtools/server/content-server.jsm
rename to devtools/server/content-server.jsm
diff --git a/toolkit/devtools/server/dbg-server.jsm b/devtools/server/dbg-server.jsm
similarity index 100%
rename from toolkit/devtools/server/dbg-server.jsm
rename to devtools/server/dbg-server.jsm
diff --git a/toolkit/devtools/server/docs/actor-e10s-handling.md b/devtools/server/docs/actor-e10s-handling.md
similarity index 100%
rename from toolkit/devtools/server/docs/actor-e10s-handling.md
rename to devtools/server/docs/actor-e10s-handling.md
diff --git a/toolkit/devtools/server/docs/actor-hierarchy.md b/devtools/server/docs/actor-hierarchy.md
similarity index 100%
rename from toolkit/devtools/server/docs/actor-hierarchy.md
rename to devtools/server/docs/actor-hierarchy.md
diff --git a/toolkit/devtools/server/docs/actor-registration.md b/devtools/server/docs/actor-registration.md
similarity index 100%
rename from toolkit/devtools/server/docs/actor-registration.md
rename to devtools/server/docs/actor-registration.md
diff --git a/toolkit/devtools/server/docs/protocol.js.md b/devtools/server/docs/protocol.js.md
similarity index 100%
rename from toolkit/devtools/server/docs/protocol.js.md
rename to devtools/server/docs/protocol.js.md
diff --git a/toolkit/devtools/server/main.js b/devtools/server/main.js
similarity index 100%
rename from toolkit/devtools/server/main.js
rename to devtools/server/main.js
diff --git a/toolkit/devtools/server/moz.build b/devtools/server/moz.build
similarity index 100%
rename from toolkit/devtools/server/moz.build
rename to devtools/server/moz.build
diff --git a/toolkit/devtools/server/nsIJSInspector.idl b/devtools/server/nsIJSInspector.idl
similarity index 100%
rename from toolkit/devtools/server/nsIJSInspector.idl
rename to devtools/server/nsIJSInspector.idl
diff --git a/toolkit/devtools/server/nsJSInspector.cpp b/devtools/server/nsJSInspector.cpp
similarity index 100%
rename from toolkit/devtools/server/nsJSInspector.cpp
rename to devtools/server/nsJSInspector.cpp
diff --git a/toolkit/devtools/server/nsJSInspector.h b/devtools/server/nsJSInspector.h
similarity index 100%
rename from toolkit/devtools/server/nsJSInspector.h
rename to devtools/server/nsJSInspector.h
diff --git a/toolkit/devtools/server/protocol.js b/devtools/server/protocol.js
similarity index 100%
rename from toolkit/devtools/server/protocol.js
rename to devtools/server/protocol.js
diff --git a/toolkit/devtools/server/tests/browser/.eslintrc b/devtools/server/tests/browser/.eslintrc
similarity index 100%
rename from toolkit/devtools/server/tests/browser/.eslintrc
rename to devtools/server/tests/browser/.eslintrc
diff --git a/toolkit/devtools/server/tests/browser/animation.html b/devtools/server/tests/browser/animation.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/animation.html
rename to devtools/server/tests/browser/animation.html
diff --git a/toolkit/devtools/server/tests/browser/browser.ini b/devtools/server/tests/browser/browser.ini
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser.ini
rename to devtools/server/tests/browser/browser.ini
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_01.js b/devtools/server/tests/browser/browser_animation_actors_01.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_01.js
rename to devtools/server/tests/browser/browser_animation_actors_01.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_02.js b/devtools/server/tests/browser/browser_animation_actors_02.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_02.js
rename to devtools/server/tests/browser/browser_animation_actors_02.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_03.js b/devtools/server/tests/browser/browser_animation_actors_03.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_03.js
rename to devtools/server/tests/browser/browser_animation_actors_03.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_04.js b/devtools/server/tests/browser/browser_animation_actors_04.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_04.js
rename to devtools/server/tests/browser/browser_animation_actors_04.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_06.js b/devtools/server/tests/browser/browser_animation_actors_06.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_06.js
rename to devtools/server/tests/browser/browser_animation_actors_06.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_07.js b/devtools/server/tests/browser/browser_animation_actors_07.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_07.js
rename to devtools/server/tests/browser/browser_animation_actors_07.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_08.js b/devtools/server/tests/browser/browser_animation_actors_08.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_08.js
rename to devtools/server/tests/browser/browser_animation_actors_08.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_09.js b/devtools/server/tests/browser/browser_animation_actors_09.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_09.js
rename to devtools/server/tests/browser/browser_animation_actors_09.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_10.js b/devtools/server/tests/browser/browser_animation_actors_10.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_10.js
rename to devtools/server/tests/browser/browser_animation_actors_10.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_11.js b/devtools/server/tests/browser/browser_animation_actors_11.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_11.js
rename to devtools/server/tests/browser/browser_animation_actors_11.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_12.js b/devtools/server/tests/browser/browser_animation_actors_12.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_12.js
rename to devtools/server/tests/browser/browser_animation_actors_12.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_13.js b/devtools/server/tests/browser/browser_animation_actors_13.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_13.js
rename to devtools/server/tests/browser/browser_animation_actors_13.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_14.js b/devtools/server/tests/browser/browser_animation_actors_14.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_14.js
rename to devtools/server/tests/browser/browser_animation_actors_14.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_15.js b/devtools/server/tests/browser/browser_animation_actors_15.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_15.js
rename to devtools/server/tests/browser/browser_animation_actors_15.js
diff --git a/toolkit/devtools/server/tests/browser/browser_animation_actors_16.js b/devtools/server/tests/browser/browser_animation_actors_16.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_animation_actors_16.js
rename to devtools/server/tests/browser/browser_animation_actors_16.js
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_01.js b/devtools/server/tests/browser/browser_canvasframe_helper_01.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_canvasframe_helper_01.js
rename to devtools/server/tests/browser/browser_canvasframe_helper_01.js
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_02.js b/devtools/server/tests/browser/browser_canvasframe_helper_02.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_canvasframe_helper_02.js
rename to devtools/server/tests/browser/browser_canvasframe_helper_02.js
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_03.js b/devtools/server/tests/browser/browser_canvasframe_helper_03.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_canvasframe_helper_03.js
rename to devtools/server/tests/browser/browser_canvasframe_helper_03.js
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_04.js b/devtools/server/tests/browser/browser_canvasframe_helper_04.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_canvasframe_helper_04.js
rename to devtools/server/tests/browser/browser_canvasframe_helper_04.js
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_05.js b/devtools/server/tests/browser/browser_canvasframe_helper_05.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_canvasframe_helper_05.js
rename to devtools/server/tests/browser/browser_canvasframe_helper_05.js
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_06.js b/devtools/server/tests/browser/browser_canvasframe_helper_06.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_canvasframe_helper_06.js
rename to devtools/server/tests/browser/browser_canvasframe_helper_06.js
diff --git a/toolkit/devtools/server/tests/browser/browser_directorscript_actors.js b/devtools/server/tests/browser/browser_directorscript_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_directorscript_actors.js
rename to devtools/server/tests/browser/browser_directorscript_actors.js
diff --git a/toolkit/devtools/server/tests/browser/browser_directorscript_actors_error_events.js b/devtools/server/tests/browser/browser_directorscript_actors_error_events.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_directorscript_actors_error_events.js
rename to devtools/server/tests/browser/browser_directorscript_actors_error_events.js
diff --git a/toolkit/devtools/server/tests/browser/browser_directorscript_actors_exports.js b/devtools/server/tests/browser/browser_directorscript_actors_exports.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_directorscript_actors_exports.js
rename to devtools/server/tests/browser/browser_directorscript_actors_exports.js
diff --git a/toolkit/devtools/server/tests/browser/browser_markers-cycle-collection.js b/devtools/server/tests/browser/browser_markers-cycle-collection.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_markers-cycle-collection.js
rename to devtools/server/tests/browser/browser_markers-cycle-collection.js
diff --git a/toolkit/devtools/server/tests/browser/browser_markers-gc.js b/devtools/server/tests/browser/browser_markers-gc.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_markers-gc.js
rename to devtools/server/tests/browser/browser_markers-gc.js
diff --git a/toolkit/devtools/server/tests/browser/browser_markers-parse-html.js b/devtools/server/tests/browser/browser_markers-parse-html.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_markers-parse-html.js
rename to devtools/server/tests/browser/browser_markers-parse-html.js
diff --git a/toolkit/devtools/server/tests/browser/browser_markers-styles.js b/devtools/server/tests/browser/browser_markers-styles.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_markers-styles.js
rename to devtools/server/tests/browser/browser_markers-styles.js
diff --git a/toolkit/devtools/server/tests/browser/browser_markers-timestamp.js b/devtools/server/tests/browser/browser_markers-timestamp.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_markers-timestamp.js
rename to devtools/server/tests/browser/browser_markers-timestamp.js
diff --git a/toolkit/devtools/server/tests/browser/browser_navigateEvents.js b/devtools/server/tests/browser/browser_navigateEvents.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_navigateEvents.js
rename to devtools/server/tests/browser/browser_navigateEvents.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-allocation-data.js b/devtools/server/tests/browser/browser_perf-allocation-data.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-allocation-data.js
rename to devtools/server/tests/browser/browser_perf-allocation-data.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-legacy-front-01.js b/devtools/server/tests/browser/browser_perf-legacy-front-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-legacy-front-01.js
rename to devtools/server/tests/browser/browser_perf-legacy-front-01.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-legacy-front-02.js b/devtools/server/tests/browser/browser_perf-legacy-front-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-legacy-front-02.js
rename to devtools/server/tests/browser/browser_perf-legacy-front-02.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-legacy-front-03.js b/devtools/server/tests/browser/browser_perf-legacy-front-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-legacy-front-03.js
rename to devtools/server/tests/browser/browser_perf-legacy-front-03.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-profiler-01.js b/devtools/server/tests/browser/browser_perf-profiler-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-profiler-01.js
rename to devtools/server/tests/browser/browser_perf-profiler-01.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-profiler-02.js b/devtools/server/tests/browser/browser_perf-profiler-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-profiler-02.js
rename to devtools/server/tests/browser/browser_perf-profiler-02.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-profiler-03.js b/devtools/server/tests/browser/browser_perf-profiler-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-profiler-03.js
rename to devtools/server/tests/browser/browser_perf-profiler-03.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-realtime-markers.js b/devtools/server/tests/browser/browser_perf-realtime-markers.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-realtime-markers.js
rename to devtools/server/tests/browser/browser_perf-realtime-markers.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-recording-actor-01.js b/devtools/server/tests/browser/browser_perf-recording-actor-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-recording-actor-01.js
rename to devtools/server/tests/browser/browser_perf-recording-actor-01.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-recording-actor-02.js b/devtools/server/tests/browser/browser_perf-recording-actor-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-recording-actor-02.js
rename to devtools/server/tests/browser/browser_perf-recording-actor-02.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-samples-01.js b/devtools/server/tests/browser/browser_perf-samples-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-samples-01.js
rename to devtools/server/tests/browser/browser_perf-samples-01.js
diff --git a/toolkit/devtools/server/tests/browser/browser_perf-samples-02.js b/devtools/server/tests/browser/browser_perf-samples-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_perf-samples-02.js
rename to devtools/server/tests/browser/browser_perf-samples-02.js
diff --git a/toolkit/devtools/server/tests/browser/browser_storage_dynamic_windows.js b/devtools/server/tests/browser/browser_storage_dynamic_windows.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_storage_dynamic_windows.js
rename to devtools/server/tests/browser/browser_storage_dynamic_windows.js
diff --git a/toolkit/devtools/server/tests/browser/browser_storage_listings.js b/devtools/server/tests/browser/browser_storage_listings.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_storage_listings.js
rename to devtools/server/tests/browser/browser_storage_listings.js
diff --git a/toolkit/devtools/server/tests/browser/browser_storage_updates.js b/devtools/server/tests/browser/browser_storage_updates.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_storage_updates.js
rename to devtools/server/tests/browser/browser_storage_updates.js
diff --git a/toolkit/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js b/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js
rename to devtools/server/tests/browser/browser_stylesheets_nested-iframes.js
diff --git a/toolkit/devtools/server/tests/browser/browser_timeline.js b/devtools/server/tests/browser/browser_timeline.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_timeline.js
rename to devtools/server/tests/browser/browser_timeline.js
diff --git a/toolkit/devtools/server/tests/browser/browser_timeline_actors.js b/devtools/server/tests/browser/browser_timeline_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_timeline_actors.js
rename to devtools/server/tests/browser/browser_timeline_actors.js
diff --git a/toolkit/devtools/server/tests/browser/browser_timeline_iframes.js b/devtools/server/tests/browser/browser_timeline_iframes.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/browser_timeline_iframes.js
rename to devtools/server/tests/browser/browser_timeline_iframes.js
diff --git a/toolkit/devtools/server/tests/browser/director-script-target.html b/devtools/server/tests/browser/director-script-target.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/director-script-target.html
rename to devtools/server/tests/browser/director-script-target.html
diff --git a/toolkit/devtools/server/tests/browser/doc_allocations.html b/devtools/server/tests/browser/doc_allocations.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/doc_allocations.html
rename to devtools/server/tests/browser/doc_allocations.html
diff --git a/toolkit/devtools/server/tests/browser/doc_force_cc.html b/devtools/server/tests/browser/doc_force_cc.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/doc_force_cc.html
rename to devtools/server/tests/browser/doc_force_cc.html
diff --git a/toolkit/devtools/server/tests/browser/doc_force_gc.html b/devtools/server/tests/browser/doc_force_gc.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/doc_force_gc.html
rename to devtools/server/tests/browser/doc_force_gc.html
diff --git a/toolkit/devtools/server/tests/browser/doc_innerHTML.html b/devtools/server/tests/browser/doc_innerHTML.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/doc_innerHTML.html
rename to devtools/server/tests/browser/doc_innerHTML.html
diff --git a/toolkit/devtools/server/tests/browser/doc_perf.html b/devtools/server/tests/browser/doc_perf.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/doc_perf.html
rename to devtools/server/tests/browser/doc_perf.html
diff --git a/toolkit/devtools/server/tests/browser/head.js b/devtools/server/tests/browser/head.js
similarity index 100%
rename from toolkit/devtools/server/tests/browser/head.js
rename to devtools/server/tests/browser/head.js
diff --git a/toolkit/devtools/server/tests/browser/navigate-first.html b/devtools/server/tests/browser/navigate-first.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/navigate-first.html
rename to devtools/server/tests/browser/navigate-first.html
diff --git a/toolkit/devtools/server/tests/browser/navigate-second.html b/devtools/server/tests/browser/navigate-second.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/navigate-second.html
rename to devtools/server/tests/browser/navigate-second.html
diff --git a/toolkit/devtools/server/tests/browser/storage-dynamic-windows.html b/devtools/server/tests/browser/storage-dynamic-windows.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/storage-dynamic-windows.html
rename to devtools/server/tests/browser/storage-dynamic-windows.html
diff --git a/toolkit/devtools/server/tests/browser/storage-listings.html b/devtools/server/tests/browser/storage-listings.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/storage-listings.html
rename to devtools/server/tests/browser/storage-listings.html
diff --git a/toolkit/devtools/server/tests/browser/storage-secured-iframe.html b/devtools/server/tests/browser/storage-secured-iframe.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/storage-secured-iframe.html
rename to devtools/server/tests/browser/storage-secured-iframe.html
diff --git a/toolkit/devtools/server/tests/browser/storage-unsecured-iframe.html b/devtools/server/tests/browser/storage-unsecured-iframe.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/storage-unsecured-iframe.html
rename to devtools/server/tests/browser/storage-unsecured-iframe.html
diff --git a/toolkit/devtools/server/tests/browser/storage-updates.html b/devtools/server/tests/browser/storage-updates.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/storage-updates.html
rename to devtools/server/tests/browser/storage-updates.html
diff --git a/toolkit/devtools/server/tests/browser/stylesheets-nested-iframes.html b/devtools/server/tests/browser/stylesheets-nested-iframes.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/stylesheets-nested-iframes.html
rename to devtools/server/tests/browser/stylesheets-nested-iframes.html
diff --git a/toolkit/devtools/server/tests/browser/timeline-iframe-child.html b/devtools/server/tests/browser/timeline-iframe-child.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/timeline-iframe-child.html
rename to devtools/server/tests/browser/timeline-iframe-child.html
diff --git a/toolkit/devtools/server/tests/browser/timeline-iframe-parent.html b/devtools/server/tests/browser/timeline-iframe-parent.html
similarity index 100%
rename from toolkit/devtools/server/tests/browser/timeline-iframe-parent.html
rename to devtools/server/tests/browser/timeline-iframe-parent.html
diff --git a/toolkit/devtools/server/tests/mochitest/.eslintrc b/devtools/server/tests/mochitest/.eslintrc
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/.eslintrc
rename to devtools/server/tests/mochitest/.eslintrc
diff --git a/toolkit/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js b/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js
rename to devtools/server/tests/mochitest/Debugger.Source.prototype.element-2.js
diff --git a/toolkit/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/Debugger.Source.prototype.element.html
rename to devtools/server/tests/mochitest/Debugger.Source.prototype.element.html
diff --git a/toolkit/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js b/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/Debugger.Source.prototype.element.js
rename to devtools/server/tests/mochitest/Debugger.Source.prototype.element.js
diff --git a/toolkit/devtools/server/tests/mochitest/chrome.ini b/devtools/server/tests/mochitest/chrome.ini
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/chrome.ini
rename to devtools/server/tests/mochitest/chrome.ini
diff --git a/toolkit/devtools/server/tests/mochitest/director-helpers.js b/devtools/server/tests/mochitest/director-helpers.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/director-helpers.js
rename to devtools/server/tests/mochitest/director-helpers.js
diff --git a/toolkit/devtools/server/tests/mochitest/hello-actor.js b/devtools/server/tests/mochitest/hello-actor.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/hello-actor.js
rename to devtools/server/tests/mochitest/hello-actor.js
diff --git a/toolkit/devtools/server/tests/mochitest/inspector-delay-image-response.sjs b/devtools/server/tests/mochitest/inspector-delay-image-response.sjs
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/inspector-delay-image-response.sjs
rename to devtools/server/tests/mochitest/inspector-delay-image-response.sjs
diff --git a/toolkit/devtools/server/tests/mochitest/inspector-helpers.js b/devtools/server/tests/mochitest/inspector-helpers.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/inspector-helpers.js
rename to devtools/server/tests/mochitest/inspector-helpers.js
diff --git a/toolkit/devtools/server/tests/mochitest/inspector-styles-data.css b/devtools/server/tests/mochitest/inspector-styles-data.css
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/inspector-styles-data.css
rename to devtools/server/tests/mochitest/inspector-styles-data.css
diff --git a/toolkit/devtools/server/tests/mochitest/inspector-styles-data.html b/devtools/server/tests/mochitest/inspector-styles-data.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/inspector-styles-data.html
rename to devtools/server/tests/mochitest/inspector-styles-data.html
diff --git a/toolkit/devtools/server/tests/mochitest/inspector-traversal-data.html b/devtools/server/tests/mochitest/inspector-traversal-data.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/inspector-traversal-data.html
rename to devtools/server/tests/mochitest/inspector-traversal-data.html
diff --git a/toolkit/devtools/server/tests/mochitest/inspector_getImageData.html b/devtools/server/tests/mochitest/inspector_getImageData.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/inspector_getImageData.html
rename to devtools/server/tests/mochitest/inspector_getImageData.html
diff --git a/toolkit/devtools/server/tests/mochitest/large-image.jpg b/devtools/server/tests/mochitest/large-image.jpg
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/large-image.jpg
rename to devtools/server/tests/mochitest/large-image.jpg
diff --git a/toolkit/devtools/server/tests/mochitest/memory-helpers.js b/devtools/server/tests/mochitest/memory-helpers.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/memory-helpers.js
rename to devtools/server/tests/mochitest/memory-helpers.js
diff --git a/toolkit/devtools/server/tests/mochitest/memprof-helpers.js b/devtools/server/tests/mochitest/memprof-helpers.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/memprof-helpers.js
rename to devtools/server/tests/mochitest/memprof-helpers.js
diff --git a/toolkit/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html b/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html
rename to devtools/server/tests/mochitest/nonchrome_unsafeDereference.html
diff --git a/toolkit/devtools/server/tests/mochitest/setup-in-child.js b/devtools/server/tests/mochitest/setup-in-child.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/setup-in-child.js
rename to devtools/server/tests/mochitest/setup-in-child.js
diff --git a/toolkit/devtools/server/tests/mochitest/setup-in-parent.js b/devtools/server/tests/mochitest/setup-in-parent.js
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/setup-in-parent.js
rename to devtools/server/tests/mochitest/setup-in-parent.js
diff --git a/toolkit/devtools/server/tests/mochitest/small-image.gif b/devtools/server/tests/mochitest/small-image.gif
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/small-image.gif
rename to devtools/server/tests/mochitest/small-image.gif
diff --git a/toolkit/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html b/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
rename to devtools/server/tests/mochitest/test_Debugger.Script.prototype.global.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
rename to devtools/server/tests/mochitest/test_Debugger.Source.prototype.element.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
rename to devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionScript.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html b/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
rename to devtools/server/tests/mochitest/test_Debugger.Source.prototype.introductionType.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_connectToChild.html b/devtools/server/tests/mochitest/test_connectToChild.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_connectToChild.html
rename to devtools/server/tests/mochitest/test_connectToChild.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_connection-manager.html b/devtools/server/tests/mochitest/test_connection-manager.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_connection-manager.html
rename to devtools/server/tests/mochitest/test_connection-manager.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_css-logic-inheritance.html b/devtools/server/tests/mochitest/test_css-logic-inheritance.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_css-logic-inheritance.html
rename to devtools/server/tests/mochitest/test_css-logic-inheritance.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_css-logic-media-queries.html b/devtools/server/tests/mochitest/test_css-logic-media-queries.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_css-logic-media-queries.html
rename to devtools/server/tests/mochitest/test_css-logic-media-queries.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_css-logic-specificity.html b/devtools/server/tests/mochitest/test_css-logic-specificity.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_css-logic-specificity.html
rename to devtools/server/tests/mochitest/test_css-logic-specificity.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_css-logic.html b/devtools/server/tests/mochitest/test_css-logic.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_css-logic.html
rename to devtools/server/tests/mochitest/test_css-logic.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_device.html b/devtools/server/tests/mochitest/test_device.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_device.html
rename to devtools/server/tests/mochitest/test_device.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_director.html b/devtools/server/tests/mochitest/test_director.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_director.html
rename to devtools/server/tests/mochitest/test_director.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_director_connectToChild.html b/devtools/server/tests/mochitest/test_director_connectToChild.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_director_connectToChild.html
rename to devtools/server/tests/mochitest/test_director_connectToChild.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html b/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
rename to devtools/server/tests/mochitest/test_executeInGlobal-outerized_this.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_framerate_01.html b/devtools/server/tests/mochitest/test_framerate_01.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_framerate_01.html
rename to devtools/server/tests/mochitest/test_framerate_01.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_framerate_02.html b/devtools/server/tests/mochitest/test_framerate_02.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_framerate_02.html
rename to devtools/server/tests/mochitest/test_framerate_02.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_framerate_03.html b/devtools/server/tests/mochitest/test_framerate_03.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_framerate_03.html
rename to devtools/server/tests/mochitest/test_framerate_03.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_framerate_04.html b/devtools/server/tests/mochitest/test_framerate_04.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_framerate_04.html
rename to devtools/server/tests/mochitest/test_framerate_04.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_framerate_05.html b/devtools/server/tests/mochitest/test_framerate_05.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_framerate_05.html
rename to devtools/server/tests/mochitest/test_framerate_05.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_framerate_06.html b/devtools/server/tests/mochitest/test_framerate_06.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_framerate_06.html
rename to devtools/server/tests/mochitest/test_framerate_06.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_getProcess.html b/devtools/server/tests/mochitest/test_getProcess.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_getProcess.html
rename to devtools/server/tests/mochitest/test_getProcess.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html b/devtools/server/tests/mochitest/test_inspector-anonymous.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html
rename to devtools/server/tests/mochitest/test_inspector-anonymous.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html b/devtools/server/tests/mochitest/test_inspector-changeattrs.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html
rename to devtools/server/tests/mochitest/test_inspector-changeattrs.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html b/devtools/server/tests/mochitest/test_inspector-changevalue.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html
rename to devtools/server/tests/mochitest/test_inspector-changevalue.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html b/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
rename to devtools/server/tests/mochitest/test_inspector-dead-nodes.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html b/devtools/server/tests/mochitest/test_inspector-hide.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-hide.html
rename to devtools/server/tests/mochitest/test_inspector-hide.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html b/devtools/server/tests/mochitest/test_inspector-insert.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-insert.html
rename to devtools/server/tests/mochitest/test_inspector-insert.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html b/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
rename to devtools/server/tests/mochitest/test_inspector-mutations-attr.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html b/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
rename to devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html b/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
rename to devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html b/devtools/server/tests/mochitest/test_inspector-mutations-value.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html
rename to devtools/server/tests/mochitest/test_inspector-mutations-value.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html b/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
rename to devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-release.html b/devtools/server/tests/mochitest/test_inspector-release.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-release.html
rename to devtools/server/tests/mochitest/test_inspector-release.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html b/devtools/server/tests/mochitest/test_inspector-reload.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-reload.html
rename to devtools/server/tests/mochitest/test_inspector-reload.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html b/devtools/server/tests/mochitest/test_inspector-remove.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-remove.html
rename to devtools/server/tests/mochitest/test_inspector-remove.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html b/devtools/server/tests/mochitest/test_inspector-resolve-url.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html
rename to devtools/server/tests/mochitest/test_inspector-resolve-url.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html b/devtools/server/tests/mochitest/test_inspector-retain.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-retain.html
rename to devtools/server/tests/mochitest/test_inspector-retain.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html b/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
rename to devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html b/devtools/server/tests/mochitest/test_inspector-traversal.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html
rename to devtools/server/tests/mochitest/test_inspector-traversal.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
rename to devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html b/devtools/server/tests/mochitest/test_inspector_getImageData.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html
rename to devtools/server/tests/mochitest/test_inspector_getImageData.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
rename to devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector_getNodeFromActor.html b/devtools/server/tests/mochitest/test_inspector_getNodeFromActor.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_inspector_getNodeFromActor.html
rename to devtools/server/tests/mochitest/test_inspector_getNodeFromActor.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html b/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
rename to devtools/server/tests/mochitest/test_makeGlobalObjectReference.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory.html b/devtools/server/tests/mochitest/test_memory.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory.html
rename to devtools/server/tests/mochitest/test_memory.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_01.html b/devtools/server/tests/mochitest/test_memory_allocations_01.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_01.html
rename to devtools/server/tests/mochitest/test_memory_allocations_01.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_02.html b/devtools/server/tests/mochitest/test_memory_allocations_02.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_02.html
rename to devtools/server/tests/mochitest/test_memory_allocations_02.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_03.html b/devtools/server/tests/mochitest/test_memory_allocations_03.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_03.html
rename to devtools/server/tests/mochitest/test_memory_allocations_03.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_04.html b/devtools/server/tests/mochitest/test_memory_allocations_04.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_04.html
rename to devtools/server/tests/mochitest/test_memory_allocations_04.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_05.html b/devtools/server/tests/mochitest/test_memory_allocations_05.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_05.html
rename to devtools/server/tests/mochitest/test_memory_allocations_05.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_06.html b/devtools/server/tests/mochitest/test_memory_allocations_06.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_06.html
rename to devtools/server/tests/mochitest/test_memory_allocations_06.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_allocations_07.html b/devtools/server/tests/mochitest/test_memory_allocations_07.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_allocations_07.html
rename to devtools/server/tests/mochitest/test_memory_allocations_07.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_attach_01.html b/devtools/server/tests/mochitest/test_memory_attach_01.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_attach_01.html
rename to devtools/server/tests/mochitest/test_memory_attach_01.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_attach_02.html b/devtools/server/tests/mochitest/test_memory_attach_02.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_attach_02.html
rename to devtools/server/tests/mochitest/test_memory_attach_02.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_census.html b/devtools/server/tests/mochitest/test_memory_census.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_census.html
rename to devtools/server/tests/mochitest/test_memory_census.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_gc_01.html b/devtools/server/tests/mochitest/test_memory_gc_01.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_gc_01.html
rename to devtools/server/tests/mochitest/test_memory_gc_01.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memory_gc_events.html b/devtools/server/tests/mochitest/test_memory_gc_events.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memory_gc_events.html
rename to devtools/server/tests/mochitest/test_memory_gc_events.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_memprof.html b/devtools/server/tests/mochitest/test_memprof.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_memprof.html
rename to devtools/server/tests/mochitest/test_memprof.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_preference.html b/devtools/server/tests/mochitest/test_preference.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_preference.html
rename to devtools/server/tests/mochitest/test_preference.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_registerActor.html b/devtools/server/tests/mochitest/test_registerActor.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_registerActor.html
rename to devtools/server/tests/mochitest/test_registerActor.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_settings.html b/devtools/server/tests/mochitest/test_settings.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_settings.html
rename to devtools/server/tests/mochitest/test_settings.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_setupInParentChild.html b/devtools/server/tests/mochitest/test_setupInParentChild.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_setupInParentChild.html
rename to devtools/server/tests/mochitest/test_setupInParentChild.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-applied.html b/devtools/server/tests/mochitest/test_styles-applied.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_styles-applied.html
rename to devtools/server/tests/mochitest/test_styles-applied.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-computed.html b/devtools/server/tests/mochitest/test_styles-computed.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_styles-computed.html
rename to devtools/server/tests/mochitest/test_styles-computed.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-layout.html b/devtools/server/tests/mochitest/test_styles-layout.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_styles-layout.html
rename to devtools/server/tests/mochitest/test_styles-layout.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-matched.html b/devtools/server/tests/mochitest/test_styles-matched.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_styles-matched.html
rename to devtools/server/tests/mochitest/test_styles-matched.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-modify.html b/devtools/server/tests/mochitest/test_styles-modify.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_styles-modify.html
rename to devtools/server/tests/mochitest/test_styles-modify.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-svg.html b/devtools/server/tests/mochitest/test_styles-svg.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_styles-svg.html
rename to devtools/server/tests/mochitest/test_styles-svg.html
diff --git a/toolkit/devtools/server/tests/mochitest/test_unsafeDereference.html b/devtools/server/tests/mochitest/test_unsafeDereference.html
similarity index 100%
rename from toolkit/devtools/server/tests/mochitest/test_unsafeDereference.html
rename to devtools/server/tests/mochitest/test_unsafeDereference.html
diff --git a/toolkit/devtools/server/tests/unit/.eslintrc b/devtools/server/tests/unit/.eslintrc
similarity index 100%
rename from toolkit/devtools/server/tests/unit/.eslintrc
rename to devtools/server/tests/unit/.eslintrc
diff --git a/toolkit/devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js b/devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
rename to devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
diff --git a/toolkit/devtools/server/tests/unit/head_dbg.js b/devtools/server/tests/unit/head_dbg.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/head_dbg.js
rename to devtools/server/tests/unit/head_dbg.js
diff --git a/toolkit/devtools/server/tests/unit/hello-actor.js b/devtools/server/tests/unit/hello-actor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/hello-actor.js
rename to devtools/server/tests/unit/hello-actor.js
diff --git a/toolkit/devtools/server/tests/unit/post_init_global_actors.js b/devtools/server/tests/unit/post_init_global_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/post_init_global_actors.js
rename to devtools/server/tests/unit/post_init_global_actors.js
diff --git a/toolkit/devtools/server/tests/unit/post_init_tab_actors.js b/devtools/server/tests/unit/post_init_tab_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/post_init_tab_actors.js
rename to devtools/server/tests/unit/post_init_tab_actors.js
diff --git a/toolkit/devtools/server/tests/unit/pre_init_global_actors.js b/devtools/server/tests/unit/pre_init_global_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/pre_init_global_actors.js
rename to devtools/server/tests/unit/pre_init_global_actors.js
diff --git a/toolkit/devtools/server/tests/unit/pre_init_tab_actors.js b/devtools/server/tests/unit/pre_init_tab_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/pre_init_tab_actors.js
rename to devtools/server/tests/unit/pre_init_tab_actors.js
diff --git a/toolkit/devtools/server/tests/unit/registertestactors-01.js b/devtools/server/tests/unit/registertestactors-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/registertestactors-01.js
rename to devtools/server/tests/unit/registertestactors-01.js
diff --git a/toolkit/devtools/server/tests/unit/registertestactors-02.js b/devtools/server/tests/unit/registertestactors-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/registertestactors-02.js
rename to devtools/server/tests/unit/registertestactors-02.js
diff --git a/toolkit/devtools/server/tests/unit/registertestactors-03.js b/devtools/server/tests/unit/registertestactors-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/registertestactors-03.js
rename to devtools/server/tests/unit/registertestactors-03.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-column-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-column-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-column-in-gcd-script.js
rename to devtools/server/tests/unit/setBreakpoint-on-column-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-line.js b/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-line.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-line.js
rename to devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-line.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-script.js b/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-script.js
rename to devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-at-end-of-script.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js
rename to devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets.js b/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets.js
rename to devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-column.js b/devtools/server/tests/unit/setBreakpoint-on-column.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-column.js
rename to devtools/server/tests/unit/setBreakpoint-on-column.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-line-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line-in-gcd-script.js
rename to devtools/server/tests/unit/setBreakpoint-on-line-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-offsets.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-offsets.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-offsets.js
rename to devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-offsets.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-statements.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-statements.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-statements.js
rename to devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-statements.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-at-end-of-script.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-at-end-of-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-at-end-of-script.js
rename to devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-at-end-of-script.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js
rename to devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets.js
rename to devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets.js
diff --git a/toolkit/devtools/server/tests/unit/setBreakpoint-on-line.js b/devtools/server/tests/unit/setBreakpoint-on-line.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/setBreakpoint-on-line.js
rename to devtools/server/tests/unit/setBreakpoint-on-line.js
diff --git a/toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.coffee b/devtools/server/tests/unit/source-map-data/sourcemapped.coffee
similarity index 100%
rename from toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.coffee
rename to devtools/server/tests/unit/source-map-data/sourcemapped.coffee
diff --git a/toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.map b/devtools/server/tests/unit/source-map-data/sourcemapped.map
similarity index 100%
rename from toolkit/devtools/server/tests/unit/source-map-data/sourcemapped.map
rename to devtools/server/tests/unit/source-map-data/sourcemapped.map
diff --git a/toolkit/devtools/server/tests/unit/sourcemapped.js b/devtools/server/tests/unit/sourcemapped.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/sourcemapped.js
rename to devtools/server/tests/unit/sourcemapped.js
diff --git a/toolkit/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_01.js b/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_01.js
rename to devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_01.js
diff --git a/toolkit/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_02.js b/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_02.js
rename to devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_02.js
diff --git a/toolkit/devtools/server/tests/unit/test_ScriptStore.js b/devtools/server/tests/unit/test_ScriptStore.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_ScriptStore.js
rename to devtools/server/tests/unit/test_ScriptStore.js
diff --git a/toolkit/devtools/server/tests/unit/test_actor-registry-actor.js b/devtools/server/tests/unit/test_actor-registry-actor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_actor-registry-actor.js
rename to devtools/server/tests/unit/test_actor-registry-actor.js
diff --git a/toolkit/devtools/server/tests/unit/test_add_actors.js b/devtools/server/tests/unit/test_add_actors.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_add_actors.js
rename to devtools/server/tests/unit/test_add_actors.js
diff --git a/toolkit/devtools/server/tests/unit/test_attach.js b/devtools/server/tests/unit/test_attach.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_attach.js
rename to devtools/server/tests/unit/test_attach.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-01.js b/devtools/server/tests/unit/test_blackboxing-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-01.js
rename to devtools/server/tests/unit/test_blackboxing-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-02.js b/devtools/server/tests/unit/test_blackboxing-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-02.js
rename to devtools/server/tests/unit/test_blackboxing-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-03.js b/devtools/server/tests/unit/test_blackboxing-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-03.js
rename to devtools/server/tests/unit/test_blackboxing-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-04.js b/devtools/server/tests/unit/test_blackboxing-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-04.js
rename to devtools/server/tests/unit/test_blackboxing-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-05.js b/devtools/server/tests/unit/test_blackboxing-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-05.js
rename to devtools/server/tests/unit/test_blackboxing-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-06.js b/devtools/server/tests/unit/test_blackboxing-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-06.js
rename to devtools/server/tests/unit/test_blackboxing-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-07.js b/devtools/server/tests/unit/test_blackboxing-07.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_blackboxing-07.js
rename to devtools/server/tests/unit/test_blackboxing-07.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-01.js b/devtools/server/tests/unit/test_breakpoint-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-01.js
rename to devtools/server/tests/unit/test_breakpoint-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-02.js b/devtools/server/tests/unit/test_breakpoint-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-02.js
rename to devtools/server/tests/unit/test_breakpoint-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-03.js b/devtools/server/tests/unit/test_breakpoint-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-03.js
rename to devtools/server/tests/unit/test_breakpoint-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-04.js b/devtools/server/tests/unit/test_breakpoint-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-04.js
rename to devtools/server/tests/unit/test_breakpoint-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-05.js b/devtools/server/tests/unit/test_breakpoint-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-05.js
rename to devtools/server/tests/unit/test_breakpoint-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-06.js b/devtools/server/tests/unit/test_breakpoint-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-06.js
rename to devtools/server/tests/unit/test_breakpoint-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-07.js b/devtools/server/tests/unit/test_breakpoint-07.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-07.js
rename to devtools/server/tests/unit/test_breakpoint-07.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-08.js b/devtools/server/tests/unit/test_breakpoint-08.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-08.js
rename to devtools/server/tests/unit/test_breakpoint-08.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-09.js b/devtools/server/tests/unit/test_breakpoint-09.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-09.js
rename to devtools/server/tests/unit/test_breakpoint-09.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-10.js b/devtools/server/tests/unit/test_breakpoint-10.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-10.js
rename to devtools/server/tests/unit/test_breakpoint-10.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-11.js b/devtools/server/tests/unit/test_breakpoint-11.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-11.js
rename to devtools/server/tests/unit/test_breakpoint-11.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-12.js b/devtools/server/tests/unit/test_breakpoint-12.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-12.js
rename to devtools/server/tests/unit/test_breakpoint-12.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-13.js b/devtools/server/tests/unit/test_breakpoint-13.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-13.js
rename to devtools/server/tests/unit/test_breakpoint-13.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-14.js b/devtools/server/tests/unit/test_breakpoint-14.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-14.js
rename to devtools/server/tests/unit/test_breakpoint-14.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-15.js b/devtools/server/tests/unit/test_breakpoint-15.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-15.js
rename to devtools/server/tests/unit/test_breakpoint-15.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-16.js b/devtools/server/tests/unit/test_breakpoint-16.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-16.js
rename to devtools/server/tests/unit/test_breakpoint-16.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-17.js b/devtools/server/tests/unit/test_breakpoint-17.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-17.js
rename to devtools/server/tests/unit/test_breakpoint-17.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-18.js b/devtools/server/tests/unit/test_breakpoint-18.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-18.js
rename to devtools/server/tests/unit/test_breakpoint-18.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-19.js b/devtools/server/tests/unit/test_breakpoint-19.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-19.js
rename to devtools/server/tests/unit/test_breakpoint-19.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-20.js b/devtools/server/tests/unit/test_breakpoint-20.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-20.js
rename to devtools/server/tests/unit/test_breakpoint-20.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-21.js b/devtools/server/tests/unit/test_breakpoint-21.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-21.js
rename to devtools/server/tests/unit/test_breakpoint-21.js
diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-actor-map.js b/devtools/server/tests/unit/test_breakpoint-actor-map.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_breakpoint-actor-map.js
rename to devtools/server/tests/unit/test_breakpoint-actor-map.js
diff --git a/toolkit/devtools/server/tests/unit/test_client_request.js b/devtools/server/tests/unit/test_client_request.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_client_request.js
rename to devtools/server/tests/unit/test_client_request.js
diff --git a/toolkit/devtools/server/tests/unit/test_conditional_breakpoint-01.js b/devtools/server/tests/unit/test_conditional_breakpoint-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_conditional_breakpoint-01.js
rename to devtools/server/tests/unit/test_conditional_breakpoint-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_conditional_breakpoint-02.js b/devtools/server/tests/unit/test_conditional_breakpoint-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_conditional_breakpoint-02.js
rename to devtools/server/tests/unit/test_conditional_breakpoint-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_conditional_breakpoint-03.js b/devtools/server/tests/unit/test_conditional_breakpoint-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_conditional_breakpoint-03.js
rename to devtools/server/tests/unit/test_conditional_breakpoint-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_dbgactor.js b/devtools/server/tests/unit/test_dbgactor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_dbgactor.js
rename to devtools/server/tests/unit/test_dbgactor.js
diff --git a/toolkit/devtools/server/tests/unit/test_dbgclient_debuggerstatement.js b/devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
rename to devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
diff --git a/toolkit/devtools/server/tests/unit/test_dbgglobal.js b/devtools/server/tests/unit/test_dbgglobal.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_dbgglobal.js
rename to devtools/server/tests/unit/test_dbgglobal.js
diff --git a/toolkit/devtools/server/tests/unit/test_eval-01.js b/devtools/server/tests/unit/test_eval-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_eval-01.js
rename to devtools/server/tests/unit/test_eval-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_eval-02.js b/devtools/server/tests/unit/test_eval-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_eval-02.js
rename to devtools/server/tests/unit/test_eval-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_eval-03.js b/devtools/server/tests/unit/test_eval-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_eval-03.js
rename to devtools/server/tests/unit/test_eval-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_eval-04.js b/devtools/server/tests/unit/test_eval-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_eval-04.js
rename to devtools/server/tests/unit/test_eval-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_eval-05.js b/devtools/server/tests/unit/test_eval-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_eval-05.js
rename to devtools/server/tests/unit/test_eval-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_eventlooplag_actor.js b/devtools/server/tests/unit/test_eventlooplag_actor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_eventlooplag_actor.js
rename to devtools/server/tests/unit/test_eventlooplag_actor.js
diff --git a/toolkit/devtools/server/tests/unit/test_forwardingprefix.js b/devtools/server/tests/unit/test_forwardingprefix.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_forwardingprefix.js
rename to devtools/server/tests/unit/test_forwardingprefix.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-01.js b/devtools/server/tests/unit/test_frameactor-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameactor-01.js
rename to devtools/server/tests/unit/test_frameactor-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-02.js b/devtools/server/tests/unit/test_frameactor-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameactor-02.js
rename to devtools/server/tests/unit/test_frameactor-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-03.js b/devtools/server/tests/unit/test_frameactor-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameactor-03.js
rename to devtools/server/tests/unit/test_frameactor-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-04.js b/devtools/server/tests/unit/test_frameactor-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameactor-04.js
rename to devtools/server/tests/unit/test_frameactor-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameactor-05.js b/devtools/server/tests/unit/test_frameactor-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameactor-05.js
rename to devtools/server/tests/unit/test_frameactor-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_framearguments-01.js b/devtools/server/tests/unit/test_framearguments-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framearguments-01.js
rename to devtools/server/tests/unit/test_framearguments-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-01.js b/devtools/server/tests/unit/test_framebindings-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-01.js
rename to devtools/server/tests/unit/test_framebindings-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-02.js b/devtools/server/tests/unit/test_framebindings-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-02.js
rename to devtools/server/tests/unit/test_framebindings-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-03.js b/devtools/server/tests/unit/test_framebindings-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-03.js
rename to devtools/server/tests/unit/test_framebindings-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-04.js b/devtools/server/tests/unit/test_framebindings-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-04.js
rename to devtools/server/tests/unit/test_framebindings-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-05.js b/devtools/server/tests/unit/test_framebindings-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-05.js
rename to devtools/server/tests/unit/test_framebindings-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-06.js b/devtools/server/tests/unit/test_framebindings-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-06.js
rename to devtools/server/tests/unit/test_framebindings-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_framebindings-07.js b/devtools/server/tests/unit/test_framebindings-07.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_framebindings-07.js
rename to devtools/server/tests/unit/test_framebindings-07.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameclient-01.js b/devtools/server/tests/unit/test_frameclient-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameclient-01.js
rename to devtools/server/tests/unit/test_frameclient-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_frameclient-02.js b/devtools/server/tests/unit/test_frameclient-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_frameclient-02.js
rename to devtools/server/tests/unit/test_frameclient-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_functiongrips-01.js b/devtools/server/tests/unit/test_functiongrips-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_functiongrips-01.js
rename to devtools/server/tests/unit/test_functiongrips-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_get-executable-lines-source-map.js b/devtools/server/tests/unit/test_get-executable-lines-source-map.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_get-executable-lines-source-map.js
rename to devtools/server/tests/unit/test_get-executable-lines-source-map.js
diff --git a/toolkit/devtools/server/tests/unit/test_get-executable-lines.js b/devtools/server/tests/unit/test_get-executable-lines.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_get-executable-lines.js
rename to devtools/server/tests/unit/test_get-executable-lines.js
diff --git a/toolkit/devtools/server/tests/unit/test_getRuleText.js b/devtools/server/tests/unit/test_getRuleText.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_getRuleText.js
rename to devtools/server/tests/unit/test_getRuleText.js
diff --git a/toolkit/devtools/server/tests/unit/test_getTextAtLineColumn.js b/devtools/server/tests/unit/test_getTextAtLineColumn.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_getTextAtLineColumn.js
rename to devtools/server/tests/unit/test_getTextAtLineColumn.js
diff --git a/toolkit/devtools/server/tests/unit/test_getyoungestframe.js b/devtools/server/tests/unit/test_getyoungestframe.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_getyoungestframe.js
rename to devtools/server/tests/unit/test_getyoungestframe.js
diff --git a/toolkit/devtools/server/tests/unit/test_ignore_caught_exceptions.js b/devtools/server/tests/unit/test_ignore_caught_exceptions.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_ignore_caught_exceptions.js
rename to devtools/server/tests/unit/test_ignore_caught_exceptions.js
diff --git a/toolkit/devtools/server/tests/unit/test_interrupt.js b/devtools/server/tests/unit/test_interrupt.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_interrupt.js
rename to devtools/server/tests/unit/test_interrupt.js
diff --git a/toolkit/devtools/server/tests/unit/test_layout-reflows-observer.js b/devtools/server/tests/unit/test_layout-reflows-observer.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_layout-reflows-observer.js
rename to devtools/server/tests/unit/test_layout-reflows-observer.js
diff --git a/toolkit/devtools/server/tests/unit/test_listsources-01.js b/devtools/server/tests/unit/test_listsources-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_listsources-01.js
rename to devtools/server/tests/unit/test_listsources-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_listsources-02.js b/devtools/server/tests/unit/test_listsources-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_listsources-02.js
rename to devtools/server/tests/unit/test_listsources-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_listsources-03.js b/devtools/server/tests/unit/test_listsources-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_listsources-03.js
rename to devtools/server/tests/unit/test_listsources-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_longstringactor.js b/devtools/server/tests/unit/test_longstringactor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_longstringactor.js
rename to devtools/server/tests/unit/test_longstringactor.js
diff --git a/toolkit/devtools/server/tests/unit/test_longstringgrips-01.js b/devtools/server/tests/unit/test_longstringgrips-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_longstringgrips-01.js
rename to devtools/server/tests/unit/test_longstringgrips-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_longstringgrips-02.js b/devtools/server/tests/unit/test_longstringgrips-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_longstringgrips-02.js
rename to devtools/server/tests/unit/test_longstringgrips-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_memory_footprint.js b/devtools/server/tests/unit/test_memory_footprint.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_memory_footprint.js
rename to devtools/server/tests/unit/test_memory_footprint.js
diff --git a/toolkit/devtools/server/tests/unit/test_monitor_actor.js b/devtools/server/tests/unit/test_monitor_actor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_monitor_actor.js
rename to devtools/server/tests/unit/test_monitor_actor.js
diff --git a/toolkit/devtools/server/tests/unit/test_nativewrappers.js b/devtools/server/tests/unit/test_nativewrappers.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_nativewrappers.js
rename to devtools/server/tests/unit/test_nativewrappers.js
diff --git a/toolkit/devtools/server/tests/unit/test_nesting-01.js b/devtools/server/tests/unit/test_nesting-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_nesting-01.js
rename to devtools/server/tests/unit/test_nesting-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_nesting-02.js b/devtools/server/tests/unit/test_nesting-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_nesting-02.js
rename to devtools/server/tests/unit/test_nesting-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_nesting-03.js b/devtools/server/tests/unit/test_nesting-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_nesting-03.js
rename to devtools/server/tests/unit/test_nesting-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_new_source-01.js b/devtools/server/tests/unit/test_new_source-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_new_source-01.js
rename to devtools/server/tests/unit/test_new_source-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_nodelistactor.js b/devtools/server/tests/unit/test_nodelistactor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_nodelistactor.js
rename to devtools/server/tests/unit/test_nodelistactor.js
diff --git a/toolkit/devtools/server/tests/unit/test_nsjsinspector.js b/devtools/server/tests/unit/test_nsjsinspector.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_nsjsinspector.js
rename to devtools/server/tests/unit/test_nsjsinspector.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-01.js b/devtools/server/tests/unit/test_objectgrips-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-01.js
rename to devtools/server/tests/unit/test_objectgrips-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-02.js b/devtools/server/tests/unit/test_objectgrips-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-02.js
rename to devtools/server/tests/unit/test_objectgrips-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-03.js b/devtools/server/tests/unit/test_objectgrips-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-03.js
rename to devtools/server/tests/unit/test_objectgrips-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-04.js b/devtools/server/tests/unit/test_objectgrips-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-04.js
rename to devtools/server/tests/unit/test_objectgrips-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-05.js b/devtools/server/tests/unit/test_objectgrips-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-05.js
rename to devtools/server/tests/unit/test_objectgrips-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-06.js b/devtools/server/tests/unit/test_objectgrips-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-06.js
rename to devtools/server/tests/unit/test_objectgrips-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-07.js b/devtools/server/tests/unit/test_objectgrips-07.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-07.js
rename to devtools/server/tests/unit/test_objectgrips-07.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-08.js b/devtools/server/tests/unit/test_objectgrips-08.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-08.js
rename to devtools/server/tests/unit/test_objectgrips-08.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-09.js b/devtools/server/tests/unit/test_objectgrips-09.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-09.js
rename to devtools/server/tests/unit/test_objectgrips-09.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-10.js b/devtools/server/tests/unit/test_objectgrips-10.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-10.js
rename to devtools/server/tests/unit/test_objectgrips-10.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-11.js b/devtools/server/tests/unit/test_objectgrips-11.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-11.js
rename to devtools/server/tests/unit/test_objectgrips-11.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-12.js b/devtools/server/tests/unit/test_objectgrips-12.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-12.js
rename to devtools/server/tests/unit/test_objectgrips-12.js
diff --git a/toolkit/devtools/server/tests/unit/test_objectgrips-13.js b/devtools/server/tests/unit/test_objectgrips-13.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_objectgrips-13.js
rename to devtools/server/tests/unit/test_objectgrips-13.js
diff --git a/toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js b/devtools/server/tests/unit/test_pause_exceptions-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_pause_exceptions-01.js
rename to devtools/server/tests/unit/test_pause_exceptions-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js b/devtools/server/tests/unit/test_pause_exceptions-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_pause_exceptions-02.js
rename to devtools/server/tests/unit/test_pause_exceptions-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-01.js b/devtools/server/tests/unit/test_pauselifetime-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_pauselifetime-01.js
rename to devtools/server/tests/unit/test_pauselifetime-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-02.js b/devtools/server/tests/unit/test_pauselifetime-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_pauselifetime-02.js
rename to devtools/server/tests/unit/test_pauselifetime-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-03.js b/devtools/server/tests/unit/test_pauselifetime-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_pauselifetime-03.js
rename to devtools/server/tests/unit/test_pauselifetime-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_pauselifetime-04.js b/devtools/server/tests/unit/test_pauselifetime-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_pauselifetime-04.js
rename to devtools/server/tests/unit/test_pauselifetime-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_activation-01.js b/devtools/server/tests/unit/test_profiler_activation-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_activation-01.js
rename to devtools/server/tests/unit/test_profiler_activation-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_activation-02.js b/devtools/server/tests/unit/test_profiler_activation-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_activation-02.js
rename to devtools/server/tests/unit/test_profiler_activation-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_bufferstatus.js b/devtools/server/tests/unit/test_profiler_bufferstatus.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_bufferstatus.js
rename to devtools/server/tests/unit/test_profiler_bufferstatus.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_close.js b/devtools/server/tests/unit/test_profiler_close.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_close.js
rename to devtools/server/tests/unit/test_profiler_close.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_data.js b/devtools/server/tests/unit/test_profiler_data.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_data.js
rename to devtools/server/tests/unit/test_profiler_data.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_events-01.js b/devtools/server/tests/unit/test_profiler_events-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_events-01.js
rename to devtools/server/tests/unit/test_profiler_events-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_events-02.js b/devtools/server/tests/unit/test_profiler_events-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_events-02.js
rename to devtools/server/tests/unit/test_profiler_events-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_getbufferinfo.js b/devtools/server/tests/unit/test_profiler_getbufferinfo.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_getbufferinfo.js
rename to devtools/server/tests/unit/test_profiler_getbufferinfo.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_getfeatures.js b/devtools/server/tests/unit/test_profiler_getfeatures.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_getfeatures.js
rename to devtools/server/tests/unit/test_profiler_getfeatures.js
diff --git a/toolkit/devtools/server/tests/unit/test_profiler_getsharedlibraryinformation.js b/devtools/server/tests/unit/test_profiler_getsharedlibraryinformation.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_profiler_getsharedlibraryinformation.js
rename to devtools/server/tests/unit/test_profiler_getsharedlibraryinformation.js
diff --git a/toolkit/devtools/server/tests/unit/test_promise_state-01.js b/devtools/server/tests/unit/test_promise_state-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promise_state-01.js
rename to devtools/server/tests/unit/test_promise_state-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_promise_state-02.js b/devtools/server/tests/unit/test_promise_state-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promise_state-02.js
rename to devtools/server/tests/unit/test_promise_state-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_promise_state-03.js b/devtools/server/tests/unit/test_promise_state-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promise_state-03.js
rename to devtools/server/tests/unit/test_promise_state-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_actor_attach.js b/devtools/server/tests/unit/test_promises_actor_attach.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_actor_attach.js
rename to devtools/server/tests/unit/test_promises_actor_attach.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_actor_exist.js b/devtools/server/tests/unit/test_promises_actor_exist.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_actor_exist.js
rename to devtools/server/tests/unit/test_promises_actor_exist.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_actor_list_promises.js b/devtools/server/tests/unit/test_promises_actor_list_promises.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_actor_list_promises.js
rename to devtools/server/tests/unit/test_promises_actor_list_promises.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_actor_onnewpromise.js b/devtools/server/tests/unit/test_promises_actor_onnewpromise.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_actor_onnewpromise.js
rename to devtools/server/tests/unit/test_promises_actor_onnewpromise.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js b/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js
rename to devtools/server/tests/unit/test_promises_actor_onpromisesettled.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_client_getdependentpromises.js b/devtools/server/tests/unit/test_promises_client_getdependentpromises.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_client_getdependentpromises.js
rename to devtools/server/tests/unit/test_promises_client_getdependentpromises.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_object_creationtimestamp.js b/devtools/server/tests/unit/test_promises_object_creationtimestamp.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_object_creationtimestamp.js
rename to devtools/server/tests/unit/test_promises_object_creationtimestamp.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_object_timetosettle-01.js b/devtools/server/tests/unit/test_promises_object_timetosettle-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_object_timetosettle-01.js
rename to devtools/server/tests/unit/test_promises_object_timetosettle-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_promises_object_timetosettle-02.js b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_promises_object_timetosettle-02.js
rename to devtools/server/tests/unit/test_promises_object_timetosettle-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocolSpec.js b/devtools/server/tests/unit/test_protocolSpec.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocolSpec.js
rename to devtools/server/tests/unit/test_protocolSpec.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_abort.js b/devtools/server/tests/unit/test_protocol_abort.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_abort.js
rename to devtools/server/tests/unit/test_protocol_abort.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_async.js b/devtools/server/tests/unit/test_protocol_async.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_async.js
rename to devtools/server/tests/unit/test_protocol_async.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_children.js b/devtools/server/tests/unit/test_protocol_children.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_children.js
rename to devtools/server/tests/unit/test_protocol_children.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_formtype.js b/devtools/server/tests/unit/test_protocol_formtype.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_formtype.js
rename to devtools/server/tests/unit/test_protocol_formtype.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_longstring.js b/devtools/server/tests/unit/test_protocol_longstring.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_longstring.js
rename to devtools/server/tests/unit/test_protocol_longstring.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_simple.js b/devtools/server/tests/unit/test_protocol_simple.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_simple.js
rename to devtools/server/tests/unit/test_protocol_simple.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_stack.js b/devtools/server/tests/unit/test_protocol_stack.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_stack.js
rename to devtools/server/tests/unit/test_protocol_stack.js
diff --git a/toolkit/devtools/server/tests/unit/test_protocol_unregister.js b/devtools/server/tests/unit/test_protocol_unregister.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_protocol_unregister.js
rename to devtools/server/tests/unit/test_protocol_unregister.js
diff --git a/toolkit/devtools/server/tests/unit/test_reattach-thread.js b/devtools/server/tests/unit/test_reattach-thread.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_reattach-thread.js
rename to devtools/server/tests/unit/test_reattach-thread.js
diff --git a/toolkit/devtools/server/tests/unit/test_registerClient.js b/devtools/server/tests/unit/test_registerClient.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_registerClient.js
rename to devtools/server/tests/unit/test_registerClient.js
diff --git a/toolkit/devtools/server/tests/unit/test_register_actor.js b/devtools/server/tests/unit/test_register_actor.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_register_actor.js
rename to devtools/server/tests/unit/test_register_actor.js
diff --git a/toolkit/devtools/server/tests/unit/test_requestTypes.js b/devtools/server/tests/unit/test_requestTypes.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_requestTypes.js
rename to devtools/server/tests/unit/test_requestTypes.js
diff --git a/toolkit/devtools/server/tests/unit/test_safe-getter.js b/devtools/server/tests/unit/test_safe-getter.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_safe-getter.js
rename to devtools/server/tests/unit/test_safe-getter.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offests-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offests-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offests-in-gcd-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offests-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-line.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-line.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-line.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-line.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-at-end-of-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-in-gcd-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column-with-no-offsets.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column.js b/devtools/server/tests/unit/test_setBreakpoint-on-column.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-column.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-column.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offets-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offets-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offets-in-gcd-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offets-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-at-end-of-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-at-end-of-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-at-end-of-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-at-end-of-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js
diff --git a/toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line.js b/devtools/server/tests/unit/test_setBreakpoint-on-line.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_setBreakpoint-on-line.js
rename to devtools/server/tests/unit/test_setBreakpoint-on-line.js
diff --git a/toolkit/devtools/server/tests/unit/test_source-01.js b/devtools/server/tests/unit/test_source-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_source-01.js
rename to devtools/server/tests/unit/test_source-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-01.js b/devtools/server/tests/unit/test_sourcemaps-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-01.js
rename to devtools/server/tests/unit/test_sourcemaps-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-02.js b/devtools/server/tests/unit/test_sourcemaps-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-02.js
rename to devtools/server/tests/unit/test_sourcemaps-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-03.js b/devtools/server/tests/unit/test_sourcemaps-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-03.js
rename to devtools/server/tests/unit/test_sourcemaps-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js b/devtools/server/tests/unit/test_sourcemaps-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-04.js
rename to devtools/server/tests/unit/test_sourcemaps-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js b/devtools/server/tests/unit/test_sourcemaps-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-05.js
rename to devtools/server/tests/unit/test_sourcemaps-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js b/devtools/server/tests/unit/test_sourcemaps-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-06.js
rename to devtools/server/tests/unit/test_sourcemaps-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js b/devtools/server/tests/unit/test_sourcemaps-07.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-07.js
rename to devtools/server/tests/unit/test_sourcemaps-07.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js b/devtools/server/tests/unit/test_sourcemaps-08.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-08.js
rename to devtools/server/tests/unit/test_sourcemaps-08.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js b/devtools/server/tests/unit/test_sourcemaps-09.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-09.js
rename to devtools/server/tests/unit/test_sourcemaps-09.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-10.js b/devtools/server/tests/unit/test_sourcemaps-10.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-10.js
rename to devtools/server/tests/unit/test_sourcemaps-10.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-11.js b/devtools/server/tests/unit/test_sourcemaps-11.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-11.js
rename to devtools/server/tests/unit/test_sourcemaps-11.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-12.js b/devtools/server/tests/unit/test_sourcemaps-12.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-12.js
rename to devtools/server/tests/unit/test_sourcemaps-12.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js b/devtools/server/tests/unit/test_sourcemaps-13.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-13.js
rename to devtools/server/tests/unit/test_sourcemaps-13.js
diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-16.js b/devtools/server/tests/unit/test_sourcemaps-16.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_sourcemaps-16.js
rename to devtools/server/tests/unit/test_sourcemaps-16.js
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-01.js b/devtools/server/tests/unit/test_stepping-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_stepping-01.js
rename to devtools/server/tests/unit/test_stepping-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-02.js b/devtools/server/tests/unit/test_stepping-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_stepping-02.js
rename to devtools/server/tests/unit/test_stepping-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-03.js b/devtools/server/tests/unit/test_stepping-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_stepping-03.js
rename to devtools/server/tests/unit/test_stepping-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-04.js b/devtools/server/tests/unit/test_stepping-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_stepping-04.js
rename to devtools/server/tests/unit/test_stepping-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-05.js b/devtools/server/tests/unit/test_stepping-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_stepping-05.js
rename to devtools/server/tests/unit/test_stepping-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_stepping-06.js b/devtools/server/tests/unit/test_stepping-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_stepping-06.js
rename to devtools/server/tests/unit/test_stepping-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_symbols-01.js b/devtools/server/tests/unit/test_symbols-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_symbols-01.js
rename to devtools/server/tests/unit/test_symbols-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_symbols-02.js b/devtools/server/tests/unit/test_symbols-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_symbols-02.js
rename to devtools/server/tests/unit/test_symbols-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-01.js b/devtools/server/tests/unit/test_threadlifetime-01.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_threadlifetime-01.js
rename to devtools/server/tests/unit/test_threadlifetime-01.js
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-02.js b/devtools/server/tests/unit/test_threadlifetime-02.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_threadlifetime-02.js
rename to devtools/server/tests/unit/test_threadlifetime-02.js
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-03.js b/devtools/server/tests/unit/test_threadlifetime-03.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_threadlifetime-03.js
rename to devtools/server/tests/unit/test_threadlifetime-03.js
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-04.js b/devtools/server/tests/unit/test_threadlifetime-04.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_threadlifetime-04.js
rename to devtools/server/tests/unit/test_threadlifetime-04.js
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-05.js b/devtools/server/tests/unit/test_threadlifetime-05.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_threadlifetime-05.js
rename to devtools/server/tests/unit/test_threadlifetime-05.js
diff --git a/toolkit/devtools/server/tests/unit/test_threadlifetime-06.js b/devtools/server/tests/unit/test_threadlifetime-06.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_threadlifetime-06.js
rename to devtools/server/tests/unit/test_threadlifetime-06.js
diff --git a/toolkit/devtools/server/tests/unit/test_unsafeDereference.js b/devtools/server/tests/unit/test_unsafeDereference.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_unsafeDereference.js
rename to devtools/server/tests/unit/test_unsafeDereference.js
diff --git a/toolkit/devtools/server/tests/unit/test_xpcshell_debugging.js b/devtools/server/tests/unit/test_xpcshell_debugging.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/test_xpcshell_debugging.js
rename to devtools/server/tests/unit/test_xpcshell_debugging.js
diff --git a/toolkit/devtools/server/tests/unit/testactors.js b/devtools/server/tests/unit/testactors.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/testactors.js
rename to devtools/server/tests/unit/testactors.js
diff --git a/toolkit/devtools/server/tests/unit/tracerlocations.js b/devtools/server/tests/unit/tracerlocations.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/tracerlocations.js
rename to devtools/server/tests/unit/tracerlocations.js
diff --git a/toolkit/devtools/server/tests/unit/xpcshell.ini b/devtools/server/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/server/tests/unit/xpcshell.ini
rename to devtools/server/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/server/tests/unit/xpcshell_debugging_script.js b/devtools/server/tests/unit/xpcshell_debugging_script.js
similarity index 100%
rename from toolkit/devtools/server/tests/unit/xpcshell_debugging_script.js
rename to devtools/server/tests/unit/xpcshell_debugging_script.js
diff --git a/toolkit/devtools/server/worker.js b/devtools/server/worker.js
similarity index 100%
rename from toolkit/devtools/server/worker.js
rename to devtools/server/worker.js
diff --git a/toolkit/devtools/.eslintignore b/devtools/shared/.eslintignore
similarity index 100%
rename from toolkit/devtools/.eslintignore
rename to devtools/shared/.eslintignore
diff --git a/toolkit/devtools/.eslintrc b/devtools/shared/.eslintrc
similarity index 100%
rename from toolkit/devtools/.eslintrc
rename to devtools/shared/.eslintrc
diff --git a/toolkit/devtools/Console.jsm b/devtools/shared/Console.jsm
similarity index 100%
rename from toolkit/devtools/Console.jsm
rename to devtools/shared/Console.jsm
diff --git a/toolkit/devtools/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js
similarity index 100%
rename from toolkit/devtools/DevToolsUtils.js
rename to devtools/shared/DevToolsUtils.js
diff --git a/toolkit/devtools/Loader.jsm b/devtools/shared/Loader.jsm
similarity index 100%
rename from toolkit/devtools/Loader.jsm
rename to devtools/shared/Loader.jsm
diff --git a/toolkit/devtools/acorn/LICENSE b/devtools/shared/acorn/LICENSE
similarity index 100%
rename from toolkit/devtools/acorn/LICENSE
rename to devtools/shared/acorn/LICENSE
diff --git a/toolkit/devtools/acorn/UPGRADING.md b/devtools/shared/acorn/UPGRADING.md
similarity index 100%
rename from toolkit/devtools/acorn/UPGRADING.md
rename to devtools/shared/acorn/UPGRADING.md
diff --git a/toolkit/devtools/acorn/acorn.js b/devtools/shared/acorn/acorn.js
similarity index 100%
rename from toolkit/devtools/acorn/acorn.js
rename to devtools/shared/acorn/acorn.js
diff --git a/toolkit/devtools/acorn/acorn_loose.js b/devtools/shared/acorn/acorn_loose.js
similarity index 100%
rename from toolkit/devtools/acorn/acorn_loose.js
rename to devtools/shared/acorn/acorn_loose.js
diff --git a/toolkit/devtools/acorn/moz.build b/devtools/shared/acorn/moz.build
similarity index 100%
rename from toolkit/devtools/acorn/moz.build
rename to devtools/shared/acorn/moz.build
diff --git a/toolkit/devtools/acorn/tests/unit/head_acorn.js b/devtools/shared/acorn/tests/unit/head_acorn.js
similarity index 100%
rename from toolkit/devtools/acorn/tests/unit/head_acorn.js
rename to devtools/shared/acorn/tests/unit/head_acorn.js
diff --git a/toolkit/devtools/acorn/tests/unit/test_import_acorn.js b/devtools/shared/acorn/tests/unit/test_import_acorn.js
similarity index 100%
rename from toolkit/devtools/acorn/tests/unit/test_import_acorn.js
rename to devtools/shared/acorn/tests/unit/test_import_acorn.js
diff --git a/toolkit/devtools/acorn/tests/unit/test_lenient_parser.js b/devtools/shared/acorn/tests/unit/test_lenient_parser.js
similarity index 100%
rename from toolkit/devtools/acorn/tests/unit/test_lenient_parser.js
rename to devtools/shared/acorn/tests/unit/test_lenient_parser.js
diff --git a/toolkit/devtools/acorn/tests/unit/test_same_ast.js b/devtools/shared/acorn/tests/unit/test_same_ast.js
similarity index 100%
rename from toolkit/devtools/acorn/tests/unit/test_same_ast.js
rename to devtools/shared/acorn/tests/unit/test_same_ast.js
diff --git a/toolkit/devtools/acorn/tests/unit/xpcshell.ini b/devtools/shared/acorn/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/acorn/tests/unit/xpcshell.ini
rename to devtools/shared/acorn/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/acorn/walk.js b/devtools/shared/acorn/walk.js
similarity index 100%
rename from toolkit/devtools/acorn/walk.js
rename to devtools/shared/acorn/walk.js
diff --git a/toolkit/devtools/apps/Devices.jsm b/devtools/shared/apps/Devices.jsm
similarity index 100%
rename from toolkit/devtools/apps/Devices.jsm
rename to devtools/shared/apps/Devices.jsm
diff --git a/toolkit/devtools/apps/Simulator.jsm b/devtools/shared/apps/Simulator.jsm
similarity index 100%
rename from toolkit/devtools/apps/Simulator.jsm
rename to devtools/shared/apps/Simulator.jsm
diff --git a/toolkit/devtools/apps/app-actor-front.js b/devtools/shared/apps/app-actor-front.js
similarity index 100%
rename from toolkit/devtools/apps/app-actor-front.js
rename to devtools/shared/apps/app-actor-front.js
diff --git a/toolkit/devtools/apps/moz.build b/devtools/shared/apps/moz.build
similarity index 100%
rename from toolkit/devtools/apps/moz.build
rename to devtools/shared/apps/moz.build
diff --git a/toolkit/devtools/apps/tests/data/app-certified.zip b/devtools/shared/apps/tests/data/app-certified.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/data/app-certified.zip
rename to devtools/shared/apps/tests/data/app-certified.zip
diff --git a/toolkit/devtools/apps/tests/data/app-overload.zip b/devtools/shared/apps/tests/data/app-overload.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/data/app-overload.zip
rename to devtools/shared/apps/tests/data/app-overload.zip
diff --git a/toolkit/devtools/apps/tests/data/app-redirect.zip b/devtools/shared/apps/tests/data/app-redirect.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/data/app-redirect.zip
rename to devtools/shared/apps/tests/data/app-redirect.zip
diff --git a/toolkit/devtools/apps/tests/data/app-system.zip b/devtools/shared/apps/tests/data/app-system.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/data/app-system.zip
rename to devtools/shared/apps/tests/data/app-system.zip
diff --git a/toolkit/devtools/apps/tests/data/app-updated.zip b/devtools/shared/apps/tests/data/app-updated.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/data/app-updated.zip
rename to devtools/shared/apps/tests/data/app-updated.zip
diff --git a/toolkit/devtools/apps/tests/data/app.zip b/devtools/shared/apps/tests/data/app.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/data/app.zip
rename to devtools/shared/apps/tests/data/app.zip
diff --git a/toolkit/devtools/apps/tests/data/mochitest.ini b/devtools/shared/apps/tests/data/mochitest.ini
similarity index 100%
rename from toolkit/devtools/apps/tests/data/mochitest.ini
rename to devtools/shared/apps/tests/data/mochitest.ini
diff --git a/toolkit/devtools/apps/tests/debugger-protocol-helper.js b/devtools/shared/apps/tests/debugger-protocol-helper.js
similarity index 100%
rename from toolkit/devtools/apps/tests/debugger-protocol-helper.js
rename to devtools/shared/apps/tests/debugger-protocol-helper.js
diff --git a/toolkit/devtools/apps/tests/mochitest.ini b/devtools/shared/apps/tests/mochitest.ini
similarity index 100%
rename from toolkit/devtools/apps/tests/mochitest.ini
rename to devtools/shared/apps/tests/mochitest.ini
diff --git a/toolkit/devtools/apps/tests/redirect.sjs b/devtools/shared/apps/tests/redirect.sjs
similarity index 100%
rename from toolkit/devtools/apps/tests/redirect.sjs
rename to devtools/shared/apps/tests/redirect.sjs
diff --git a/toolkit/devtools/apps/tests/test_webapps_actor.html b/devtools/shared/apps/tests/test_webapps_actor.html
similarity index 100%
rename from toolkit/devtools/apps/tests/test_webapps_actor.html
rename to devtools/shared/apps/tests/test_webapps_actor.html
diff --git a/toolkit/devtools/apps/tests/unit/data/app-engineering.zip b/devtools/shared/apps/tests/unit/data/app-engineering.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/unit/data/app-engineering.zip
rename to devtools/shared/apps/tests/unit/data/app-engineering.zip
diff --git a/toolkit/devtools/apps/tests/unit/data/app.zip b/devtools/shared/apps/tests/unit/data/app.zip
similarity index 100%
rename from toolkit/devtools/apps/tests/unit/data/app.zip
rename to devtools/shared/apps/tests/unit/data/app.zip
diff --git a/toolkit/devtools/apps/tests/unit/head_apps.js b/devtools/shared/apps/tests/unit/head_apps.js
similarity index 100%
rename from toolkit/devtools/apps/tests/unit/head_apps.js
rename to devtools/shared/apps/tests/unit/head_apps.js
diff --git a/toolkit/devtools/apps/tests/unit/tail_apps.js b/devtools/shared/apps/tests/unit/tail_apps.js
similarity index 100%
rename from toolkit/devtools/apps/tests/unit/tail_apps.js
rename to devtools/shared/apps/tests/unit/tail_apps.js
diff --git a/toolkit/devtools/apps/tests/unit/test_webappsActor.js b/devtools/shared/apps/tests/unit/test_webappsActor.js
similarity index 100%
rename from toolkit/devtools/apps/tests/unit/test_webappsActor.js
rename to devtools/shared/apps/tests/unit/test_webappsActor.js
diff --git a/toolkit/devtools/apps/tests/unit/xpcshell.ini b/devtools/shared/apps/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/apps/tests/unit/xpcshell.ini
rename to devtools/shared/apps/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/async-utils.js b/devtools/shared/async-utils.js
similarity index 100%
rename from toolkit/devtools/async-utils.js
rename to devtools/shared/async-utils.js
diff --git a/toolkit/devtools/client/connection-manager.js b/devtools/shared/client/connection-manager.js
similarity index 100%
rename from toolkit/devtools/client/connection-manager.js
rename to devtools/shared/client/connection-manager.js
diff --git a/toolkit/devtools/client/dbg-client.jsm b/devtools/shared/client/dbg-client.jsm
similarity index 100%
rename from toolkit/devtools/client/dbg-client.jsm
rename to devtools/shared/client/dbg-client.jsm
diff --git a/toolkit/devtools/client/main.js b/devtools/shared/client/main.js
similarity index 100%
rename from toolkit/devtools/client/main.js
rename to devtools/shared/client/main.js
diff --git a/toolkit/devtools/client/moz.build b/devtools/shared/client/moz.build
similarity index 100%
rename from toolkit/devtools/client/moz.build
rename to devtools/shared/client/moz.build
diff --git a/toolkit/devtools/content-observer.js b/devtools/shared/content-observer.js
similarity index 100%
rename from toolkit/devtools/content-observer.js
rename to devtools/shared/content-observer.js
diff --git a/toolkit/devtools/css-color.js b/devtools/shared/css-color.js
similarity index 100%
rename from toolkit/devtools/css-color.js
rename to devtools/shared/css-color.js
diff --git a/toolkit/devtools/deprecated-sync-thenables.js b/devtools/shared/deprecated-sync-thenables.js
similarity index 100%
rename from toolkit/devtools/deprecated-sync-thenables.js
rename to devtools/shared/deprecated-sync-thenables.js
diff --git a/toolkit/devtools/discovery/discovery.js b/devtools/shared/discovery/discovery.js
similarity index 100%
rename from toolkit/devtools/discovery/discovery.js
rename to devtools/shared/discovery/discovery.js
diff --git a/toolkit/devtools/discovery/moz.build b/devtools/shared/discovery/moz.build
similarity index 100%
rename from toolkit/devtools/discovery/moz.build
rename to devtools/shared/discovery/moz.build
diff --git a/toolkit/devtools/discovery/tests/unit/test_discovery.js b/devtools/shared/discovery/tests/unit/test_discovery.js
similarity index 100%
rename from toolkit/devtools/discovery/tests/unit/test_discovery.js
rename to devtools/shared/discovery/tests/unit/test_discovery.js
diff --git a/toolkit/devtools/discovery/tests/unit/xpcshell.ini b/devtools/shared/discovery/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/discovery/tests/unit/xpcshell.ini
rename to devtools/shared/discovery/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/event-emitter.js b/devtools/shared/event-emitter.js
similarity index 100%
rename from toolkit/devtools/event-emitter.js
rename to devtools/shared/event-emitter.js
diff --git a/toolkit/devtools/event-parsers.js b/devtools/shared/event-parsers.js
similarity index 100%
rename from toolkit/devtools/event-parsers.js
rename to devtools/shared/event-parsers.js
diff --git a/toolkit/devtools/gcli/Templater.jsm b/devtools/shared/gcli/Templater.jsm
similarity index 100%
rename from toolkit/devtools/gcli/Templater.jsm
rename to devtools/shared/gcli/Templater.jsm
diff --git a/toolkit/devtools/gcli/commands/addon.js b/devtools/shared/gcli/commands/addon.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/addon.js
rename to devtools/shared/gcli/commands/addon.js
diff --git a/toolkit/devtools/gcli/commands/appcache.js b/devtools/shared/gcli/commands/appcache.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/appcache.js
rename to devtools/shared/gcli/commands/appcache.js
diff --git a/toolkit/devtools/gcli/commands/calllog.js b/devtools/shared/gcli/commands/calllog.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/calllog.js
rename to devtools/shared/gcli/commands/calllog.js
diff --git a/toolkit/devtools/gcli/commands/cmd.js b/devtools/shared/gcli/commands/cmd.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/cmd.js
rename to devtools/shared/gcli/commands/cmd.js
diff --git a/toolkit/devtools/gcli/commands/cookie.js b/devtools/shared/gcli/commands/cookie.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/cookie.js
rename to devtools/shared/gcli/commands/cookie.js
diff --git a/toolkit/devtools/gcli/commands/csscoverage.js b/devtools/shared/gcli/commands/csscoverage.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/csscoverage.js
rename to devtools/shared/gcli/commands/csscoverage.js
diff --git a/toolkit/devtools/gcli/commands/folder.js b/devtools/shared/gcli/commands/folder.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/folder.js
rename to devtools/shared/gcli/commands/folder.js
diff --git a/toolkit/devtools/gcli/commands/highlight.js b/devtools/shared/gcli/commands/highlight.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/highlight.js
rename to devtools/shared/gcli/commands/highlight.js
diff --git a/toolkit/devtools/gcli/commands/index.js b/devtools/shared/gcli/commands/index.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/index.js
rename to devtools/shared/gcli/commands/index.js
diff --git a/toolkit/devtools/gcli/commands/inject.js b/devtools/shared/gcli/commands/inject.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/inject.js
rename to devtools/shared/gcli/commands/inject.js
diff --git a/toolkit/devtools/gcli/commands/jsb.js b/devtools/shared/gcli/commands/jsb.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/jsb.js
rename to devtools/shared/gcli/commands/jsb.js
diff --git a/toolkit/devtools/gcli/commands/listen.js b/devtools/shared/gcli/commands/listen.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/listen.js
rename to devtools/shared/gcli/commands/listen.js
diff --git a/toolkit/devtools/gcli/commands/media.js b/devtools/shared/gcli/commands/media.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/media.js
rename to devtools/shared/gcli/commands/media.js
diff --git a/toolkit/devtools/gcli/commands/pagemod.js b/devtools/shared/gcli/commands/pagemod.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/pagemod.js
rename to devtools/shared/gcli/commands/pagemod.js
diff --git a/toolkit/devtools/gcli/commands/paintflashing.js b/devtools/shared/gcli/commands/paintflashing.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/paintflashing.js
rename to devtools/shared/gcli/commands/paintflashing.js
diff --git a/toolkit/devtools/gcli/commands/restart.js b/devtools/shared/gcli/commands/restart.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/restart.js
rename to devtools/shared/gcli/commands/restart.js
diff --git a/toolkit/devtools/gcli/commands/rulers.js b/devtools/shared/gcli/commands/rulers.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/rulers.js
rename to devtools/shared/gcli/commands/rulers.js
diff --git a/toolkit/devtools/gcli/commands/screenshot.js b/devtools/shared/gcli/commands/screenshot.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/screenshot.js
rename to devtools/shared/gcli/commands/screenshot.js
diff --git a/toolkit/devtools/gcli/commands/security.js b/devtools/shared/gcli/commands/security.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/security.js
rename to devtools/shared/gcli/commands/security.js
diff --git a/toolkit/devtools/gcli/commands/tools.js b/devtools/shared/gcli/commands/tools.js
similarity index 100%
rename from toolkit/devtools/gcli/commands/tools.js
rename to devtools/shared/gcli/commands/tools.js
diff --git a/toolkit/devtools/gcli/gcli.jsm b/devtools/shared/gcli/gcli.jsm
similarity index 100%
rename from toolkit/devtools/gcli/gcli.jsm
rename to devtools/shared/gcli/gcli.jsm
diff --git a/toolkit/devtools/gcli/moz.build b/devtools/shared/gcli/moz.build
similarity index 100%
rename from toolkit/devtools/gcli/moz.build
rename to devtools/shared/gcli/moz.build
diff --git a/toolkit/devtools/gcli/source/LICENSE b/devtools/shared/gcli/source/LICENSE
similarity index 100%
rename from toolkit/devtools/gcli/source/LICENSE
rename to devtools/shared/gcli/source/LICENSE
diff --git a/toolkit/devtools/gcli/source/docs/design.md b/devtools/shared/gcli/source/docs/design.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/design.md
rename to devtools/shared/gcli/source/docs/design.md
diff --git a/toolkit/devtools/gcli/source/docs/developing-gcli.md b/devtools/shared/gcli/source/docs/developing-gcli.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/developing-gcli.md
rename to devtools/shared/gcli/source/docs/developing-gcli.md
diff --git a/toolkit/devtools/gcli/source/docs/index.md b/devtools/shared/gcli/source/docs/index.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/index.md
rename to devtools/shared/gcli/source/docs/index.md
diff --git a/toolkit/devtools/gcli/source/docs/running-tests.md b/devtools/shared/gcli/source/docs/running-tests.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/running-tests.md
rename to devtools/shared/gcli/source/docs/running-tests.md
diff --git a/toolkit/devtools/gcli/source/docs/writing-commands.md b/devtools/shared/gcli/source/docs/writing-commands.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/writing-commands.md
rename to devtools/shared/gcli/source/docs/writing-commands.md
diff --git a/toolkit/devtools/gcli/source/docs/writing-tests.md b/devtools/shared/gcli/source/docs/writing-tests.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/writing-tests.md
rename to devtools/shared/gcli/source/docs/writing-tests.md
diff --git a/toolkit/devtools/gcli/source/docs/writing-types.md b/devtools/shared/gcli/source/docs/writing-types.md
similarity index 100%
rename from toolkit/devtools/gcli/source/docs/writing-types.md
rename to devtools/shared/gcli/source/docs/writing-types.md
diff --git a/toolkit/devtools/gcli/source/lib/gcli/cli.js b/devtools/shared/gcli/source/lib/gcli/cli.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/cli.js
rename to devtools/shared/gcli/source/lib/gcli/cli.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/clear.js b/devtools/shared/gcli/source/lib/gcli/commands/clear.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/clear.js
rename to devtools/shared/gcli/source/lib/gcli/commands/clear.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/commands.js b/devtools/shared/gcli/source/lib/gcli/commands/commands.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/commands.js
rename to devtools/shared/gcli/source/lib/gcli/commands/commands.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/connect.js b/devtools/shared/gcli/source/lib/gcli/commands/connect.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/connect.js
rename to devtools/shared/gcli/source/lib/gcli/commands/connect.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/context.js b/devtools/shared/gcli/source/lib/gcli/commands/context.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/context.js
rename to devtools/shared/gcli/source/lib/gcli/commands/context.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/exec.js b/devtools/shared/gcli/source/lib/gcli/commands/exec.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/exec.js
rename to devtools/shared/gcli/source/lib/gcli/commands/exec.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/global.js b/devtools/shared/gcli/source/lib/gcli/commands/global.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/global.js
rename to devtools/shared/gcli/source/lib/gcli/commands/global.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/help.js b/devtools/shared/gcli/source/lib/gcli/commands/help.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/help.js
rename to devtools/shared/gcli/source/lib/gcli/commands/help.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/intro.js b/devtools/shared/gcli/source/lib/gcli/commands/intro.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/intro.js
rename to devtools/shared/gcli/source/lib/gcli/commands/intro.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/lang.js b/devtools/shared/gcli/source/lib/gcli/commands/lang.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/lang.js
rename to devtools/shared/gcli/source/lib/gcli/commands/lang.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/mocks.js b/devtools/shared/gcli/source/lib/gcli/commands/mocks.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/mocks.js
rename to devtools/shared/gcli/source/lib/gcli/commands/mocks.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/pref.js b/devtools/shared/gcli/source/lib/gcli/commands/pref.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/pref.js
rename to devtools/shared/gcli/source/lib/gcli/commands/pref.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js b/devtools/shared/gcli/source/lib/gcli/commands/preflist.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/preflist.js
rename to devtools/shared/gcli/source/lib/gcli/commands/preflist.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/commands/test.js b/devtools/shared/gcli/source/lib/gcli/commands/test.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/commands/test.js
rename to devtools/shared/gcli/source/lib/gcli/commands/test.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js b/devtools/shared/gcli/source/lib/gcli/connectors/connectors.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/connectors/connectors.js
rename to devtools/shared/gcli/source/lib/gcli/connectors/connectors.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/converters/basic.js b/devtools/shared/gcli/source/lib/gcli/converters/basic.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/converters/basic.js
rename to devtools/shared/gcli/source/lib/gcli/converters/basic.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/converters/converters.js b/devtools/shared/gcli/source/lib/gcli/converters/converters.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/converters/converters.js
rename to devtools/shared/gcli/source/lib/gcli/converters/converters.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/converters/html.js b/devtools/shared/gcli/source/lib/gcli/converters/html.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/converters/html.js
rename to devtools/shared/gcli/source/lib/gcli/converters/html.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/converters/terminal.js b/devtools/shared/gcli/source/lib/gcli/converters/terminal.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/converters/terminal.js
rename to devtools/shared/gcli/source/lib/gcli/converters/terminal.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/fields/delegate.js b/devtools/shared/gcli/source/lib/gcli/fields/delegate.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/fields/delegate.js
rename to devtools/shared/gcli/source/lib/gcli/fields/delegate.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/fields/fields.js b/devtools/shared/gcli/source/lib/gcli/fields/fields.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/fields/fields.js
rename to devtools/shared/gcli/source/lib/gcli/fields/fields.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/fields/selection.js b/devtools/shared/gcli/source/lib/gcli/fields/selection.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/fields/selection.js
rename to devtools/shared/gcli/source/lib/gcli/fields/selection.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/index.js b/devtools/shared/gcli/source/lib/gcli/index.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/index.js
rename to devtools/shared/gcli/source/lib/gcli/index.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/l10n.js b/devtools/shared/gcli/source/lib/gcli/l10n.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/l10n.js
rename to devtools/shared/gcli/source/lib/gcli/l10n.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/languages/command.html b/devtools/shared/gcli/source/lib/gcli/languages/command.html
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/languages/command.html
rename to devtools/shared/gcli/source/lib/gcli/languages/command.html
diff --git a/toolkit/devtools/gcli/source/lib/gcli/languages/command.js b/devtools/shared/gcli/source/lib/gcli/languages/command.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/languages/command.js
rename to devtools/shared/gcli/source/lib/gcli/languages/command.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/languages/javascript.js b/devtools/shared/gcli/source/lib/gcli/languages/javascript.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/languages/javascript.js
rename to devtools/shared/gcli/source/lib/gcli/languages/javascript.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/languages/languages.js b/devtools/shared/gcli/source/lib/gcli/languages/languages.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/languages/languages.js
rename to devtools/shared/gcli/source/lib/gcli/languages/languages.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js b/devtools/shared/gcli/source/lib/gcli/mozui/completer.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/mozui/completer.js
rename to devtools/shared/gcli/source/lib/gcli/mozui/completer.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js b/devtools/shared/gcli/source/lib/gcli/mozui/inputter.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/mozui/inputter.js
rename to devtools/shared/gcli/source/lib/gcli/mozui/inputter.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js b/devtools/shared/gcli/source/lib/gcli/mozui/tooltip.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/mozui/tooltip.js
rename to devtools/shared/gcli/source/lib/gcli/mozui/tooltip.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/settings.js b/devtools/shared/gcli/source/lib/gcli/settings.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/settings.js
rename to devtools/shared/gcli/source/lib/gcli/settings.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/system.js b/devtools/shared/gcli/source/lib/gcli/system.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/system.js
rename to devtools/shared/gcli/source/lib/gcli/system.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/array.js b/devtools/shared/gcli/source/lib/gcli/types/array.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/array.js
rename to devtools/shared/gcli/source/lib/gcli/types/array.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/boolean.js b/devtools/shared/gcli/source/lib/gcli/types/boolean.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/boolean.js
rename to devtools/shared/gcli/source/lib/gcli/types/boolean.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/command.js b/devtools/shared/gcli/source/lib/gcli/types/command.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/command.js
rename to devtools/shared/gcli/source/lib/gcli/types/command.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/date.js b/devtools/shared/gcli/source/lib/gcli/types/date.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/date.js
rename to devtools/shared/gcli/source/lib/gcli/types/date.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/delegate.js b/devtools/shared/gcli/source/lib/gcli/types/delegate.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/delegate.js
rename to devtools/shared/gcli/source/lib/gcli/types/delegate.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/file.js b/devtools/shared/gcli/source/lib/gcli/types/file.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/file.js
rename to devtools/shared/gcli/source/lib/gcli/types/file.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/fileparser.js b/devtools/shared/gcli/source/lib/gcli/types/fileparser.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/fileparser.js
rename to devtools/shared/gcli/source/lib/gcli/types/fileparser.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/javascript.js b/devtools/shared/gcli/source/lib/gcli/types/javascript.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/javascript.js
rename to devtools/shared/gcli/source/lib/gcli/types/javascript.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/node.js b/devtools/shared/gcli/source/lib/gcli/types/node.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/node.js
rename to devtools/shared/gcli/source/lib/gcli/types/node.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/number.js b/devtools/shared/gcli/source/lib/gcli/types/number.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/number.js
rename to devtools/shared/gcli/source/lib/gcli/types/number.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/resource.js b/devtools/shared/gcli/source/lib/gcli/types/resource.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/resource.js
rename to devtools/shared/gcli/source/lib/gcli/types/resource.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/selection.js b/devtools/shared/gcli/source/lib/gcli/types/selection.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/selection.js
rename to devtools/shared/gcli/source/lib/gcli/types/selection.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/setting.js b/devtools/shared/gcli/source/lib/gcli/types/setting.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/setting.js
rename to devtools/shared/gcli/source/lib/gcli/types/setting.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/string.js b/devtools/shared/gcli/source/lib/gcli/types/string.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/string.js
rename to devtools/shared/gcli/source/lib/gcli/types/string.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/types.js b/devtools/shared/gcli/source/lib/gcli/types/types.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/types.js
rename to devtools/shared/gcli/source/lib/gcli/types/types.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/union.js b/devtools/shared/gcli/source/lib/gcli/types/union.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/union.js
rename to devtools/shared/gcli/source/lib/gcli/types/union.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/types/url.js b/devtools/shared/gcli/source/lib/gcli/types/url.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/types/url.js
rename to devtools/shared/gcli/source/lib/gcli/types/url.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/focus.js b/devtools/shared/gcli/source/lib/gcli/ui/focus.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/focus.js
rename to devtools/shared/gcli/source/lib/gcli/ui/focus.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/history.js b/devtools/shared/gcli/source/lib/gcli/ui/history.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/history.js
rename to devtools/shared/gcli/source/lib/gcli/ui/history.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/intro.js b/devtools/shared/gcli/source/lib/gcli/ui/intro.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/intro.js
rename to devtools/shared/gcli/source/lib/gcli/ui/intro.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/menu.css b/devtools/shared/gcli/source/lib/gcli/ui/menu.css
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/menu.css
rename to devtools/shared/gcli/source/lib/gcli/ui/menu.css
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/menu.html b/devtools/shared/gcli/source/lib/gcli/ui/menu.html
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/menu.html
rename to devtools/shared/gcli/source/lib/gcli/ui/menu.html
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/menu.js b/devtools/shared/gcli/source/lib/gcli/ui/menu.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/menu.js
rename to devtools/shared/gcli/source/lib/gcli/ui/menu.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/ui/view.js b/devtools/shared/gcli/source/lib/gcli/ui/view.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/ui/view.js
rename to devtools/shared/gcli/source/lib/gcli/ui/view.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/domtemplate.js b/devtools/shared/gcli/source/lib/gcli/util/domtemplate.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/domtemplate.js
rename to devtools/shared/gcli/source/lib/gcli/util/domtemplate.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/fileparser.js b/devtools/shared/gcli/source/lib/gcli/util/fileparser.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/fileparser.js
rename to devtools/shared/gcli/source/lib/gcli/util/fileparser.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/filesystem.js b/devtools/shared/gcli/source/lib/gcli/util/filesystem.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/filesystem.js
rename to devtools/shared/gcli/source/lib/gcli/util/filesystem.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/host.js b/devtools/shared/gcli/source/lib/gcli/util/host.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/host.js
rename to devtools/shared/gcli/source/lib/gcli/util/host.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/l10n.js b/devtools/shared/gcli/source/lib/gcli/util/l10n.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/l10n.js
rename to devtools/shared/gcli/source/lib/gcli/util/l10n.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/legacy.js b/devtools/shared/gcli/source/lib/gcli/util/legacy.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/legacy.js
rename to devtools/shared/gcli/source/lib/gcli/util/legacy.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/prism.js b/devtools/shared/gcli/source/lib/gcli/util/prism.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/prism.js
rename to devtools/shared/gcli/source/lib/gcli/util/prism.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/spell.js b/devtools/shared/gcli/source/lib/gcli/util/spell.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/spell.js
rename to devtools/shared/gcli/source/lib/gcli/util/spell.js
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/util.js b/devtools/shared/gcli/source/lib/gcli/util/util.js
similarity index 100%
rename from toolkit/devtools/gcli/source/lib/gcli/util/util.js
rename to devtools/shared/gcli/source/lib/gcli/util/util.js
diff --git a/toolkit/devtools/heapsnapshot/AutoMemMap.cpp b/devtools/shared/heapsnapshot/AutoMemMap.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/AutoMemMap.cpp
rename to devtools/shared/heapsnapshot/AutoMemMap.cpp
diff --git a/toolkit/devtools/heapsnapshot/AutoMemMap.h b/devtools/shared/heapsnapshot/AutoMemMap.h
similarity index 100%
rename from toolkit/devtools/heapsnapshot/AutoMemMap.h
rename to devtools/shared/heapsnapshot/AutoMemMap.h
diff --git a/toolkit/devtools/heapsnapshot/CoreDump.pb.cc b/devtools/shared/heapsnapshot/CoreDump.pb.cc
similarity index 100%
rename from toolkit/devtools/heapsnapshot/CoreDump.pb.cc
rename to devtools/shared/heapsnapshot/CoreDump.pb.cc
diff --git a/toolkit/devtools/heapsnapshot/CoreDump.pb.h b/devtools/shared/heapsnapshot/CoreDump.pb.h
similarity index 100%
rename from toolkit/devtools/heapsnapshot/CoreDump.pb.h
rename to devtools/shared/heapsnapshot/CoreDump.pb.h
diff --git a/toolkit/devtools/heapsnapshot/CoreDump.proto b/devtools/shared/heapsnapshot/CoreDump.proto
similarity index 100%
rename from toolkit/devtools/heapsnapshot/CoreDump.proto
rename to devtools/shared/heapsnapshot/CoreDump.proto
diff --git a/toolkit/devtools/heapsnapshot/DeserializedNode.cpp b/devtools/shared/heapsnapshot/DeserializedNode.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/DeserializedNode.cpp
rename to devtools/shared/heapsnapshot/DeserializedNode.cpp
diff --git a/toolkit/devtools/heapsnapshot/DeserializedNode.h b/devtools/shared/heapsnapshot/DeserializedNode.h
similarity index 100%
rename from toolkit/devtools/heapsnapshot/DeserializedNode.h
rename to devtools/shared/heapsnapshot/DeserializedNode.h
diff --git a/toolkit/devtools/heapsnapshot/HeapAnalysesClient.js b/devtools/shared/heapsnapshot/HeapAnalysesClient.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/HeapAnalysesClient.js
rename to devtools/shared/heapsnapshot/HeapAnalysesClient.js
diff --git a/toolkit/devtools/heapsnapshot/HeapAnalysesWorker.js b/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/HeapAnalysesWorker.js
rename to devtools/shared/heapsnapshot/HeapAnalysesWorker.js
diff --git a/toolkit/devtools/heapsnapshot/HeapSnapshot.cpp b/devtools/shared/heapsnapshot/HeapSnapshot.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/HeapSnapshot.cpp
rename to devtools/shared/heapsnapshot/HeapSnapshot.cpp
diff --git a/toolkit/devtools/heapsnapshot/HeapSnapshot.h b/devtools/shared/heapsnapshot/HeapSnapshot.h
similarity index 100%
rename from toolkit/devtools/heapsnapshot/HeapSnapshot.h
rename to devtools/shared/heapsnapshot/HeapSnapshot.h
diff --git a/toolkit/devtools/heapsnapshot/HeapSnapshotFileUtils.js b/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/HeapSnapshotFileUtils.js
rename to devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
diff --git a/toolkit/devtools/heapsnapshot/ZeroCopyNSIOutputStream.cpp b/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/ZeroCopyNSIOutputStream.cpp
rename to devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp
diff --git a/toolkit/devtools/heapsnapshot/ZeroCopyNSIOutputStream.h b/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h
similarity index 100%
rename from toolkit/devtools/heapsnapshot/ZeroCopyNSIOutputStream.h
rename to devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h
diff --git a/toolkit/devtools/heapsnapshot/census-tree-node.js b/devtools/shared/heapsnapshot/census-tree-node.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/census-tree-node.js
rename to devtools/shared/heapsnapshot/census-tree-node.js
diff --git a/toolkit/devtools/heapsnapshot/generate-core-dump-sources.sh b/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
similarity index 100%
rename from toolkit/devtools/heapsnapshot/generate-core-dump-sources.sh
rename to devtools/shared/heapsnapshot/generate-core-dump-sources.sh
diff --git a/toolkit/devtools/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build
similarity index 100%
rename from toolkit/devtools/heapsnapshot/moz.build
rename to devtools/shared/heapsnapshot/moz.build
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp b/devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp b/devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/DevTools.h b/devtools/shared/heapsnapshot/tests/gtest/DevTools.h
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/DevTools.h
rename to devtools/shared/heapsnapshot/tests/gtest/DevTools.h
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/DoesCrossZoneBoundaries.cpp b/devtools/shared/heapsnapshot/tests/gtest/DoesCrossZoneBoundaries.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/DoesCrossZoneBoundaries.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/DoesCrossZoneBoundaries.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/DoesntCrossZoneBoundaries.cpp b/devtools/shared/heapsnapshot/tests/gtest/DoesntCrossZoneBoundaries.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/DoesntCrossZoneBoundaries.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/DoesntCrossZoneBoundaries.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp b/devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp b/devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/SerializesTypeNames.cpp b/devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/UniqueStringHashPolicy.cpp b/devtools/shared/heapsnapshot/tests/gtest/UniqueStringHashPolicy.cpp
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/UniqueStringHashPolicy.cpp
rename to devtools/shared/heapsnapshot/tests/gtest/UniqueStringHashPolicy.cpp
diff --git a/toolkit/devtools/heapsnapshot/tests/gtest/moz.build b/devtools/shared/heapsnapshot/tests/gtest/moz.build
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/gtest/moz.build
rename to devtools/shared/heapsnapshot/tests/gtest/moz.build
diff --git a/toolkit/devtools/heapsnapshot/tests/mochitest/chrome.ini b/devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/mochitest/chrome.ini
rename to devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
diff --git a/toolkit/devtools/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html b/devtools/shared/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
rename to devtools/shared/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/Census.jsm b/devtools/shared/heapsnapshot/tests/unit/Census.jsm
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/Census.jsm
rename to devtools/shared/heapsnapshot/tests/unit/Census.jsm
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/Match.jsm b/devtools/shared/heapsnapshot/tests/unit/Match.jsm
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/Match.jsm
rename to devtools/shared/heapsnapshot/tests/unit/Match.jsm
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/head_heapsnapshot.js b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/head_heapsnapshot.js
rename to devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/heap-snapshot-worker.js b/devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/heap-snapshot-worker.js
rename to devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js b/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
rename to devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js b/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
rename to devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js b/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
rename to devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js b/devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
rename to devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_census-tree-node-01.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_census-tree-node-01.js
rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_census-tree-node-02.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_census-tree-node-02.js
rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/test_census-tree-node-03.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/test_census-tree-node-03.js
rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js
diff --git a/toolkit/devtools/heapsnapshot/tests/unit/xpcshell.ini b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/heapsnapshot/tests/unit/xpcshell.ini
rename to devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/jsbeautify/UPGRADING.md b/devtools/shared/jsbeautify/UPGRADING.md
similarity index 100%
rename from toolkit/devtools/jsbeautify/UPGRADING.md
rename to devtools/shared/jsbeautify/UPGRADING.md
diff --git a/toolkit/devtools/jsbeautify/beautify.js b/devtools/shared/jsbeautify/beautify.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/beautify.js
rename to devtools/shared/jsbeautify/beautify.js
diff --git a/toolkit/devtools/jsbeautify/lib/sanitytest.js b/devtools/shared/jsbeautify/lib/sanitytest.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/lib/sanitytest.js
rename to devtools/shared/jsbeautify/lib/sanitytest.js
diff --git a/toolkit/devtools/jsbeautify/lib/urlencode_unpacker.js b/devtools/shared/jsbeautify/lib/urlencode_unpacker.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/lib/urlencode_unpacker.js
rename to devtools/shared/jsbeautify/lib/urlencode_unpacker.js
diff --git a/toolkit/devtools/jsbeautify/moz.build b/devtools/shared/jsbeautify/moz.build
similarity index 100%
rename from toolkit/devtools/jsbeautify/moz.build
rename to devtools/shared/jsbeautify/moz.build
diff --git a/toolkit/devtools/jsbeautify/src/beautify-css.js b/devtools/shared/jsbeautify/src/beautify-css.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/src/beautify-css.js
rename to devtools/shared/jsbeautify/src/beautify-css.js
diff --git a/toolkit/devtools/jsbeautify/src/beautify-html.js b/devtools/shared/jsbeautify/src/beautify-html.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/src/beautify-html.js
rename to devtools/shared/jsbeautify/src/beautify-html.js
diff --git a/toolkit/devtools/jsbeautify/src/beautify-js.js b/devtools/shared/jsbeautify/src/beautify-js.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/src/beautify-js.js
rename to devtools/shared/jsbeautify/src/beautify-js.js
diff --git a/toolkit/devtools/jsbeautify/src/beautify-tests.js b/devtools/shared/jsbeautify/src/beautify-tests.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/src/beautify-tests.js
rename to devtools/shared/jsbeautify/src/beautify-tests.js
diff --git a/toolkit/devtools/jsbeautify/tests/unit/head_jsbeautify.js b/devtools/shared/jsbeautify/tests/unit/head_jsbeautify.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/tests/unit/head_jsbeautify.js
rename to devtools/shared/jsbeautify/tests/unit/head_jsbeautify.js
diff --git a/toolkit/devtools/jsbeautify/tests/unit/test.js b/devtools/shared/jsbeautify/tests/unit/test.js
similarity index 100%
rename from toolkit/devtools/jsbeautify/tests/unit/test.js
rename to devtools/shared/jsbeautify/tests/unit/test.js
diff --git a/toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini b/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini
rename to devtools/shared/jsbeautify/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/layout/utils.js b/devtools/shared/layout/utils.js
similarity index 100%
rename from toolkit/devtools/layout/utils.js
rename to devtools/shared/layout/utils.js
diff --git a/toolkit/devtools/moz.build b/devtools/shared/moz.build
similarity index 100%
rename from toolkit/devtools/moz.build
rename to devtools/shared/moz.build
diff --git a/toolkit/devtools/output-parser.js b/devtools/shared/output-parser.js
similarity index 100%
rename from toolkit/devtools/output-parser.js
rename to devtools/shared/output-parser.js
diff --git a/toolkit/devtools/path.js b/devtools/shared/path.js
similarity index 100%
rename from toolkit/devtools/path.js
rename to devtools/shared/path.js
diff --git a/toolkit/devtools/performance/io.js b/devtools/shared/performance/io.js
similarity index 100%
rename from toolkit/devtools/performance/io.js
rename to devtools/shared/performance/io.js
diff --git a/toolkit/devtools/performance/legacy/actors.js b/devtools/shared/performance/legacy/actors.js
similarity index 100%
rename from toolkit/devtools/performance/legacy/actors.js
rename to devtools/shared/performance/legacy/actors.js
diff --git a/toolkit/devtools/performance/legacy/compatibility.js b/devtools/shared/performance/legacy/compatibility.js
similarity index 100%
rename from toolkit/devtools/performance/legacy/compatibility.js
rename to devtools/shared/performance/legacy/compatibility.js
diff --git a/toolkit/devtools/performance/legacy/front.js b/devtools/shared/performance/legacy/front.js
similarity index 100%
rename from toolkit/devtools/performance/legacy/front.js
rename to devtools/shared/performance/legacy/front.js
diff --git a/toolkit/devtools/performance/legacy/recording.js b/devtools/shared/performance/legacy/recording.js
similarity index 100%
rename from toolkit/devtools/performance/legacy/recording.js
rename to devtools/shared/performance/legacy/recording.js
diff --git a/toolkit/devtools/performance/moz.build b/devtools/shared/performance/moz.build
similarity index 100%
rename from toolkit/devtools/performance/moz.build
rename to devtools/shared/performance/moz.build
diff --git a/toolkit/devtools/performance/process-communication.js b/devtools/shared/performance/process-communication.js
similarity index 100%
rename from toolkit/devtools/performance/process-communication.js
rename to devtools/shared/performance/process-communication.js
diff --git a/toolkit/devtools/performance/recorder.js b/devtools/shared/performance/recorder.js
similarity index 100%
rename from toolkit/devtools/performance/recorder.js
rename to devtools/shared/performance/recorder.js
diff --git a/toolkit/devtools/performance/recording-common.js b/devtools/shared/performance/recording-common.js
similarity index 100%
rename from toolkit/devtools/performance/recording-common.js
rename to devtools/shared/performance/recording-common.js
diff --git a/toolkit/devtools/performance/test/head.js b/devtools/shared/performance/test/head.js
similarity index 100%
rename from toolkit/devtools/performance/test/head.js
rename to devtools/shared/performance/test/head.js
diff --git a/toolkit/devtools/performance/test/test_perf-utils-allocations-to-samples.js b/devtools/shared/performance/test/test_perf-utils-allocations-to-samples.js
similarity index 100%
rename from toolkit/devtools/performance/test/test_perf-utils-allocations-to-samples.js
rename to devtools/shared/performance/test/test_perf-utils-allocations-to-samples.js
diff --git a/toolkit/devtools/performance/test/xpcshell.ini b/devtools/shared/performance/test/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/performance/test/xpcshell.ini
rename to devtools/shared/performance/test/xpcshell.ini
diff --git a/toolkit/devtools/performance/utils.js b/devtools/shared/performance/utils.js
similarity index 100%
rename from toolkit/devtools/performance/utils.js
rename to devtools/shared/performance/utils.js
diff --git a/toolkit/devtools/pretty-fast/UPGRADING.md b/devtools/shared/pretty-fast/UPGRADING.md
similarity index 100%
rename from toolkit/devtools/pretty-fast/UPGRADING.md
rename to devtools/shared/pretty-fast/UPGRADING.md
diff --git a/toolkit/devtools/pretty-fast/moz.build b/devtools/shared/pretty-fast/moz.build
similarity index 100%
rename from toolkit/devtools/pretty-fast/moz.build
rename to devtools/shared/pretty-fast/moz.build
diff --git a/toolkit/devtools/pretty-fast/pretty-fast.js b/devtools/shared/pretty-fast/pretty-fast.js
similarity index 100%
rename from toolkit/devtools/pretty-fast/pretty-fast.js
rename to devtools/shared/pretty-fast/pretty-fast.js
diff --git a/toolkit/devtools/pretty-fast/tests/unit/head_pretty-fast.js b/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js
similarity index 100%
rename from toolkit/devtools/pretty-fast/tests/unit/head_pretty-fast.js
rename to devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js
diff --git a/toolkit/devtools/pretty-fast/tests/unit/test.js b/devtools/shared/pretty-fast/tests/unit/test.js
similarity index 100%
rename from toolkit/devtools/pretty-fast/tests/unit/test.js
rename to devtools/shared/pretty-fast/tests/unit/test.js
diff --git a/toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini b/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini
rename to devtools/shared/pretty-fast/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/qrcode/decoder/LICENSE b/devtools/shared/qrcode/decoder/LICENSE
similarity index 100%
rename from toolkit/devtools/qrcode/decoder/LICENSE
rename to devtools/shared/qrcode/decoder/LICENSE
diff --git a/toolkit/devtools/qrcode/decoder/index.js b/devtools/shared/qrcode/decoder/index.js
similarity index 100%
rename from toolkit/devtools/qrcode/decoder/index.js
rename to devtools/shared/qrcode/decoder/index.js
diff --git a/toolkit/devtools/qrcode/decoder/moz.build b/devtools/shared/qrcode/decoder/moz.build
similarity index 100%
rename from toolkit/devtools/qrcode/decoder/moz.build
rename to devtools/shared/qrcode/decoder/moz.build
diff --git a/toolkit/devtools/qrcode/encoder/LICENSE b/devtools/shared/qrcode/encoder/LICENSE
similarity index 100%
rename from toolkit/devtools/qrcode/encoder/LICENSE
rename to devtools/shared/qrcode/encoder/LICENSE
diff --git a/toolkit/devtools/qrcode/encoder/index.js b/devtools/shared/qrcode/encoder/index.js
similarity index 100%
rename from toolkit/devtools/qrcode/encoder/index.js
rename to devtools/shared/qrcode/encoder/index.js
diff --git a/toolkit/devtools/qrcode/encoder/moz.build b/devtools/shared/qrcode/encoder/moz.build
similarity index 100%
rename from toolkit/devtools/qrcode/encoder/moz.build
rename to devtools/shared/qrcode/encoder/moz.build
diff --git a/toolkit/devtools/qrcode/index.js b/devtools/shared/qrcode/index.js
similarity index 100%
rename from toolkit/devtools/qrcode/index.js
rename to devtools/shared/qrcode/index.js
diff --git a/toolkit/devtools/qrcode/moz.build b/devtools/shared/qrcode/moz.build
similarity index 100%
rename from toolkit/devtools/qrcode/moz.build
rename to devtools/shared/qrcode/moz.build
diff --git a/toolkit/devtools/qrcode/tests/mochitest/chrome.ini b/devtools/shared/qrcode/tests/mochitest/chrome.ini
similarity index 100%
rename from toolkit/devtools/qrcode/tests/mochitest/chrome.ini
rename to devtools/shared/qrcode/tests/mochitest/chrome.ini
diff --git a/toolkit/devtools/qrcode/tests/mochitest/test_decode.html b/devtools/shared/qrcode/tests/mochitest/test_decode.html
similarity index 100%
rename from toolkit/devtools/qrcode/tests/mochitest/test_decode.html
rename to devtools/shared/qrcode/tests/mochitest/test_decode.html
diff --git a/toolkit/devtools/qrcode/tests/unit/test_encode.js b/devtools/shared/qrcode/tests/unit/test_encode.js
similarity index 100%
rename from toolkit/devtools/qrcode/tests/unit/test_encode.js
rename to devtools/shared/qrcode/tests/unit/test_encode.js
diff --git a/toolkit/devtools/qrcode/tests/unit/xpcshell.ini b/devtools/shared/qrcode/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/qrcode/tests/unit/xpcshell.ini
rename to devtools/shared/qrcode/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/security/LocalCertService.cpp b/devtools/shared/security/LocalCertService.cpp
similarity index 100%
rename from toolkit/devtools/security/LocalCertService.cpp
rename to devtools/shared/security/LocalCertService.cpp
diff --git a/toolkit/devtools/security/LocalCertService.h b/devtools/shared/security/LocalCertService.h
similarity index 100%
rename from toolkit/devtools/security/LocalCertService.h
rename to devtools/shared/security/LocalCertService.h
diff --git a/toolkit/devtools/security/auth.js b/devtools/shared/security/auth.js
similarity index 100%
rename from toolkit/devtools/security/auth.js
rename to devtools/shared/security/auth.js
diff --git a/toolkit/devtools/security/cert.js b/devtools/shared/security/cert.js
similarity index 100%
rename from toolkit/devtools/security/cert.js
rename to devtools/shared/security/cert.js
diff --git a/toolkit/devtools/security/docs/wifi.md b/devtools/shared/security/docs/wifi.md
similarity index 100%
rename from toolkit/devtools/security/docs/wifi.md
rename to devtools/shared/security/docs/wifi.md
diff --git a/toolkit/devtools/security/moz.build b/devtools/shared/security/moz.build
similarity index 100%
rename from toolkit/devtools/security/moz.build
rename to devtools/shared/security/moz.build
diff --git a/toolkit/devtools/security/nsILocalCertService.idl b/devtools/shared/security/nsILocalCertService.idl
similarity index 100%
rename from toolkit/devtools/security/nsILocalCertService.idl
rename to devtools/shared/security/nsILocalCertService.idl
diff --git a/toolkit/devtools/security/prompt.js b/devtools/shared/security/prompt.js
similarity index 100%
rename from toolkit/devtools/security/prompt.js
rename to devtools/shared/security/prompt.js
diff --git a/toolkit/devtools/security/socket.js b/devtools/shared/security/socket.js
similarity index 100%
rename from toolkit/devtools/security/socket.js
rename to devtools/shared/security/socket.js
diff --git a/toolkit/devtools/security/tests/unit/head_dbg.js b/devtools/shared/security/tests/unit/head_dbg.js
similarity index 100%
rename from toolkit/devtools/security/tests/unit/head_dbg.js
rename to devtools/shared/security/tests/unit/head_dbg.js
diff --git a/toolkit/devtools/security/tests/unit/test_cert.js b/devtools/shared/security/tests/unit/test_cert.js
similarity index 100%
rename from toolkit/devtools/security/tests/unit/test_cert.js
rename to devtools/shared/security/tests/unit/test_cert.js
diff --git a/toolkit/devtools/security/tests/unit/test_encryption.js b/devtools/shared/security/tests/unit/test_encryption.js
similarity index 100%
rename from toolkit/devtools/security/tests/unit/test_encryption.js
rename to devtools/shared/security/tests/unit/test_encryption.js
diff --git a/toolkit/devtools/security/tests/unit/test_oob_cert_auth.js b/devtools/shared/security/tests/unit/test_oob_cert_auth.js
similarity index 100%
rename from toolkit/devtools/security/tests/unit/test_oob_cert_auth.js
rename to devtools/shared/security/tests/unit/test_oob_cert_auth.js
diff --git a/toolkit/devtools/security/tests/unit/testactors.js b/devtools/shared/security/tests/unit/testactors.js
similarity index 100%
rename from toolkit/devtools/security/tests/unit/testactors.js
rename to devtools/shared/security/tests/unit/testactors.js
diff --git a/toolkit/devtools/security/tests/unit/xpcshell.ini b/devtools/shared/security/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/security/tests/unit/xpcshell.ini
rename to devtools/shared/security/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/shared/async-storage.js b/devtools/shared/shared/async-storage.js
similarity index 100%
rename from toolkit/devtools/shared/async-storage.js
rename to devtools/shared/shared/async-storage.js
diff --git a/toolkit/devtools/shared/framerate.js b/devtools/shared/shared/framerate.js
similarity index 100%
rename from toolkit/devtools/shared/framerate.js
rename to devtools/shared/shared/framerate.js
diff --git a/toolkit/devtools/shared/indentation.js b/devtools/shared/shared/indentation.js
similarity index 100%
rename from toolkit/devtools/shared/indentation.js
rename to devtools/shared/shared/indentation.js
diff --git a/toolkit/devtools/shared/memory.js b/devtools/shared/shared/memory.js
similarity index 100%
rename from toolkit/devtools/shared/memory.js
rename to devtools/shared/shared/memory.js
diff --git a/toolkit/devtools/shared/moz.build b/devtools/shared/shared/moz.build
similarity index 100%
rename from toolkit/devtools/shared/moz.build
rename to devtools/shared/shared/moz.build
diff --git a/toolkit/devtools/shared/profiler.js b/devtools/shared/shared/profiler.js
similarity index 100%
rename from toolkit/devtools/shared/profiler.js
rename to devtools/shared/shared/profiler.js
diff --git a/toolkit/devtools/shared/system.js b/devtools/shared/shared/system.js
similarity index 100%
rename from toolkit/devtools/shared/system.js
rename to devtools/shared/shared/system.js
diff --git a/toolkit/devtools/shared/tests/browser/browser.ini b/devtools/shared/shared/tests/browser/browser.ini
similarity index 100%
rename from toolkit/devtools/shared/tests/browser/browser.ini
rename to devtools/shared/shared/tests/browser/browser.ini
diff --git a/toolkit/devtools/shared/tests/browser/browser_async_storage.js b/devtools/shared/shared/tests/browser/browser_async_storage.js
similarity index 100%
rename from toolkit/devtools/shared/tests/browser/browser_async_storage.js
rename to devtools/shared/shared/tests/browser/browser_async_storage.js
diff --git a/toolkit/devtools/shared/tests/browser/browser_worker-01.js b/devtools/shared/shared/tests/browser/browser_worker-01.js
similarity index 100%
rename from toolkit/devtools/shared/tests/browser/browser_worker-01.js
rename to devtools/shared/shared/tests/browser/browser_worker-01.js
diff --git a/toolkit/devtools/shared/tests/browser/browser_worker-02.js b/devtools/shared/shared/tests/browser/browser_worker-02.js
similarity index 100%
rename from toolkit/devtools/shared/tests/browser/browser_worker-02.js
rename to devtools/shared/shared/tests/browser/browser_worker-02.js
diff --git a/toolkit/devtools/shared/tests/browser/browser_worker-03.js b/devtools/shared/shared/tests/browser/browser_worker-03.js
similarity index 100%
rename from toolkit/devtools/shared/tests/browser/browser_worker-03.js
rename to devtools/shared/shared/tests/browser/browser_worker-03.js
diff --git a/toolkit/devtools/shared/tests/unit/.eslintrc b/devtools/shared/shared/tests/unit/.eslintrc
similarity index 100%
rename from toolkit/devtools/shared/tests/unit/.eslintrc
rename to devtools/shared/shared/tests/unit/.eslintrc
diff --git a/toolkit/devtools/shared/tests/unit/test_indentation.js b/devtools/shared/shared/tests/unit/test_indentation.js
similarity index 100%
rename from toolkit/devtools/shared/tests/unit/test_indentation.js
rename to devtools/shared/shared/tests/unit/test_indentation.js
diff --git a/toolkit/devtools/shared/tests/unit/xpcshell.ini b/devtools/shared/shared/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/shared/tests/unit/xpcshell.ini
rename to devtools/shared/shared/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/shared/timeline.js b/devtools/shared/shared/timeline.js
similarity index 100%
rename from toolkit/devtools/shared/timeline.js
rename to devtools/shared/shared/timeline.js
diff --git a/toolkit/devtools/shared/worker-helper.js b/devtools/shared/shared/worker-helper.js
similarity index 100%
rename from toolkit/devtools/shared/worker-helper.js
rename to devtools/shared/shared/worker-helper.js
diff --git a/toolkit/devtools/shared/worker.js b/devtools/shared/shared/worker.js
similarity index 100%
rename from toolkit/devtools/shared/worker.js
rename to devtools/shared/shared/worker.js
diff --git a/toolkit/devtools/sourcemap/UPGRADING.md b/devtools/shared/sourcemap/UPGRADING.md
similarity index 100%
rename from toolkit/devtools/sourcemap/UPGRADING.md
rename to devtools/shared/sourcemap/UPGRADING.md
diff --git a/toolkit/devtools/sourcemap/moz.build b/devtools/shared/sourcemap/moz.build
similarity index 100%
rename from toolkit/devtools/sourcemap/moz.build
rename to devtools/shared/sourcemap/moz.build
diff --git a/toolkit/devtools/sourcemap/source-map.js b/devtools/shared/sourcemap/source-map.js
similarity index 100%
rename from toolkit/devtools/sourcemap/source-map.js
rename to devtools/shared/sourcemap/source-map.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/head_sourcemap.js b/devtools/shared/sourcemap/tests/unit/head_sourcemap.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/head_sourcemap.js
rename to devtools/shared/sourcemap/tests/unit/head_sourcemap.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_api.js b/devtools/shared/sourcemap/tests/unit/test_api.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_api.js
rename to devtools/shared/sourcemap/tests/unit/test_api.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_array_set.js b/devtools/shared/sourcemap/tests/unit/test_array_set.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_array_set.js
rename to devtools/shared/sourcemap/tests/unit/test_array_set.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_base64.js b/devtools/shared/sourcemap/tests/unit/test_base64.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_base64.js
rename to devtools/shared/sourcemap/tests/unit/test_base64.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_base64_vlq.js b/devtools/shared/sourcemap/tests/unit/test_base64_vlq.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_base64_vlq.js
rename to devtools/shared/sourcemap/tests/unit/test_base64_vlq.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_binary_search.js b/devtools/shared/sourcemap/tests/unit/test_binary_search.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_binary_search.js
rename to devtools/shared/sourcemap/tests/unit/test_binary_search.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_dog_fooding.js b/devtools/shared/sourcemap/tests/unit/test_dog_fooding.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_dog_fooding.js
rename to devtools/shared/sourcemap/tests/unit/test_dog_fooding.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_quick_sort.js b/devtools/shared/sourcemap/tests/unit/test_quick_sort.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_quick_sort.js
rename to devtools/shared/sourcemap/tests/unit/test_quick_sort.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js b/devtools/shared/sourcemap/tests/unit/test_source_map_consumer.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_source_map_consumer.js
rename to devtools/shared/sourcemap/tests/unit/test_source_map_consumer.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_map_generator.js b/devtools/shared/sourcemap/tests/unit/test_source_map_generator.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_source_map_generator.js
rename to devtools/shared/sourcemap/tests/unit/test_source_map_generator.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_source_node.js b/devtools/shared/sourcemap/tests/unit/test_source_node.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_source_node.js
rename to devtools/shared/sourcemap/tests/unit/test_source_node.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/test_util.js b/devtools/shared/sourcemap/tests/unit/test_util.js
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/test_util.js
rename to devtools/shared/sourcemap/tests/unit/test_util.js
diff --git a/toolkit/devtools/sourcemap/tests/unit/xpcshell.ini b/devtools/shared/sourcemap/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/sourcemap/tests/unit/xpcshell.ini
rename to devtools/shared/sourcemap/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/styleinspector/css-logic.js b/devtools/shared/styleinspector/css-logic.js
similarity index 100%
rename from toolkit/devtools/styleinspector/css-logic.js
rename to devtools/shared/styleinspector/css-logic.js
diff --git a/toolkit/devtools/styleinspector/moz.build b/devtools/shared/styleinspector/moz.build
similarity index 100%
rename from toolkit/devtools/styleinspector/moz.build
rename to devtools/shared/styleinspector/moz.build
diff --git a/toolkit/devtools/tern/README b/devtools/shared/tern/README
similarity index 100%
rename from toolkit/devtools/tern/README
rename to devtools/shared/tern/README
diff --git a/toolkit/devtools/tern/browser.js b/devtools/shared/tern/browser.js
similarity index 100%
rename from toolkit/devtools/tern/browser.js
rename to devtools/shared/tern/browser.js
diff --git a/toolkit/devtools/tern/comment.js b/devtools/shared/tern/comment.js
similarity index 100%
rename from toolkit/devtools/tern/comment.js
rename to devtools/shared/tern/comment.js
diff --git a/toolkit/devtools/tern/condense.js b/devtools/shared/tern/condense.js
similarity index 100%
rename from toolkit/devtools/tern/condense.js
rename to devtools/shared/tern/condense.js
diff --git a/toolkit/devtools/tern/def.js b/devtools/shared/tern/def.js
similarity index 100%
rename from toolkit/devtools/tern/def.js
rename to devtools/shared/tern/def.js
diff --git a/toolkit/devtools/tern/ecma5.js b/devtools/shared/tern/ecma5.js
similarity index 100%
rename from toolkit/devtools/tern/ecma5.js
rename to devtools/shared/tern/ecma5.js
diff --git a/toolkit/devtools/tern/infer.js b/devtools/shared/tern/infer.js
similarity index 100%
rename from toolkit/devtools/tern/infer.js
rename to devtools/shared/tern/infer.js
diff --git a/toolkit/devtools/tern/moz.build b/devtools/shared/tern/moz.build
similarity index 100%
rename from toolkit/devtools/tern/moz.build
rename to devtools/shared/tern/moz.build
diff --git a/toolkit/devtools/tern/signal.js b/devtools/shared/tern/signal.js
similarity index 100%
rename from toolkit/devtools/tern/signal.js
rename to devtools/shared/tern/signal.js
diff --git a/toolkit/devtools/tern/tern.js b/devtools/shared/tern/tern.js
similarity index 100%
rename from toolkit/devtools/tern/tern.js
rename to devtools/shared/tern/tern.js
diff --git a/toolkit/devtools/tern/tests/unit/head_tern.js b/devtools/shared/tern/tests/unit/head_tern.js
similarity index 100%
rename from toolkit/devtools/tern/tests/unit/head_tern.js
rename to devtools/shared/tern/tests/unit/head_tern.js
diff --git a/toolkit/devtools/tern/tests/unit/test_autocompletion.js b/devtools/shared/tern/tests/unit/test_autocompletion.js
similarity index 100%
rename from toolkit/devtools/tern/tests/unit/test_autocompletion.js
rename to devtools/shared/tern/tests/unit/test_autocompletion.js
diff --git a/toolkit/devtools/tern/tests/unit/test_import_tern.js b/devtools/shared/tern/tests/unit/test_import_tern.js
similarity index 100%
rename from toolkit/devtools/tern/tests/unit/test_import_tern.js
rename to devtools/shared/tern/tests/unit/test_import_tern.js
diff --git a/toolkit/devtools/tern/tests/unit/xpcshell.ini b/devtools/shared/tern/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/tern/tests/unit/xpcshell.ini
rename to devtools/shared/tern/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/tests/mochitest/chrome.ini b/devtools/shared/tests/mochitest/chrome.ini
similarity index 100%
rename from toolkit/devtools/tests/mochitest/chrome.ini
rename to devtools/shared/tests/mochitest/chrome.ini
diff --git a/toolkit/devtools/tests/mochitest/test_devtools_extensions.html b/devtools/shared/tests/mochitest/test_devtools_extensions.html
similarity index 100%
rename from toolkit/devtools/tests/mochitest/test_devtools_extensions.html
rename to devtools/shared/tests/mochitest/test_devtools_extensions.html
diff --git a/toolkit/devtools/tests/mochitest/test_eventemitter_basic.html b/devtools/shared/tests/mochitest/test_eventemitter_basic.html
similarity index 100%
rename from toolkit/devtools/tests/mochitest/test_eventemitter_basic.html
rename to devtools/shared/tests/mochitest/test_eventemitter_basic.html
diff --git a/toolkit/devtools/tests/mochitest/test_loader_paths.html b/devtools/shared/tests/mochitest/test_loader_paths.html
similarity index 100%
rename from toolkit/devtools/tests/mochitest/test_loader_paths.html
rename to devtools/shared/tests/mochitest/test_loader_paths.html
diff --git a/toolkit/devtools/tests/unit/.eslintrc b/devtools/shared/tests/unit/.eslintrc
similarity index 100%
rename from toolkit/devtools/tests/unit/.eslintrc
rename to devtools/shared/tests/unit/.eslintrc
diff --git a/toolkit/devtools/tests/unit/exposeLoader.js b/devtools/shared/tests/unit/exposeLoader.js
similarity index 100%
rename from toolkit/devtools/tests/unit/exposeLoader.js
rename to devtools/shared/tests/unit/exposeLoader.js
diff --git a/toolkit/devtools/tests/unit/head_devtools.js b/devtools/shared/tests/unit/head_devtools.js
similarity index 100%
rename from toolkit/devtools/tests/unit/head_devtools.js
rename to devtools/shared/tests/unit/head_devtools.js
diff --git a/toolkit/devtools/tests/unit/test_async-utils.js b/devtools/shared/tests/unit/test_async-utils.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_async-utils.js
rename to devtools/shared/tests/unit/test_async-utils.js
diff --git a/toolkit/devtools/tests/unit/test_consoleID.js b/devtools/shared/tests/unit/test_consoleID.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_consoleID.js
rename to devtools/shared/tests/unit/test_consoleID.js
diff --git a/toolkit/devtools/tests/unit/test_cssColor.js b/devtools/shared/tests/unit/test_cssColor.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_cssColor.js
rename to devtools/shared/tests/unit/test_cssColor.js
diff --git a/toolkit/devtools/tests/unit/test_defineLazyPrototypeGetter.js b/devtools/shared/tests/unit/test_defineLazyPrototypeGetter.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_defineLazyPrototypeGetter.js
rename to devtools/shared/tests/unit/test_defineLazyPrototypeGetter.js
diff --git a/toolkit/devtools/tests/unit/test_fetch-chrome.js b/devtools/shared/tests/unit/test_fetch-chrome.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_fetch-chrome.js
rename to devtools/shared/tests/unit/test_fetch-chrome.js
diff --git a/toolkit/devtools/tests/unit/test_fetch-file.js b/devtools/shared/tests/unit/test_fetch-file.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_fetch-file.js
rename to devtools/shared/tests/unit/test_fetch-file.js
diff --git a/toolkit/devtools/tests/unit/test_fetch-http.js b/devtools/shared/tests/unit/test_fetch-http.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_fetch-http.js
rename to devtools/shared/tests/unit/test_fetch-http.js
diff --git a/toolkit/devtools/tests/unit/test_fetch-resource.js b/devtools/shared/tests/unit/test_fetch-resource.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_fetch-resource.js
rename to devtools/shared/tests/unit/test_fetch-resource.js
diff --git a/toolkit/devtools/tests/unit/test_independent_loaders.js b/devtools/shared/tests/unit/test_independent_loaders.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_independent_loaders.js
rename to devtools/shared/tests/unit/test_independent_loaders.js
diff --git a/toolkit/devtools/tests/unit/test_invisible_loader.js b/devtools/shared/tests/unit/test_invisible_loader.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_invisible_loader.js
rename to devtools/shared/tests/unit/test_invisible_loader.js
diff --git a/toolkit/devtools/tests/unit/test_prettifyCSS.js b/devtools/shared/tests/unit/test_prettifyCSS.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_prettifyCSS.js
rename to devtools/shared/tests/unit/test_prettifyCSS.js
diff --git a/toolkit/devtools/tests/unit/test_require.js b/devtools/shared/tests/unit/test_require.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_require.js
rename to devtools/shared/tests/unit/test_require.js
diff --git a/toolkit/devtools/tests/unit/test_require_lazy.js b/devtools/shared/tests/unit/test_require_lazy.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_require_lazy.js
rename to devtools/shared/tests/unit/test_require_lazy.js
diff --git a/toolkit/devtools/tests/unit/test_safeErrorString.js b/devtools/shared/tests/unit/test_safeErrorString.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_safeErrorString.js
rename to devtools/shared/tests/unit/test_safeErrorString.js
diff --git a/toolkit/devtools/tests/unit/test_stack.js b/devtools/shared/tests/unit/test_stack.js
similarity index 100%
rename from toolkit/devtools/tests/unit/test_stack.js
rename to devtools/shared/tests/unit/test_stack.js
diff --git a/toolkit/devtools/tests/unit/xpcshell.ini b/devtools/shared/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/tests/unit/xpcshell.ini
rename to devtools/shared/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/touch/moz.build b/devtools/shared/touch/moz.build
similarity index 100%
rename from toolkit/devtools/touch/moz.build
rename to devtools/shared/touch/moz.build
diff --git a/toolkit/devtools/touch/simulator-content.js b/devtools/shared/touch/simulator-content.js
similarity index 100%
rename from toolkit/devtools/touch/simulator-content.js
rename to devtools/shared/touch/simulator-content.js
diff --git a/toolkit/devtools/touch/simulator.js b/devtools/shared/touch/simulator.js
similarity index 100%
rename from toolkit/devtools/touch/simulator.js
rename to devtools/shared/touch/simulator.js
diff --git a/toolkit/devtools/transport/moz.build b/devtools/shared/transport/moz.build
similarity index 100%
rename from toolkit/devtools/transport/moz.build
rename to devtools/shared/transport/moz.build
diff --git a/toolkit/devtools/transport/packets.js b/devtools/shared/transport/packets.js
similarity index 100%
rename from toolkit/devtools/transport/packets.js
rename to devtools/shared/transport/packets.js
diff --git a/toolkit/devtools/transport/stream-utils.js b/devtools/shared/transport/stream-utils.js
similarity index 100%
rename from toolkit/devtools/transport/stream-utils.js
rename to devtools/shared/transport/stream-utils.js
diff --git a/toolkit/devtools/transport/tests/unit/head_dbg.js b/devtools/shared/transport/tests/unit/head_dbg.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/head_dbg.js
rename to devtools/shared/transport/tests/unit/head_dbg.js
diff --git a/toolkit/devtools/transport/tests/unit/test_bulk_error.js b/devtools/shared/transport/tests/unit/test_bulk_error.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_bulk_error.js
rename to devtools/shared/transport/tests/unit/test_bulk_error.js
diff --git a/toolkit/devtools/transport/tests/unit/test_client_server_bulk.js b/devtools/shared/transport/tests/unit/test_client_server_bulk.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_client_server_bulk.js
rename to devtools/shared/transport/tests/unit/test_client_server_bulk.js
diff --git a/toolkit/devtools/transport/tests/unit/test_dbgsocket.js b/devtools/shared/transport/tests/unit/test_dbgsocket.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_dbgsocket.js
rename to devtools/shared/transport/tests/unit/test_dbgsocket.js
diff --git a/toolkit/devtools/transport/tests/unit/test_dbgsocket_connection_drop.js b/devtools/shared/transport/tests/unit/test_dbgsocket_connection_drop.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_dbgsocket_connection_drop.js
rename to devtools/shared/transport/tests/unit/test_dbgsocket_connection_drop.js
diff --git a/toolkit/devtools/transport/tests/unit/test_delimited_read.js b/devtools/shared/transport/tests/unit/test_delimited_read.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_delimited_read.js
rename to devtools/shared/transport/tests/unit/test_delimited_read.js
diff --git a/toolkit/devtools/transport/tests/unit/test_no_bulk.js b/devtools/shared/transport/tests/unit/test_no_bulk.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_no_bulk.js
rename to devtools/shared/transport/tests/unit/test_no_bulk.js
diff --git a/toolkit/devtools/transport/tests/unit/test_packet.js b/devtools/shared/transport/tests/unit/test_packet.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_packet.js
rename to devtools/shared/transport/tests/unit/test_packet.js
diff --git a/toolkit/devtools/transport/tests/unit/test_queue.js b/devtools/shared/transport/tests/unit/test_queue.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_queue.js
rename to devtools/shared/transport/tests/unit/test_queue.js
diff --git a/toolkit/devtools/transport/tests/unit/test_transport_bulk.js b/devtools/shared/transport/tests/unit/test_transport_bulk.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/test_transport_bulk.js
rename to devtools/shared/transport/tests/unit/test_transport_bulk.js
diff --git a/toolkit/devtools/transport/tests/unit/testactors-no-bulk.js b/devtools/shared/transport/tests/unit/testactors-no-bulk.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/testactors-no-bulk.js
rename to devtools/shared/transport/tests/unit/testactors-no-bulk.js
diff --git a/toolkit/devtools/transport/tests/unit/testactors.js b/devtools/shared/transport/tests/unit/testactors.js
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/testactors.js
rename to devtools/shared/transport/tests/unit/testactors.js
diff --git a/toolkit/devtools/transport/tests/unit/xpcshell.ini b/devtools/shared/transport/tests/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/transport/tests/unit/xpcshell.ini
rename to devtools/shared/transport/tests/unit/xpcshell.ini
diff --git a/toolkit/devtools/transport/transport.js b/devtools/shared/transport/transport.js
similarity index 100%
rename from toolkit/devtools/transport/transport.js
rename to devtools/shared/transport/transport.js
diff --git a/toolkit/devtools/webconsole/client.js b/devtools/shared/webconsole/client.js
similarity index 100%
rename from toolkit/devtools/webconsole/client.js
rename to devtools/shared/webconsole/client.js
diff --git a/toolkit/devtools/webconsole/moz.build b/devtools/shared/webconsole/moz.build
similarity index 100%
rename from toolkit/devtools/webconsole/moz.build
rename to devtools/shared/webconsole/moz.build
diff --git a/toolkit/devtools/webconsole/network-helper.js b/devtools/shared/webconsole/network-helper.js
similarity index 100%
rename from toolkit/devtools/webconsole/network-helper.js
rename to devtools/shared/webconsole/network-helper.js
diff --git a/toolkit/devtools/webconsole/network-monitor.js b/devtools/shared/webconsole/network-monitor.js
similarity index 100%
rename from toolkit/devtools/webconsole/network-monitor.js
rename to devtools/shared/webconsole/network-monitor.js
diff --git a/toolkit/devtools/webconsole/server-logger-monitor.js b/devtools/shared/webconsole/server-logger-monitor.js
similarity index 100%
rename from toolkit/devtools/webconsole/server-logger-monitor.js
rename to devtools/shared/webconsole/server-logger-monitor.js
diff --git a/toolkit/devtools/webconsole/server-logger.js b/devtools/shared/webconsole/server-logger.js
similarity index 100%
rename from toolkit/devtools/webconsole/server-logger.js
rename to devtools/shared/webconsole/server-logger.js
diff --git a/toolkit/devtools/webconsole/test/chrome.ini b/devtools/shared/webconsole/test/chrome.ini
similarity index 100%
rename from toolkit/devtools/webconsole/test/chrome.ini
rename to devtools/shared/webconsole/test/chrome.ini
diff --git a/toolkit/devtools/webconsole/test/common.js b/devtools/shared/webconsole/test/common.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/common.js
rename to devtools/shared/webconsole/test/common.js
diff --git a/toolkit/devtools/webconsole/test/data.json b/devtools/shared/webconsole/test/data.json
similarity index 100%
rename from toolkit/devtools/webconsole/test/data.json
rename to devtools/shared/webconsole/test/data.json
diff --git a/toolkit/devtools/webconsole/test/data.json^headers^ b/devtools/shared/webconsole/test/data.json^headers^
similarity index 100%
rename from toolkit/devtools/webconsole/test/data.json^headers^
rename to devtools/shared/webconsole/test/data.json^headers^
diff --git a/toolkit/devtools/webconsole/test/network_requests_iframe.html b/devtools/shared/webconsole/test/network_requests_iframe.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/network_requests_iframe.html
rename to devtools/shared/webconsole/test/network_requests_iframe.html
diff --git a/toolkit/devtools/webconsole/test/sandboxed_iframe.html b/devtools/shared/webconsole/test/sandboxed_iframe.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/sandboxed_iframe.html
rename to devtools/shared/webconsole/test/sandboxed_iframe.html
diff --git a/toolkit/devtools/webconsole/test/test_basics.html b/devtools/shared/webconsole/test/test_basics.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_basics.html
rename to devtools/shared/webconsole/test/test_basics.html
diff --git a/toolkit/devtools/webconsole/test/test_bug819670_getter_throws.html b/devtools/shared/webconsole/test/test_bug819670_getter_throws.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_bug819670_getter_throws.html
rename to devtools/shared/webconsole/test/test_bug819670_getter_throws.html
diff --git a/toolkit/devtools/webconsole/test/test_cached_messages.html b/devtools/shared/webconsole/test/test_cached_messages.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_cached_messages.html
rename to devtools/shared/webconsole/test/test_cached_messages.html
diff --git a/toolkit/devtools/webconsole/test/test_commands_other.html b/devtools/shared/webconsole/test/test_commands_other.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_commands_other.html
rename to devtools/shared/webconsole/test/test_commands_other.html
diff --git a/toolkit/devtools/webconsole/test/test_commands_registration.html b/devtools/shared/webconsole/test/test_commands_registration.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_commands_registration.html
rename to devtools/shared/webconsole/test/test_commands_registration.html
diff --git a/toolkit/devtools/webconsole/test/test_console_styling.html b/devtools/shared/webconsole/test/test_console_styling.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_console_styling.html
rename to devtools/shared/webconsole/test/test_console_styling.html
diff --git a/toolkit/devtools/webconsole/test/test_consoleapi.html b/devtools/shared/webconsole/test/test_consoleapi.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_consoleapi.html
rename to devtools/shared/webconsole/test/test_consoleapi.html
diff --git a/toolkit/devtools/webconsole/test/test_consoleapi_innerID.html b/devtools/shared/webconsole/test/test_consoleapi_innerID.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_consoleapi_innerID.html
rename to devtools/shared/webconsole/test/test_consoleapi_innerID.html
diff --git a/toolkit/devtools/webconsole/test/test_file_uri.html b/devtools/shared/webconsole/test/test_file_uri.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_file_uri.html
rename to devtools/shared/webconsole/test/test_file_uri.html
diff --git a/toolkit/devtools/webconsole/test/test_jsterm.html b/devtools/shared/webconsole/test/test_jsterm.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_jsterm.html
rename to devtools/shared/webconsole/test/test_jsterm.html
diff --git a/toolkit/devtools/webconsole/test/test_jsterm_cd_iframe.html b/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_jsterm_cd_iframe.html
rename to devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
diff --git a/toolkit/devtools/webconsole/test/test_jsterm_last_result.html b/devtools/shared/webconsole/test/test_jsterm_last_result.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_jsterm_last_result.html
rename to devtools/shared/webconsole/test/test_jsterm_last_result.html
diff --git a/toolkit/devtools/webconsole/test/test_jsterm_queryselector.html b/devtools/shared/webconsole/test/test_jsterm_queryselector.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_jsterm_queryselector.html
rename to devtools/shared/webconsole/test/test_jsterm_queryselector.html
diff --git a/toolkit/devtools/webconsole/test/test_network_get.html b/devtools/shared/webconsole/test/test_network_get.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_network_get.html
rename to devtools/shared/webconsole/test/test_network_get.html
diff --git a/toolkit/devtools/webconsole/test/test_network_longstring.html b/devtools/shared/webconsole/test/test_network_longstring.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_network_longstring.html
rename to devtools/shared/webconsole/test/test_network_longstring.html
diff --git a/toolkit/devtools/webconsole/test/test_network_post.html b/devtools/shared/webconsole/test/test_network_post.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_network_post.html
rename to devtools/shared/webconsole/test/test_network_post.html
diff --git a/toolkit/devtools/webconsole/test/test_network_security-hpkp.html b/devtools/shared/webconsole/test/test_network_security-hpkp.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_network_security-hpkp.html
rename to devtools/shared/webconsole/test/test_network_security-hpkp.html
diff --git a/toolkit/devtools/webconsole/test/test_network_security-hsts.html b/devtools/shared/webconsole/test/test_network_security-hsts.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_network_security-hsts.html
rename to devtools/shared/webconsole/test/test_network_security-hsts.html
diff --git a/toolkit/devtools/webconsole/test/test_nsiconsolemessage.html b/devtools/shared/webconsole/test/test_nsiconsolemessage.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_nsiconsolemessage.html
rename to devtools/shared/webconsole/test/test_nsiconsolemessage.html
diff --git a/toolkit/devtools/webconsole/test/test_object_actor.html b/devtools/shared/webconsole/test/test_object_actor.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_object_actor.html
rename to devtools/shared/webconsole/test/test_object_actor.html
diff --git a/toolkit/devtools/webconsole/test/test_object_actor_native_getters.html b/devtools/shared/webconsole/test/test_object_actor_native_getters.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_object_actor_native_getters.html
rename to devtools/shared/webconsole/test/test_object_actor_native_getters.html
diff --git a/toolkit/devtools/webconsole/test/test_object_actor_native_getters_lenient_this.html b/devtools/shared/webconsole/test/test_object_actor_native_getters_lenient_this.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_object_actor_native_getters_lenient_this.html
rename to devtools/shared/webconsole/test/test_object_actor_native_getters_lenient_this.html
diff --git a/toolkit/devtools/webconsole/test/test_page_errors.html b/devtools/shared/webconsole/test/test_page_errors.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_page_errors.html
rename to devtools/shared/webconsole/test/test_page_errors.html
diff --git a/toolkit/devtools/webconsole/test/test_reflow.html b/devtools/shared/webconsole/test/test_reflow.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_reflow.html
rename to devtools/shared/webconsole/test/test_reflow.html
diff --git a/toolkit/devtools/webconsole/test/test_throw.html b/devtools/shared/webconsole/test/test_throw.html
similarity index 100%
rename from toolkit/devtools/webconsole/test/test_throw.html
rename to devtools/shared/webconsole/test/test_throw.html
diff --git a/toolkit/devtools/webconsole/test/unit/test_js_property_provider.js b/devtools/shared/webconsole/test/unit/test_js_property_provider.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_js_property_provider.js
rename to devtools/shared/webconsole/test/unit/test_js_property_provider.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_network_helper.js b/devtools/shared/webconsole/test/unit/test_network_helper.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_network_helper.js
rename to devtools/shared/webconsole/test/unit/test_network_helper.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_security-info-certificate.js b/devtools/shared/webconsole/test/unit/test_security-info-certificate.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_security-info-certificate.js
rename to devtools/shared/webconsole/test/unit/test_security-info-certificate.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_security-info-parser.js b/devtools/shared/webconsole/test/unit/test_security-info-parser.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_security-info-parser.js
rename to devtools/shared/webconsole/test/unit/test_security-info-parser.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_security-info-protocol-version.js b/devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_security-info-protocol-version.js
rename to devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_security-info-state.js b/devtools/shared/webconsole/test/unit/test_security-info-state.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_security-info-state.js
rename to devtools/shared/webconsole/test/unit/test_security-info-state.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_security-info-static-hpkp.js b/devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_security-info-static-hpkp.js
rename to devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js
diff --git a/toolkit/devtools/webconsole/test/unit/test_security-info-weakness-reasons.js b/devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/test_security-info-weakness-reasons.js
rename to devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js
diff --git a/toolkit/devtools/webconsole/test/unit/xpcshell.ini b/devtools/shared/webconsole/test/unit/xpcshell.ini
similarity index 100%
rename from toolkit/devtools/webconsole/test/unit/xpcshell.ini
rename to devtools/shared/webconsole/test/unit/xpcshell.ini
diff --git a/toolkit/devtools/webconsole/utils.js b/devtools/shared/webconsole/utils.js
similarity index 100%
rename from toolkit/devtools/webconsole/utils.js
rename to devtools/shared/webconsole/utils.js
diff --git a/toolkit/devtools/worker-loader.js b/devtools/shared/worker-loader.js
similarity index 100%
rename from toolkit/devtools/worker-loader.js
rename to devtools/shared/worker-loader.js